diff options
| author |   Sachin Kamat <sachin.kamat@linaro.org> | 2014-05-30 15:56:34 +0530 |
|---|---|---|
| committer |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-06-26 14:40:15 +0300 |
| commit | 06f7d7931752ee1bd0903a38b1086c7ea5e10cdf (patch) | |
| tree | f8045e472d9bd56d5c4f0bb11de25b194b4dd00a /drivers/video | |
| parent | video: vt8500lcdfb: Remove kfree call since devm_kzalloc() is used (diff) | |
| download | linux-dev-06f7d7931752ee1bd0903a38b1086c7ea5e10cdf.tar.xz linux-dev-06f7d7931752ee1bd0903a38b1086c7ea5e10cdf.zip | |
video: omapdss: Fix potential null pointer dereference
kmalloc can return null. Add a check to avoid potential null
pointer dereference error when the pointer is accessed later.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c index 99af9e88b2d8..2f0822ee3ff9 100644 --- a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c +++ b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c @@ -121,9 +121,11 @@ static void __init omapdss_add_to_list(struct device_node *node, bool root) { struct dss_conv_node *n = kmalloc(sizeof(struct dss_conv_node), GFP_KERNEL); - n->node = node; - n->root = root; - list_add(&n->list, &dss_conv_list); + if (n) { + n->node = node; + n->root = root; + list_add(&n->list, &dss_conv_list); + } } static bool __init omapdss_list_contains(const struct device_node *node) |