[PATCH] video:fbdev:core:Calculate the size for colormap only after the validation of length for colormap.

From: Shailendra Verma
Date: Mon Nov 09 2015 - 03:07:09 EST


From: Shailendra Verma <shailendra.v@xxxxxxxxxxx>

While allocating the memory for color map, the memory size for colors
is being calculated before the validation of length for color map.
Moved the size calculation part after the validation of color map length.

Signed-off-by: Shailendra Verma <shailendra.v@xxxxxxxxxxx>
---
drivers/video/fbdev/core/fbcmap.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c
index f89245b..45ad567 100644
--- a/drivers/video/fbdev/core/fbcmap.c
+++ b/drivers/video/fbdev/core/fbcmap.c
@@ -91,7 +91,7 @@ static const struct fb_cmap default_16_colors = {

int fb_alloc_cmap_gfp(struct fb_cmap *cmap, int len, int transp, gfp_t flags)
{
- int size = len * sizeof(u16);
+ int size;
int ret = -ENOMEM;

if (cmap->len != len) {
@@ -99,6 +99,7 @@ int fb_alloc_cmap_gfp(struct fb_cmap *cmap, int len, int transp, gfp_t flags)
if (!len)
return 0;

+ size = len * sizeof(u16);
cmap->red = kmalloc(size, flags);
if (!cmap->red)
goto fail;
--
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/