From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755293AbcHSNRm (ORCPT ); Fri, 19 Aug 2016 09:17:42 -0400 Received: from mga09.intel.com ([134.134.136.24]:23548 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754949AbcHSNRj (ORCPT ); Fri, 19 Aug 2016 09:17:39 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,544,1464678000"; d="scan'208";a="1017328306" Message-ID: <1471612654.2691.76.camel@intel.com> Subject: Re: [PATCH] thermal: imx: fix a possible NULL dereference From: Zhang Rui To: LABBE Corentin , edubezval@gmail.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 19 Aug 2016 21:17:34 +0800 In-Reply-To: <1471337498-6382-1-git-send-email-clabbe.montjoie@gmail.com> References: <1471337498-6382-1-git-send-email-clabbe.montjoie@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2-0ubuntu3 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 二, 2016-08-16 at 10:51 +0200, LABBE Corentin wrote: > of_match_device could return NULL, and so cause a NULL pointer > dereference later at line 472: > data->socdata = of_id->data; > > For fixing this problem, we use of_device_get_match_data(), this will > simplify the code a little by using a standard function for > getting the match data. > > Reported-by: coverity (CID 1324128) > Signed-off-by: LABBE Corentin patch applied. thanks, rui > --- >  drivers/thermal/imx_thermal.c | 4 +--- >  1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/thermal/imx_thermal.c > b/drivers/thermal/imx_thermal.c > index c5547bd..e473548b 100644 > --- a/drivers/thermal/imx_thermal.c > +++ b/drivers/thermal/imx_thermal.c > @@ -471,8 +471,6 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match); >   >  static int imx_thermal_probe(struct platform_device *pdev) >  { > - const struct of_device_id *of_id = > - of_match_device(of_imx_thermal_match, &pdev->dev); >   struct imx_thermal_data *data; >   struct regmap *map; >   int measure_freq; > @@ -490,7 +488,7 @@ static int imx_thermal_probe(struct > platform_device *pdev) >   } >   data->tempmon = map; >   > - data->socdata = of_id->data; > + data->socdata = of_device_get_match_data(&pdev->dev); >   >   /* make sure the IRQ flag is clear before enabling irq on > i.MX6SX */ >   if (data->socdata->version == TEMPMON_IMX6SX) {