Skip to content

Commit e787e97

Browse files
gkennedy12gregkh
authored andcommitted
fbmem: add margin check to fb_check_caps()
commit a49145acfb975d921464b84fe00279f99827d816 upstream. A fb_ioctl() FBIOPUT_VSCREENINFO call with invalid xres setting or yres setting in struct fb_var_screeninfo will result in a KASAN: vmalloc-out-of-bounds failure in bitfill_aligned() as the margins are being cleared. The margins are cleared in chunks and if the xres setting or yres setting is a value of zero upto the chunk size, the failure will occur. Add a margin check to validate xres and yres settings. Signed-off-by: George Kennedy <george.kennedy@oracle.com> Reported-by: syzbot+e5fd3e65515b48c02a30@syzkaller.appspotmail.com Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: Dhaval Giani <dhaval.giani@oracle.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/1594149963-13801-1-git-send-email-george.kennedy@oracle.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 755a2f4 commit e787e97

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/video/fbdev/core/fbmem.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,10 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
10011001
goto done;
10021002
}
10031003

1004+
/* bitfill_aligned() assumes that it's at least 8x8 */
1005+
if (var->xres < 8 || var->yres < 8)
1006+
return -EINVAL;
1007+
10041008
ret = info->fbops->fb_check_var(var, info);
10051009

10061010
if (ret)

0 commit comments

Comments
 (0)