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

Commit 57a7a6db authored by Peter Samuelson's avatar Peter Samuelson Committed by Linus Torvalds
Browse files

fbmem: fix con2fbmap limit check 



Fix limit check in FBIOPUT_CON2FBMAP ioctl.

Signed-off-by: default avatarPeter Samuelson <peter@p12n.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b6f448e9

drivers/video/fbmem.c

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 
	case FBIOPUT_CON2FBMAP:

		if (copy_from_user(&con2fb, argp, sizeof(con2fb)))

			return - EFAULT;

		if (con2fb.console < 0 || con2fb.console > MAX_NR_CONSOLES)

		if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)

		    return -EINVAL;

		if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)

		    return -EINVAL;