lkml.org 
[lkml]   [2013]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] video: kyro: fix incorrect sizes when copying to userspace
On 2013-11-19 21:25, Sasha Levin wrote:
> kyro would copy u32s and specify sizeof(unsigned long) as the size to copy.
>
> This would copy more data than intended and cause memory corruption and might
> leak kernel memory.
>
> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
> ---
> drivers/video/kyro/fbdev.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
> index 50c8574..65041e1 100644
> --- a/drivers/video/kyro/fbdev.c
> +++ b/drivers/video/kyro/fbdev.c
> @@ -624,15 +624,15 @@ static int kyrofb_ioctl(struct fb_info *info,
> return -EINVAL;
> }
> case KYRO_IOCTL_UVSTRIDE:
> - if (copy_to_user(argp, &deviceInfo.ulOverlayUVStride, sizeof(unsigned long)))
> + if (copy_to_user(argp, &deviceInfo.ulOverlayUVStride, sizeof(deviceInfo.ulOverlayUVStride)))
> return -EFAULT;
> break;
> case KYRO_IOCTL_STRIDE:
> - if (copy_to_user(argp, &deviceInfo.ulOverlayStride, sizeof(unsigned long)))
> + if (copy_to_user(argp, &deviceInfo.ulOverlayStride, sizeof(deviceInfo.ulOverlayStride)))
> return -EFAULT;
> break;
> case KYRO_IOCTL_OVERLAY_OFFSET:
> - if (copy_to_user(argp, &deviceInfo.ulOverlayOffset, sizeof(unsigned long)))
> + if (copy_to_user(argp, &deviceInfo.ulOverlayOffset, sizeof(deviceInfo.ulOverlayOffset)))
> return -EFAULT;
> break;
> }
>

Thanks, applied for 3.13 fixes.

Tomi


[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-11-26 16:01    [W:0.032 / U:0.460 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site