summaryrefslogtreecommitdiffstats
path: root/drivers/video/vfb.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-18 07:39:47 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-26 07:28:56 +0200
commit04f8afbec37f63fafce16e454a7848426aa36202 (patch)
tree1c761c03f67ebdc71163aaaf0389a092f29916c6 /drivers/video/vfb.c
parentfbdev/ps3fb: use vm_iomap_memory() (diff)
downloadlinux-04f8afbec37f63fafce16e454a7848426aa36202.tar.xz
linux-04f8afbec37f63fafce16e454a7848426aa36202.zip
fbdev: improve fb_mmap bounds checks
Improve fb_mmap bounds checks in gbefb, smscufx, udlfb and vfb drivers to prevent possible uint overflows. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: Steve Glendinning <steve.glendinning@smsc.com> Cc: Bernie Thompson <bernie@plugable.com>
Diffstat (limited to 'drivers/video/vfb.c')
-rw-r--r--drivers/video/vfb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 8bc1f9398945..ee5985efa15c 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -420,9 +420,12 @@ static int vfb_mmap(struct fb_info *info,
unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
unsigned long page, pos;
- if (offset + size > info->fix.smem_len) {
+ if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
+ return -EINVAL;
+ if (size > info->fix.smem_len)
+ return -EINVAL;
+ if (offset > info->fix.smem_len - size)
return -EINVAL;
- }
pos = (unsigned long)info->fix.smem_start + offset;