Commit 544160b6 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman

fbdev: color map copying bounds checking

commit 2dc705a9 upstream.

Copying color maps to userspace doesn't check the value of to->start,
which will cause kernel heap buffer OOB read due to signedness wraps.

CVE-2016-8405

Link: http://lkml.kernel.org/r/20170105224249.GA50925@beast
Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reported-by: Peter Pi (@heisecode) of Trend Micro
Cc: Min Chong <mchong@google.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09f886dc
...@@ -163,17 +163,18 @@ void fb_dealloc_cmap(struct fb_cmap *cmap) ...@@ -163,17 +163,18 @@ void fb_dealloc_cmap(struct fb_cmap *cmap)
int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to) int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to)
{ {
int tooff = 0, fromoff = 0; unsigned int tooff = 0, fromoff = 0;
int size; size_t size;
if (to->start > from->start) if (to->start > from->start)
fromoff = to->start - from->start; fromoff = to->start - from->start;
else else
tooff = from->start - to->start; tooff = from->start - to->start;
size = to->len - tooff; if (fromoff >= from->len || tooff >= to->len)
if (size > (int) (from->len - fromoff)) return -EINVAL;
size = from->len - fromoff;
if (size <= 0) size = min_t(size_t, to->len - tooff, from->len - fromoff);
if (size == 0)
return -EINVAL; return -EINVAL;
size *= sizeof(u16); size *= sizeof(u16);
...@@ -187,17 +188,18 @@ int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to) ...@@ -187,17 +188,18 @@ int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to)
int fb_cmap_to_user(const struct fb_cmap *from, struct fb_cmap_user *to) int fb_cmap_to_user(const struct fb_cmap *from, struct fb_cmap_user *to)
{ {
int tooff = 0, fromoff = 0; unsigned int tooff = 0, fromoff = 0;
int size; size_t size;
if (to->start > from->start) if (to->start > from->start)
fromoff = to->start - from->start; fromoff = to->start - from->start;
else else
tooff = from->start - to->start; tooff = from->start - to->start;
size = to->len - tooff; if (fromoff >= from->len || tooff >= to->len)
if (size > (int) (from->len - fromoff)) return -EINVAL;
size = from->len - fromoff;
if (size <= 0) size = min_t(size_t, to->len - tooff, from->len - fromoff);
if (size == 0)
return -EINVAL; return -EINVAL;
size *= sizeof(u16); size *= sizeof(u16);
......
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