From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933250AbbELSZE (ORCPT ); Tue, 12 May 2015 14:25:04 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:53229 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932809AbbELSZA (ORCPT ); Tue, 12 May 2015 14:25:00 -0400 From: Colin King To: Greg Kroah-Hartman , Gigi Joseph , Eyal Reizer Cc: linux-kernel@vger.kernel.org Subject: [PATCH] ti-st: handle null allocation return correctly. Date: Tue, 12 May 2015 19:23:03 +0100 Message-Id: <1431454983-7800-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King 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 --- 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) -- 2.1.4