diff options
| author | Kees Cook <keescook@chromium.org> | 2018-05-11 18:24:12 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-03 11:18:48 +0200 |
| commit | 7568ba6cc40986d9553820da9468f94d0591942b (patch) | |
| tree | 1e9595408ae79b0369ea6797c9d2362ef8052a5b | |
| parent | 626fb93235dc1cc8c52478712737ffd4451301e7 (diff) | |
| download | linux-7568ba6cc40986d9553820da9468f94d0591942b.tar.gz linux-7568ba6cc40986d9553820da9468f94d0591942b.tar.bz2 linux-7568ba6cc40986d9553820da9468f94d0591942b.zip | |
video: uvesafb: Fix integer overflow in allocation
commit 9f645bcc566a1e9f921bdae7528a01ced5bc3713 upstream.
cmap->len can get close to INT_MAX/2, allowing for an integer overflow in
allocation. This uses kmalloc_array() instead to catch the condition.
Reported-by: Dr Silvio Cesare of InfoSect <silvio.cesare@gmail.com>
Fixes: 8bdb3a2d7df48 ("uvesafb: the driver core")
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/video/fbdev/uvesafb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c index 509d452e8f91..74ac73d3a0e9 100644 --- a/drivers/video/fbdev/uvesafb.c +++ b/drivers/video/fbdev/uvesafb.c @@ -1059,7 +1059,8 @@ static int uvesafb_setcmap(struct fb_cmap *cmap, struct fb_info *info) info->cmap.len || cmap->start < info->cmap.start) return -EINVAL; - entries = kmalloc(sizeof(*entries) * cmap->len, GFP_KERNEL); + entries = kmalloc_array(cmap->len, sizeof(*entries), + GFP_KERNEL); if (!entries) return -ENOMEM; |