* [PATCH] fbdev: color map copying bounds checking
@ 2017-01-05 22:42 ` Kees Cook
0 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2017-01-05 22:42 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-kernel, linux-fbdev, Min Chong, Dan Carpenter
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
Reported-by: Peter Pi (@heisecode) of Trend Micro
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/video/fbdev/core/fbcmap.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c
index f89245b8ba8e..68a113594808 100644
--- a/drivers/video/fbdev/core/fbcmap.c
+++ b/drivers/video/fbdev/core/fbcmap.c
@@ -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 tooff = 0, fromoff = 0;
- int size;
+ unsigned int tooff = 0, fromoff = 0;
+ size_t size;
if (to->start > from->start)
fromoff = to->start - from->start;
else
tooff = from->start - to->start;
- size = to->len - tooff;
- if (size > (int) (from->len - fromoff))
- size = from->len - fromoff;
- if (size <= 0)
+ if (fromoff >= from->len || tooff >= to->len)
+ return -EINVAL;
+
+ size = min_t(size_t, to->len - tooff, from->len - fromoff);
+ if (size == 0)
return -EINVAL;
size *= sizeof(u16);
@@ -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 tooff = 0, fromoff = 0;
- int size;
+ unsigned int tooff = 0, fromoff = 0;
+ size_t size;
if (to->start > from->start)
fromoff = to->start - from->start;
else
tooff = from->start - to->start;
- size = to->len - tooff;
- if (size > (int) (from->len - fromoff))
- size = from->len - fromoff;
- if (size <= 0)
+ if (fromoff >= from->len || tooff >= to->len)
+ return -EINVAL;
+
+ size = min_t(size_t, to->len - tooff, from->len - fromoff);
+ if (size == 0)
return -EINVAL;
size *= sizeof(u16);
--
2.7.4
--
Kees Cook
Nexus Security
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] fbdev: color map copying bounds checking
@ 2017-01-05 22:42 ` Kees Cook
0 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2017-01-05 22:42 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-kernel, linux-fbdev, Min Chong, Dan Carpenter
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
Reported-by: Peter Pi (@heisecode) of Trend Micro
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/video/fbdev/core/fbcmap.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c
index f89245b8ba8e..68a113594808 100644
--- a/drivers/video/fbdev/core/fbcmap.c
+++ b/drivers/video/fbdev/core/fbcmap.c
@@ -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 tooff = 0, fromoff = 0;
- int size;
+ unsigned int tooff = 0, fromoff = 0;
+ size_t size;
if (to->start > from->start)
fromoff = to->start - from->start;
else
tooff = from->start - to->start;
- size = to->len - tooff;
- if (size > (int) (from->len - fromoff))
- size = from->len - fromoff;
- if (size <= 0)
+ if (fromoff >= from->len || tooff >= to->len)
+ return -EINVAL;
+
+ size = min_t(size_t, to->len - tooff, from->len - fromoff);
+ if (size = 0)
return -EINVAL;
size *= sizeof(u16);
@@ -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 tooff = 0, fromoff = 0;
- int size;
+ unsigned int tooff = 0, fromoff = 0;
+ size_t size;
if (to->start > from->start)
fromoff = to->start - from->start;
else
tooff = from->start - to->start;
- size = to->len - tooff;
- if (size > (int) (from->len - fromoff))
- size = from->len - fromoff;
- if (size <= 0)
+ if (fromoff >= from->len || tooff >= to->len)
+ return -EINVAL;
+
+ size = min_t(size_t, to->len - tooff, from->len - fromoff);
+ if (size = 0)
return -EINVAL;
size *= sizeof(u16);
--
2.7.4
--
Kees Cook
Nexus Security
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] fbdev: color map copying bounds checking
2017-01-05 22:42 ` Kees Cook
@ 2017-01-19 20:35 ` Kees Cook
-1 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2017-01-19 20:35 UTC (permalink / raw)
To: Andrew Morton; +Cc: LKML, linux-fbdev, Min Chong, Dan Carpenter, Tomi Valkeinen
Hi again,
It's been two weeks with no response. This fixes a kernel heap OOB
read. Andrew, can you take this into -mm?
-Kees
On Thu, Jan 5, 2017 at 2:42 PM, Kees Cook <keescook@chromium.org> wrote:
> 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
>
> Reported-by: Peter Pi (@heisecode) of Trend Micro
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Cc: stable@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> drivers/video/fbdev/core/fbcmap.c | 26 ++++++++++++++------------
> 1 file changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c
> index f89245b8ba8e..68a113594808 100644
> --- a/drivers/video/fbdev/core/fbcmap.c
> +++ b/drivers/video/fbdev/core/fbcmap.c
> @@ -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 tooff = 0, fromoff = 0;
> - int size;
> + unsigned int tooff = 0, fromoff = 0;
> + size_t size;
>
> if (to->start > from->start)
> fromoff = to->start - from->start;
> else
> tooff = from->start - to->start;
> - size = to->len - tooff;
> - if (size > (int) (from->len - fromoff))
> - size = from->len - fromoff;
> - if (size <= 0)
> + if (fromoff >= from->len || tooff >= to->len)
> + return -EINVAL;
> +
> + size = min_t(size_t, to->len - tooff, from->len - fromoff);
> + if (size == 0)
> return -EINVAL;
> size *= sizeof(u16);
>
> @@ -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 tooff = 0, fromoff = 0;
> - int size;
> + unsigned int tooff = 0, fromoff = 0;
> + size_t size;
>
> if (to->start > from->start)
> fromoff = to->start - from->start;
> else
> tooff = from->start - to->start;
> - size = to->len - tooff;
> - if (size > (int) (from->len - fromoff))
> - size = from->len - fromoff;
> - if (size <= 0)
> + if (fromoff >= from->len || tooff >= to->len)
> + return -EINVAL;
> +
> + size = min_t(size_t, to->len - tooff, from->len - fromoff);
> + if (size == 0)
> return -EINVAL;
> size *= sizeof(u16);
>
> --
> 2.7.4
>
>
> --
> Kees Cook
> Nexus Security
--
Kees Cook
Nexus Security
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] fbdev: color map copying bounds checking
@ 2017-01-19 20:35 ` Kees Cook
0 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2017-01-19 20:35 UTC (permalink / raw)
To: Andrew Morton; +Cc: LKML, linux-fbdev, Min Chong, Dan Carpenter, Tomi Valkeinen
Hi again,
It's been two weeks with no response. This fixes a kernel heap OOB
read. Andrew, can you take this into -mm?
-Kees
On Thu, Jan 5, 2017 at 2:42 PM, Kees Cook <keescook@chromium.org> wrote:
> 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
>
> Reported-by: Peter Pi (@heisecode) of Trend Micro
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Cc: stable@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> drivers/video/fbdev/core/fbcmap.c | 26 ++++++++++++++------------
> 1 file changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c
> index f89245b8ba8e..68a113594808 100644
> --- a/drivers/video/fbdev/core/fbcmap.c
> +++ b/drivers/video/fbdev/core/fbcmap.c
> @@ -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 tooff = 0, fromoff = 0;
> - int size;
> + unsigned int tooff = 0, fromoff = 0;
> + size_t size;
>
> if (to->start > from->start)
> fromoff = to->start - from->start;
> else
> tooff = from->start - to->start;
> - size = to->len - tooff;
> - if (size > (int) (from->len - fromoff))
> - size = from->len - fromoff;
> - if (size <= 0)
> + if (fromoff >= from->len || tooff >= to->len)
> + return -EINVAL;
> +
> + size = min_t(size_t, to->len - tooff, from->len - fromoff);
> + if (size = 0)
> return -EINVAL;
> size *= sizeof(u16);
>
> @@ -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 tooff = 0, fromoff = 0;
> - int size;
> + unsigned int tooff = 0, fromoff = 0;
> + size_t size;
>
> if (to->start > from->start)
> fromoff = to->start - from->start;
> else
> tooff = from->start - to->start;
> - size = to->len - tooff;
> - if (size > (int) (from->len - fromoff))
> - size = from->len - fromoff;
> - if (size <= 0)
> + if (fromoff >= from->len || tooff >= to->len)
> + return -EINVAL;
> +
> + size = min_t(size_t, to->len - tooff, from->len - fromoff);
> + if (size = 0)
> return -EINVAL;
> size *= sizeof(u16);
>
> --
> 2.7.4
>
>
> --
> Kees Cook
> Nexus Security
--
Kees Cook
Nexus Security
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-19 20:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-05 22:42 [PATCH] fbdev: color map copying bounds checking Kees Cook
2017-01-05 22:42 ` Kees Cook
2017-01-19 20:35 ` Kees Cook
2017-01-19 20:35 ` Kees Cook
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.