Commit d249085a authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Khalid Elmously

fbdev/omapfb: fix omapfb_memory_read infoleak

BugLink: https://bugs.launchpad.net/bugs/1801893

commit 1bafcbf5 upstream.

OMAPFB_MEMORY_READ ioctl reads pixels from the LCD's memory and copies
them to a userspace buffer. The code has two issues:

- The user provided width and height could be large enough to overflow
  the calculations
- The copy_to_user() can copy uninitialized memory to the userspace,
  which might contain sensitive kernel information.

Fix these by limiting the width & height parameters, and only copying
the amount of data that we actually received from the LCD.
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reported-by: default avatarJann Horn <jannh@google.com>
Cc: stable@vger.kernel.org
Cc: security@kernel.org
Cc: Will Deacon <will.deacon@arm.com>
Cc: Jann Horn <jannh@google.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 1990bdfb
...@@ -496,6 +496,9 @@ static int omapfb_memory_read(struct fb_info *fbi, ...@@ -496,6 +496,9 @@ static int omapfb_memory_read(struct fb_info *fbi,
if (!access_ok(VERIFY_WRITE, mr->buffer, mr->buffer_size)) if (!access_ok(VERIFY_WRITE, mr->buffer, mr->buffer_size))
return -EFAULT; return -EFAULT;
if (mr->w > 4096 || mr->h > 4096)
return -EINVAL;
if (mr->w * mr->h * 3 > mr->buffer_size) if (mr->w * mr->h * 3 > mr->buffer_size)
return -EINVAL; return -EINVAL;
...@@ -509,7 +512,7 @@ static int omapfb_memory_read(struct fb_info *fbi, ...@@ -509,7 +512,7 @@ static int omapfb_memory_read(struct fb_info *fbi,
mr->x, mr->y, mr->w, mr->h); mr->x, mr->y, mr->w, mr->h);
if (r > 0) { if (r > 0) {
if (copy_to_user(mr->buffer, buf, mr->buffer_size)) if (copy_to_user(mr->buffer, buf, r))
r = -EFAULT; r = -EFAULT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment