drm: never write to the userspace more data than the caller wants
Subsystems (2)
PATCH 1/1 drm: never write to the userspace more data than the caller wants
The amount of data wanted by the userspace caller is encoded in the ioctl number. Generic drm ioctls were ignoring it.
As a result, Intel Xorg driver didn't work for i386 userspace on x86_64 kernel on some systems. sizeof(struct drm_mode_get_connector) is 76 bytes on i686 and 80 bytes on x86_64 due to the tail alignment (the data positions match). The userspace was using the 4 bytes after the structure to hold the result of the ioctl. Since drm_ioctl() was copying 80 bytes instead of 76, it was clobbering that data.
A workaround has been committed to xf86-video-intel.
--- drivers/gpu/drm/drm_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_drv.c +4 -1
@@ -403,8 +403,11 @@ long drm_ioctl(struct file *filp, }else if ((nr >=DRM_COMMAND_END ) || (nr <DRM_COMMAND_BASE )) { ioctl = &drm_ioctls[nr]; + usize =_IOC_SIZE (cmd); cmd = ioctl->cmd; - usize = asize =_IOC_SIZE (cmd); + asize =_IOC_SIZE (cmd); +if (unlikely (usize > asize)) + usize = asize; }else goto err_i1;
Quoted 10 lines · Pavel Roskin
The amount of data wanted by the userspace caller is encoded in the ioctl number. Generic drm ioctls were ignoring it.
As a result, Intel Xorg driver didn't work for i386 userspace on
x86_64kernel on some systems.sizeof(struct drm_mode_get_connector)is 76 bytes on i686 and 80 bytes onx86_64due to the tail alignment (the data positions match). The userspace was using the 4 bytes after the structure to hold the result of the ioctl. Sincedrm_ioctl()was copying 80 bytes instead of 76, it was clobbering that data.
Quoted 4 lines
A workaround has been committed to xf86-video-intel.
Signed-off-by Pavel Roskin <[email protected]>
Similar patch:
http://lists.freedesktop.org/archives/dri-devel/2013-October/047412.html
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 12 lines · On Thu, 17 Oct 2013 13:26:47 +0100 Chris Wilson <[email protected]>…
Quoted 11 lines · Pavel Roskin
The amount of data wanted by the userspace caller is encoded in the ioctl number. Generic drm ioctls were ignoring it.
As a result, Intel Xorg driver didn't work for i386 userspace on
x86_64kernel on some systems.sizeof(struct drm_mode_get_connector)is 76 bytes on i686 and 80 bytes onx86_64due to the tail alignment (the data positions match). The userspace was using the 4 bytes after the structure to hold the result of the ioctl. Sincedrm_ioctl()was copying 80 bytes instead of 76, it was clobbering that data.
Quoted 8 lines
Quoted 4 lines
A workaround has been committed to xf86-video-intel.
Signed-off-by Pavel Roskin <[email protected]>Similar patch:
http://lists.freedesktop.org/archives/dri-devel/2013-October/047412.html
-Chris
Wow, it's great that you also thought about it!
Your patch does almost the same thing. There is one difference. If the userspace requests more data than the kernel needs, your patch would trust the userspace and set usize to whatever the user wants. It would set asize to the same value, allocating more memory than the driver wants, up to 16383 bytes. I don't think it's a good idea for performance reasons. My patch would decrease usize rather than increase asize.
The code for driver-specific ioctls could be fixed too, it's just not so urgent as fixing a real bug.
That said, I have no format objection against your patch. It would be great to have that bug fixed.
Signature · 2 lines
Regards, Pavel Roskin
PATCH 1/1 drm: Restrict ioctl size to kernel struct size
In reply to Pavel RoskinPrevent the user from passing in an ioctl command with up to 16,383 bytes specified for the struct to be allocated and copied, and instead only allocate enough space to satisfy the kernel.
--- drivers/gpu/drm/drm_drv.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
drivers/gpu/drm/drm_drv.c +13 -17
@@ -354,6 +354,16 @@ static int drm_version(struct drm_device *dev, void *data,return err; } +static unsigned ioctl_size (unsigned kcmd,unsigned ucmd,unsigned *ksize,unsigned *usize) +{ + *ksize =_IOC_SIZE (kcmd); + *usize =_IOC_SIZE (ucmd); +if (*usize > *ksize) + *usize = *ksize; + +return kcmd; +} +/** * Called whenever a process performs an ioctl on /dev/drm. *
@@ -393,25 +403,11 @@ long drm_ioctl(struct file *filp, goto err_i1;if ((nr >=DRM_COMMAND_BASE ) && (nr <DRM_COMMAND_END ) && (nr <DRM_COMMAND_BASE + dev->driver->num_ioctls)) { -u32 drv_size; ioctl = &dev->driver->ioctls[nr -DRM_COMMAND_BASE ]; - drv_size =_IOC_SIZE (ioctl->cmd_drv); - usize = asize =_IOC_SIZE (cmd); -if (drv_size > asize) - asize = drv_size; - cmd = ioctl->cmd_drv; - } -else if ((nr >=DRM_COMMAND_END ) || (nr <DRM_COMMAND_BASE )) { -u32 drv_size; - + cmd =ioctl_size (ioctl->cmd_drv, cmd, &asize, &usize); + }else if ((nr >=DRM_COMMAND_END ) || (nr <DRM_COMMAND_BASE )) { ioctl = &drm_ioctls[nr]; - - drv_size =_IOC_SIZE (ioctl->cmd); - usize = asize =_IOC_SIZE (cmd); -if (drv_size > asize) - asize = drv_size; - - cmd = ioctl->cmd; + cmd =ioctl_size (ioctl->cmd, cmd, &asize, &usize); }else goto err_i1;
Signature · 1 line
1.8.4.rc3
Re: [PATCH] drm: Restrict ioctl size to kernel struct size
Quoted 8 lines · Chris Wilson
Prevent the user from passing in an ioctl command with up to 16,383 bytes specified for the struct to be allocated and copied, and instead only allocate enough space to satisfy the kernel.
Suggested-by Pavel Roskin <[email protected]>Signed-off-by Chris Wilson <[email protected]>Cc Pavel Roskin <[email protected]>
Quoted 61 lines
--- drivers/gpu/drm/drm_drv.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)drivers/gpu/drm/drm_drv.c +13
-17@@ -354,6 +354,16 @@ static int drm_version(struct drm_device *dev, void *data,return err; } +static unsigned ioctl_size (unsigned kcmd,unsigned ucmd,unsigned *ksize,unsigned *usize) +{ + *ksize =_IOC_SIZE (kcmd); + *usize =_IOC_SIZE (ucmd); +if (*usize > *ksize) + *usize = *ksize; + +return kcmd; +} +/** * Called whenever a process performs an ioctl on /dev/drm. * @@ -393,25 +403,11 @@ long drm_ioctl(struct file *filp, goto err_i1;if ((nr >=DRM_COMMAND_BASE ) && (nr <DRM_COMMAND_END ) && (nr <DRM_COMMAND_BASE + dev->driver->num_ioctls)) { -u32 drv_size; ioctl = &dev->driver->ioctls[nr -DRM_COMMAND_BASE ]; - drv_size =_IOC_SIZE (ioctl->cmd_drv); - usize = asize =_IOC_SIZE (cmd); -if (drv_size > asize) - asize = drv_size; - cmd = ioctl->cmd_drv; - } -else if ((nr >=DRM_COMMAND_END ) || (nr <DRM_COMMAND_BASE )) { -u32 drv_size; - + cmd =ioctl_size (ioctl->cmd_drv, cmd, &asize, &usize); + }else if ((nr >=DRM_COMMAND_END ) || (nr <DRM_COMMAND_BASE )) { ioctl = &drm_ioctls[nr]; - - drv_size =_IOC_SIZE (ioctl->cmd); - usize = asize =_IOC_SIZE (cmd); -if (drv_size > asize) - asize = drv_size; - - cmd = ioctl->cmd; + cmd =ioctl_size (ioctl->cmd, cmd, &asize, &usize); }else goto err_i1;Signature · 6 lines
1.8.4.rc3 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH] drm: Restrict ioctl size to kernel struct size
In reply to Chris WilsonQuoted 8 lines · On Tue, 22 Oct 2013 10:38:03 +0100 Chris Wilson <[email protected]>…
Prevent the user from passing in an ioctl command with up to 16,383 bytes specified for the struct to be allocated and copied, and instead only allocate enough space to satisfy the kernel.
Suggested-by Pavel Roskin <[email protected]>Signed-off-by Chris Wilson <[email protected]>Cc Pavel Roskin <[email protected]>
Thank you for taking care of that!
Signature · 2 lines
Regards, Pavel Roskin