2 files changed, 21 insertions, 8 deletions

diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index a79b9762901..affdf3e32cf 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -88,26 +88,27 @@ static const struct fb_cmap default_16_colors = {
  *
  */
 
-int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp)
+int fb_alloc_cmap_gfp(struct fb_cmap *cmap, int len, int transp, gfp_t flags)
 {
         int size = len * sizeof(u16);
+        int ret = -ENOMEM;
 
         if (cmap->len != len) {
                 fb_dealloc_cmap(cmap);
                 if (!len)
                         return 0;
 
-                cmap->red = kmalloc(size, GFP_ATOMIC);
+                cmap->red = kmalloc(size, flags);
                 if (!cmap->red)
                         goto fail;
-                cmap->green = kmalloc(size, GFP_ATOMIC);
+                cmap->green = kmalloc(size, flags);
                 if (!cmap->green)
                         goto fail;
-                cmap->blue = kmalloc(size, GFP_ATOMIC);
+                cmap->blue = kmalloc(size, flags);
                 if (!cmap->blue)
                         goto fail;
                 if (transp) {
-                        cmap->transp = kmalloc(size, GFP_ATOMIC);
+                        cmap->transp = kmalloc(size, flags);
                         if (!cmap->transp)
                                 goto fail;
                 } else {
@@ -116,12 +117,19 @@ int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp)
         }
         cmap->start = 0;
         cmap->len = len;
-        fb_copy_cmap(fb_default_cmap(len), cmap);
+        ret = fb_copy_cmap(fb_default_cmap(len), cmap);
+        if (ret)
+                goto fail;
         return 0;
 
 fail:
         fb_dealloc_cmap(cmap);
-        return -ENOMEM;
+        return ret;
+}
+
+int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp)
+{
+        return fb_alloc_cmap_gfp(cmap, len, transp, GFP_ATOMIC);
 }
 
 /**
@@ -256,8 +264,12 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
         int rc, size = cmap->len * sizeof(u16);
         struct fb_cmap umap;
 
+        if (size < 0 || size < cmap->len)
+                return -E2BIG;
+
         memset(&umap, 0, sizeof(struct fb_cmap));
-        rc = fb_alloc_cmap(&umap, cmap->len, cmap->transp != NULL);
+        rc = fb_alloc_cmap_gfp(&umap, cmap->len, cmap->transp != NULL,
+                                GFP_KERNEL);
         if (rc)
                 return rc;
         if (copy_from_user(umap.red, cmap->red, size) ||
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 7fca3dc4e47..d1631d37e9e 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -1122,6 +1122,7 @@ extern const struct fb_videomode *fb_find_best_display(const struct fb_monspecs
 
 /* drivers/video/fbcmap.c */
 extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp);
+extern int fb_alloc_cmap_gfp(struct fb_cmap *cmap, int len, int transp, gfp_t flags);
 extern void fb_dealloc_cmap(struct fb_cmap *cmap);
 extern int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to);
 extern int fb_cmap_to_user(const struct fb_cmap *from, struct fb_cmap_user *to);