Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-07-07 21:19:17 +0200
committerTakashi Iwai <tiwai@suse.de>2018-07-07 21:19:17 +0200
commit8a2422091597e35f407f2a19d6b7a89affac0d11 (patch)
tree559f23cdb2068963abab55155eeccbf800246c53
parent1ab36524fad90cbb3552141a5b15d728511cad51 (diff)
parent0a0a5a2c8d3975e1895508dafeb0a40c535db6e9 (diff)
Merge branch 'users/sndirsch/cve/linux-4.4/for-next' into cve/linux-4.4
-rw-r--r--drivers/video/fbdev/uvesafb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index 178ae93b7ebd..381236ff34d9 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;