aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-07-15 10:39:47 +0200
committerDave Airlie <airlied@redhat.com>2010-07-20 15:24:09 +1000
commit772a2f9b488f4d27c314da5eeabde750b9ead41b (patch)
tree2cb96edb617d659b26cad8c603d664cfa0cd1373 /include
parentbbb642f9c9a43dbe45ffe14935397a2a34100263 (diff)
downloadlinux-2.6.34-ux500-772a2f9b488f4d27c314da5eeabde750b9ead41b.tar.gz
fb: handle allocation failure in alloc_apertures()
If the kzalloc() fails we should return NULL. All the places that call alloc_apertures() check for this already. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: James Simmons <jsimmons@infradead.org> Acked-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fb.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 8e5a9dfb76b..e7445df44d6 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -873,6 +873,8 @@ struct fb_info {
static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
struct apertures_struct *a = kzalloc(sizeof(struct apertures_struct)
+ max_num * sizeof(struct aperture), GFP_KERNEL);
+ if (!a)
+ return NULL;
a->count = max_num;
return a;
}