]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fbdev: fbmem: Fix the implicit type casting
authorYizhuo Zhai <yzhai003@ucr.edu>
Wed, 2 Feb 2022 23:58:08 +0000 (15:58 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 3 Feb 2022 12:52:03 +0000 (13:52 +0100)
In function do_fb_ioctl(), the "arg" is the type of unsigned long,
and in "case FBIOBLANK:" this argument is casted into an int before
passig to fb_blank(). In fb_blank(), the comparision
if (blank > FB_BLANK_POWERDOWN) would be bypass if the original
"arg" is a large number, which is possible because it comes from
the user input. Fix this by adding the check before the function
call.

Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Helge Deller <deller@gmx.de>
Signed-off-by: Yizhuo Zhai <yzhai003@ucr.edu>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220202235811.1621017-1-yzhai003@ucr.edu
drivers/video/fbdev/core/fbmem.c

index 0fa7ede94fa61a642c50f1d263f7c7bae5646218..13083ad8d7515ecdf3829b5775037de61c393a18 100644 (file)
@@ -1160,6 +1160,8 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                ret = fbcon_set_con2fb_map_ioctl(argp);
                break;
        case FBIOBLANK:
+               if (arg > FB_BLANK_POWERDOWN)
+                       return -EINVAL;
                console_lock();
                lock_fb_info(info);
                ret = fb_blank(info, arg);