[PATCH] ti-st: handle null allocation return correctly.

From: Colin King
Date: Tue May 12 2015 - 14:25:07 EST

From: Colin Ian King <colin.king@xxxxxxxxxxxxx>

static analysis with smatch picked up the following error:

get_platform_data() error: potential null dereference 'dt_pdata'.
(kzalloc returns null)

ironically, the code already checks for a null kzalloc return and
emits an error message. Fix by adding an error return of NULL rather
than continuing and tripping the null dereference.

Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
drivers/misc/ti-st/st_kim.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 18e7a03..5a5265a 100644
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
@@ -753,8 +753,10 @@ static struct ti_st_plat_data *get_platform_data(struct device *dev)

dt_pdata = kzalloc(sizeof(*dt_pdata), GFP_KERNEL);

- if (!dt_pdata)
+ if (!dt_pdata) {
pr_err("Can't allocate device_tree platform data\n");
+ return NULL;
+ }

dt_property = of_get_property(np, "dev_name", &len);
if (dt_property)

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/