From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EC9613F6DFF for ; Mon, 30 Jul 2018 12:27:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4550520881 for ; Mon, 30 Jul 2018 12:27:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4550520881 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729460AbeG3OCD (ORCPT ); Mon, 30 Jul 2018 10:02:03 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:53062 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727655AbeG3OCD (ORCPT ); Mon, 30 Jul 2018 10:02:03 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fk7Ge-00069W-Rv; Mon, 30 Jul 2018 12:27:16 +0000 From: Colin King To: Zhang Rui , Eduardo Valentin , linux-pm@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] thermal: armada: fix incorrect check for drvdata allocation failure Date: Mon, 30 Jul 2018 13:27:16 +0100 Message-Id: <20180730122716.6267-1-colin.king@canonical.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King Currently the drvdata allocation failure is being incorrectly checked by checking priv and not drvdata. Fix this and also free priv to fix a memory leak. Detected by Coverity Scan, CID#1472102 ("Logically dead code") Fixes: c9899c183921 ("thermal: armada: use the resource managed registration helper alternative") Signed-off-by: Colin Ian King --- drivers/thermal/armada_thermal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 4164a5a4e480..b164fd9f21ac 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -611,8 +611,10 @@ static int armada_thermal_probe(struct platform_device *pdev) return -ENOMEM; drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); - if (!priv) + if (!drvdata) { + devm_kfree(&pdev->dev, priv); return -ENOMEM; + } priv->dev = &pdev->dev; priv->data = (struct armada_thermal_data *)match->data; -- 2.17.1