Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbmem: pull fbcon_update_vcs() out of fb_set_var()

syzbot is reporting OOB read bug in vc_do_resize() [1] caused by memcpy()
based on outdated old_{rows,row_size} values, for resize_screen() can
recurse into vc_do_resize() which changes vc->vc_{cols,rows} that outdates
old_{rows,row_size} values which were saved before calling resize_screen().

Daniel Vetter explained that resize_screen() should not recurse into
fbcon_update_vcs() path due to FBINFO_MISC_USEREVENT being still set
when calling resize_screen().

Instead of masking FBINFO_MISC_USEREVENT before calling fbcon_update_vcs(),
we can remove FBINFO_MISC_USEREVENT by calling fbcon_update_vcs() only if
fb_set_var() returned 0. This change assumes that it is harmless to call
fbcon_update_vcs() when fb_set_var() returned 0 without reaching
fb_notifier_call_chain().

[1] https://syzkaller.appspot.com/bug?id=c70c88cfd16dcf6e1d3c7f0ab8648b3144b5b25e

Reported-and-tested-by: syzbot <syzbot+c37a14770d51a085a520@syzkaller.appspotmail.com>
Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reported-by: kernel test robot <lkp@intel.com> for missing #include
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/075b7e37-3278-cd7d-31ab-c5073cfa8e92@i-love.sakura.ne.jp

authored by

Tetsuo Handa and committed by
Daniel Vetter
d88ca7e1 f369bc3f

+7 -12
+2 -6
drivers/video/fbdev/core/fbmem.c
··· 957 957 int 958 958 fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) 959 959 { 960 - int flags = info->flags; 961 960 int ret = 0; 962 961 u32 activate; 963 962 struct fb_var_screeninfo old_var; ··· 1051 1052 event.data = &mode; 1052 1053 fb_notifier_call_chain(FB_EVENT_MODE_CHANGE, &event); 1053 1054 1054 - if (flags & FBINFO_MISC_USEREVENT) 1055 - fbcon_update_vcs(info, activate & FB_ACTIVATE_ALL); 1056 - 1057 1055 return 0; 1058 1056 } 1059 1057 EXPORT_SYMBOL(fb_set_var); ··· 1101 1105 return -EFAULT; 1102 1106 console_lock(); 1103 1107 lock_fb_info(info); 1104 - info->flags |= FBINFO_MISC_USEREVENT; 1105 1108 ret = fb_set_var(info, &var); 1106 - info->flags &= ~FBINFO_MISC_USEREVENT; 1109 + if (!ret) 1110 + fbcon_update_vcs(info, var.activate & FB_ACTIVATE_ALL); 1107 1111 unlock_fb_info(info); 1108 1112 console_unlock(); 1109 1113 if (!ret && copy_to_user(argp, &var, sizeof(var)))
+2 -2
drivers/video/fbdev/core/fbsysfs.c
··· 91 91 92 92 var->activate |= FB_ACTIVATE_FORCE; 93 93 console_lock(); 94 - fb_info->flags |= FBINFO_MISC_USEREVENT; 95 94 err = fb_set_var(fb_info, var); 96 - fb_info->flags &= ~FBINFO_MISC_USEREVENT; 95 + if (!err) 96 + fbcon_update_vcs(fb_info, var->activate & FB_ACTIVATE_ALL); 97 97 console_unlock(); 98 98 if (err) 99 99 return err;
+3 -2
drivers/video/fbdev/ps3fb.c
··· 29 29 #include <linux/freezer.h> 30 30 #include <linux/uaccess.h> 31 31 #include <linux/fb.h> 32 + #include <linux/fbcon.h> 32 33 #include <linux/init.h> 33 34 34 35 #include <asm/cell-regs.h> ··· 825 824 var = info->var; 826 825 fb_videomode_to_var(&var, vmode); 827 826 console_lock(); 828 - info->flags |= FBINFO_MISC_USEREVENT; 829 827 /* Force, in case only special bits changed */ 830 828 var.activate |= FB_ACTIVATE_FORCE; 831 829 par->new_mode_id = val; 832 830 retval = fb_set_var(info, &var); 833 - info->flags &= ~FBINFO_MISC_USEREVENT; 831 + if (!retval) 832 + fbcon_update_vcs(info, var.activate & FB_ACTIVATE_ALL); 834 833 console_unlock(); 835 834 } 836 835 break;
-2
include/linux/fb.h
··· 400 400 #define FBINFO_HWACCEL_YPAN 0x2000 /* optional */ 401 401 #define FBINFO_HWACCEL_YWRAP 0x4000 /* optional */ 402 402 403 - #define FBINFO_MISC_USEREVENT 0x10000 /* event request 404 - from userspace */ 405 403 #define FBINFO_MISC_TILEBLITTING 0x20000 /* use tile blitting */ 406 404 407 405 /* A driver may set this flag to indicate that it does want a set_par to be