Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8bad911 authored by Dan Carpenter's avatar Dan Carpenter Committed by Bartlomiej Zolnierkiewicz
Browse files

fbdev: sbuslib: use checked version of put_user() 



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: default avatarDan 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: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 5c63e407

drivers/video/fbdev/sbuslib.c

+13 −13
Original line number Diff line number Diff line
@@ -106,11 +106,11 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, 
		struct fbtype __user *f = (struct fbtype __user *) arg;



		if (put_user(type, &f->fb_type) ||

		    __put_user(info->var.yres, &f->fb_height) ||

		    __put_user(info->var.xres, &f->fb_width) ||

		    __put_user(fb_depth, &f->fb_depth) ||

		    __put_user(0, &f->fb_cmsize) ||

		    __put_user(fb_size, &f->fb_cmsize))

		    put_user(info->var.yres, &f->fb_height) ||

		    put_user(info->var.xres, &f->fb_width) ||

		    put_user(fb_depth, &f->fb_depth) ||

		    put_user(0, &f->fb_cmsize) ||

		    put_user(fb_size, &f->fb_cmsize))

			return -EFAULT;

		return 0;

	}
@@ -125,10 +125,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, 
		unsigned int index, count, i;



		if (get_user(index, &c->index) ||

		    __get_user(count, &c->count) ||

		    __get_user(ured, &c->red) ||

		    __get_user(ugreen, &c->green) ||

		    __get_user(ublue, &c->blue))

		    get_user(count, &c->count) ||

		    get_user(ured, &c->red) ||

		    get_user(ugreen, &c->green) ||

		    get_user(ublue, &c->blue))

			return -EFAULT;



		cmap.len = 1;
@@ -165,10 +165,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, 
		u8 red, green, blue;



		if (get_user(index, &c->index) ||

		    __get_user(count, &c->count) ||

		    __get_user(ured, &c->red) ||

		    __get_user(ugreen, &c->green) ||

		    __get_user(ublue, &c->blue))

		    get_user(count, &c->count) ||

		    get_user(ured, &c->red) ||

		    get_user(ugreen, &c->green) ||

		    get_user(ublue, &c->blue))

			return -EFAULT;



		if (index + count > cmap->len)