summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2013-11-19 14:25:36 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-11-26 16:40:14 +0200
commit2ab68ec927310dc488f3403bb48f9e4ad00a9491 (patch)
tree5419c4937fa6350adce1b76e96dd5dd302a19564 /drivers/video
parentc37dd677988ca50bc8bc60ab5ab053720583c168 (diff)
downloadblackbird-op-linux-2ab68ec927310dc488f3403bb48f9e4ad00a9491.tar.gz
blackbird-op-linux-2ab68ec927310dc488f3403bb48f9e4ad00a9491.zip
video: kyro: fix incorrect sizes when copying to userspace
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> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/kyro/fbdev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
index 50c857477e4f..65041e15fd59 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;
}
OpenPOWER on IntegriCloud