Path: csiph.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod From: LABBE Corentin Newsgroups: linux.kernel Subject: [PATCH] thermal: imx: fix a possible NULL dereference Date: Tue, 16 Aug 2016 11:00:01 +0200 Message-ID: Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=E7ZClY1YJP2hLxex6GDoofloadxChHQuD8nV6Z7eN1Q=; b=Y7FZSBKOhdtwuTjmuetcnEeIgSetPY6ZJJp6+9SY/RnqWsiDZ+mCpA5RadYNHNzZlP KlhWsmcH42Al2CCsjZ39iG+t00hBARzSNxftymA7/yxGm/S/9gDittBq4kXwT4NcmkDJ 4aeOjf2epHYeDS55aru7dag8GtdRewuQe6r8FIkkLNBMKOubYJQZ4MT8PIMvFPzoqhHZ tyLoN9zx/yOSz2myWbCbXsNzxFY8T3ZGVrsEh2B3UKO5/qcqBeMPOn2+5RpKPe50eJox xcQQfHrV7evcFGn5CuU2HRE+85kMlYF5nBkDdN4Fh3zpOaXEaqsFybbWMTaXGy/X2Wz6 60eQ== X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=E7ZClY1YJP2hLxex6GDoofloadxChHQuD8nV6Z7eN1Q=; b=KOT0dxSZlEHKHN8PJzwsVK5TRLeN47xupmTH/GRmRgPR4FRTiDYAjRBN0aaUc3azQQ Htwi9nbLJ5EFmZZmtY2Drc6GkbPc+fiTb4BytRZvfytrj4emNWb058/DCSlX/IHW9KVR h044umqvSwIhHqNFtDL3J0JKKwT0d/yHEB9fqim8vfcVcB3STzzume8eja68cKKJe3tz vPoLP7DJaJCw8F2WHPUNrIonzfZGGz2Kg6BdYm21S8nqxsTyc/tL8J/0pKxwthY5GRFL 87BRvgGSKgcudLsWnKg/HM5fD2UR2XqEPZqchIoOFAcV9KeLC30r12/fwws/QOJT2CGQ 65zQ== X-Gm-Message-State: AEkoouv/WgcuQOZ1qgHc1daSkkmANf4itlTiPY5fQzOYO1Z3EhQ1U7yKx8NLuHhQnkHrBg== X-Received: by 10.194.143.17 with SMTP id sa17mr34998495wjb.97.1471337501842; Tue, 16 Aug 2016 01:51:41 -0700 (PDT) X-Mailer: git-send-email 2.7.3 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 38 Organization: linux.* mail to news gateway X-Original-Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, LABBE Corentin X-Original-Date: Tue, 16 Aug 2016 10:51:38 +0200 X-Original-Message-ID: <1471337498-6382-1-git-send-email-clabbe.montjoie@gmail.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1463552 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 --- 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) { -- 2.7.3