[PATCH wayland v2] server: validate resource versions at creation time

Pekka Paalanen ppaalanen at gmail.com
Fri Feb 19 08:58:11 UTC 2016


On Tue, 16 Feb 2016 22:08:50 -0800
Bryce Harrington <bryce at osg.samsung.com> wrote:

> On Fri, Jan 15, 2016 at 10:06:48AM -0600, Derek Foreman wrote:
> > We shouldn't ever create a resource with version less than 1 or
> > greater than the interface version.
> > 
> > Reviewed-by: Marek Chalupa <mchqwerty at gmail.com>
> > Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> > ---
> > Changes since v1:
> > Fix silly typo - [0, %d] is now [1, %d]  
> 
> Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>
> 
> And pushed:
> To ssh://git.freedesktop.org/git/wayland/wayland
>    6801d2d..88ff135  master -> master
> 
> 
> >  src/wayland-server.c | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/src/wayland-server.c b/src/wayland-server.c
> > index 3a7d79d..08864eb 100644
> > --- a/src/wayland-server.c
> > +++ b/src/wayland-server.c
> > @@ -1349,6 +1349,13 @@ wl_resource_create(struct wl_client *client,
> >  {
> >  	struct wl_resource *resource;
> >  
> > +	if (version < 1 || version > interface->version) {
> > +		wl_log("wl_resource_create: invalid resource version %d "
> > +		       "for interface '%s' - must be in range [1, %d]\n",
> > +		       version, interface->name, interface->version);
> > +		return NULL;
> > +	}
> > +
> >  	resource = malloc(sizeof *resource);
> >  	if (resource == NULL)
> >  		return NULL;
> > -- 
> > 2.7.0.rc3

Hi,

I'm notifying the list that this patch got rightly reverted:
https://cgit.freedesktop.org/wayland/wayland/commit/?id=3a2553ff013a3661ec044917ccde4a74fe152dc9

However, I don't think creating a wl_resource with version < 1 is legal
anyway, so that could come back.


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20160219/a31e874e/attachment.sig>


More information about the wayland-devel mailing list