diff options
| author | Peter Samuelson | 2008-04-28 11:15:03 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-04-28 17:58:36 +0200 |
| commit | 57a7a6db0eed2862072497116232f57a6843cadd (patch) | |
| tree | 7335cd906fce91b3e87cbdcfad42a96ca11847ca | |
| parent | PM/gxfb: add hook to PM console layer that allows disabling of suspend VT switch (diff) | |
| download | kernel-qcow2-linux-57a7a6db0eed2862072497116232f57a6843cadd.tar.gz kernel-qcow2-linux-57a7a6db0eed2862072497116232f57a6843cadd.tar.xz kernel-qcow2-linux-57a7a6db0eed2862072497116232f57a6843cadd.zip | |
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>
| -rw-r--r-- | drivers/video/fbmem.c | 2 |
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, 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; |