From: Peter Samuelson <peter@p12n.org>
Date: Mon, 28 Apr 2008 09:15:03 +0000 (-0700)
Subject: fbmem: fix con2fbmap limit check
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=57a7a6db0eed2862072497116232f57a6843cadd;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

fbmem: fix con2fbmap limit check

Fix limit check in FBIOPUT_CON2FBMAP ioctl.

Signed-off-by: Peter Samuelson <peter@p12n.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 279c2dbef8f8..0c1461b26dd6 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -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;