aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2008-04-28 05:15:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:36 -0400
commit57a7a6db0eed2862072497116232f57a6843cadd (patch)
tree7335cd906fce91b3e87cbdcfad42a96ca11847ca /drivers/video
parentb6f448e99ce7955b9707ed36a46cab2c6ddf7ddc (diff)
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbmem.c2
1 files changed, 1 insertions, 1 deletions
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,
1057 case FBIOPUT_CON2FBMAP: 1057 case FBIOPUT_CON2FBMAP:
1058 if (copy_from_user(&con2fb, argp, sizeof(con2fb))) 1058 if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
1059 return - EFAULT; 1059 return - EFAULT;
1060 if (con2fb.console < 0 || con2fb.console > MAX_NR_CONSOLES) 1060 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
1061 return -EINVAL; 1061 return -EINVAL;
1062 if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX) 1062 if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
1063 return -EINVAL; 1063 return -EINVAL;