From eed6b7c84cc33f229f6fecd884d9a22af5bec514 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 28 Jul 2000 22:58:42 +0000 Subject: Merge with Linux 2.4.0-test5-pre6. --- drivers/video/fbmem.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'drivers/video/fbmem.c') diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index bf34ca0da..9cb20fc0d 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -411,6 +411,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, case FBIOPAN_DISPLAY: if (copy_from_user(&var, (void *) arg, sizeof(var))) return -EFAULT; + if (fb->fb_pan_display == NULL) + return (var.xoffset || var.yoffset) ? -EINVAL : 0; if ((i=fb->fb_pan_display(&var, PROC_CONSOLE(info), info))) return i; if (copy_to_user((void *) arg, &var, sizeof(var))) @@ -450,6 +452,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, (*info->blank)(arg, info); return 0; default: + if (fb->fb_ioctl == NULL) + return -EINVAL; return fb->fb_ioctl(inode, file, cmd, arg, PROC_CONSOLE(info), info); } -- cgit v1.2.3