fbdev: sbuslib: use checked version of put_user()

[ 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>

diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c
index 31c301d6be621aef9f3a35f9bef3beb13eeff0d2..b425718925c0158a85c9f8d7edc3befa9702d4a6 100644 (file)
--- a/drivers/video/fbdev/sbuslib.c
+++ b/drivers/video/fbdev/sbuslib.c
@@ -105,11 +105,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;
        }
@@ -124,10 +124,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;
@@ -164,10 +164,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)