diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-07-15 10:39:47 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-20 15:24:09 +1000 |
| commit | 772a2f9b488f4d27c314da5eeabde750b9ead41b (patch) | |
| tree | 2cb96edb617d659b26cad8c603d664cfa0cd1373 | |
| parent | bbb642f9c9a43dbe45ffe14935397a2a34100263 (diff) | |
| download | linux-3.10-772a2f9b488f4d27c314da5eeabde750b9ead41b.tar.gz linux-3.10-772a2f9b488f4d27c314da5eeabde750b9ead41b.tar.bz2 linux-3.10-772a2f9b488f4d27c314da5eeabde750b9ead41b.zip | |
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>
| -rw-r--r-- | include/linux/fb.h | 2 |
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; } |