evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fbdev: sbuslib: use checked version of put_user()

Browse source 
[ Upstream commit d8bad911e5e55e228d59c0606ff7e6b8131ca7bf ]

I'm not sure why the code assumes that only the first put_user() needs
an access_ok() check.  I have made all the put_user() and get_user()
calls checked.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Cc: Mathieu Malaterre <malat@debian.org>
Cc: Peter Malone <peter.malone@gmail.com>,
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dan Carpenter 2018-10-08 12:57:36 +02:00 • committed by Greg Kroah-Hartman
parent 682e2ea0ca
commit 6fc10fb966
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/video/fbdev/sbuslib.c
View file

@ -105,11 +105,11 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
struct fbtype __user *f = (struct fbtype __user *) arg; struct fbtype __user *f = (struct fbtype __user *) arg;
if (put_user(type, &f->fb_type) || if (put_user(type, &f->fb_type) ||
__put_user(info->var.yres, &f->fb_height) || put_user(info->var.yres, &f->fb_height) ||
__put_user(info->var.xres, &f->fb_width) || put_user(info->var.xres, &f->fb_width) ||
__put_user(fb_depth, &f->fb_depth) || put_user(fb_depth, &f->fb_depth) ||
__put_user(0, &f->fb_cmsize) || put_user(0, &f->fb_cmsize) ||
__put_user(fb_size, &f->fb_cmsize)) put_user(fb_size, &f->fb_cmsize))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
@ -124,10 +124,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
unsigned int index, count, i; unsigned int index, count, i;
if (get_user(index, &c->index) || if (get_user(index, &c->index) ||
__get_user(count, &c->count) || get_user(count, &c->count) ||
__get_user(ured, &c->red) || get_user(ured, &c->red) ||
__get_user(ugreen, &c->green) || get_user(ugreen, &c->green) ||
__get_user(ublue, &c->blue)) get_user(ublue, &c->blue))
return -EFAULT; return -EFAULT;
cmap.len = 1; cmap.len = 1;
@ -164,10 +164,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
u8 red, green, blue; u8 red, green, blue;
if (get_user(index, &c->index) || if (get_user(index, &c->index) ||
__get_user(count, &c->count) || get_user(count, &c->count) ||
__get_user(ured, &c->red) || get_user(ured, &c->red) ||
__get_user(ugreen, &c->green) || get_user(ugreen, &c->green) ||
__get_user(ublue, &c->blue)) get_user(ublue, &c->blue))
return -EFAULT; return -EFAULT;
if (index + count > cmap->len) if (index + count > cmap->len)