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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 EF95CC433E0 for ; Mon, 22 Feb 2021 21:35:18 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 62F9A64E2E for ; Mon, 22 Feb 2021 21:35:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62F9A64E2E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A19AC1678; Mon, 22 Feb 2021 22:34:26 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A19AC1678 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1614029716; bh=JsU7U8mXU83c7mlYyQi2x+nCh6aImY+OJC+865OUtNM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Jd2ivm9XR/buJkPMqQa7dJAPFeJYrJGEzk61ntfZVRahW1TeuK6Rh49sk3zAchvdu 18jeXAC5egcT1eizi5BUWTv3X8SMfK4MA96aTN5toX328O/ho9Hlk0kKG0IM7R8Xgf OoxQ7R+NuU5XnTaH+jmR7BFiH3uxBZtw27XE0jMk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B67ABF8027C; Mon, 22 Feb 2021 22:33:36 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 04CFBF800CE; Mon, 22 Feb 2021 22:33:32 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E44D6F800CE for ; Mon, 22 Feb 2021 22:33:25 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E44D6F800CE IronPort-SDR: 6mhqfDXeA3vzJ8VZ+j6UGV8T9SBZ1ePVtDe1pUBR2N5WbtS8wITqaRmpFiN7bGdRuK8i/qX8Yf 37HtLBZhRofg== X-IronPort-AV: E=McAfee;i="6000,8403,9903"; a="171739986" X-IronPort-AV: E=Sophos;i="5.81,198,1610438400"; d="scan'208";a="171739986" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Feb 2021 13:33:18 -0800 IronPort-SDR: 9pENbONdmUNgFfBiV9sgGlDe//X0vmsEgq8IEKI/mRC1sU20uqnrz+yC5vuubiYyaijLdiRIWb cjcPjb/KoOKg== X-IronPort-AV: E=Sophos;i="5.81,198,1610438400"; d="scan'208";a="423270696" Received: from sspurohi-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.212.54.136]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Feb 2021 13:33:16 -0800 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Subject: [PATCH v2 1/6] ASoC: samsung: tm2_wm5510: fix check of of_parse return value Date: Mon, 22 Feb 2021 15:33:01 -0600 Message-Id: <20210222213306.22654-2-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210222213306.22654-1-pierre-louis.bossart@linux.intel.com> References: <20210222213306.22654-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: tiwai@suse.de, Pierre-Louis Bossart , stable@vger.kernel.org, broonie@kernel.org, Krzysztof Kozlowski X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" cppcheck warning: sound/soc/samsung/tm2_wm5110.c:605:6: style: Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment] ret = devm_snd_soc_register_component(dev, &tm2_component, ^ sound/soc/samsung/tm2_wm5110.c:554:7: note: ret is assigned ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller", ^ sound/soc/samsung/tm2_wm5110.c:605:6: note: ret is overwritten ret = devm_snd_soc_register_component(dev, &tm2_component, ^ The args is a stack variable, so it could have junk (uninitialized) therefore args.np could have a non-NULL and random value even though property was missing. Later could trigger invalid pointer dereference. This patch provides the correct fix, there's no need to check for args.np because args.np won't be initialized on errors. Fixes: 75fa6833aef3 ("ASoC: samsung: tm2_wm5110: check of_parse return value") Fixes: 8d1513cef51a ("ASoC: samsung: Add support for HDMI audio on TM2board") Cc: Suggested-by: Krzysztof Kozlowski Signed-off-by: Pierre-Louis Bossart --- sound/soc/samsung/tm2_wm5110.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index da6204248f82..125e07f65d2b 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -553,7 +553,7 @@ static int tm2_probe(struct platform_device *pdev) ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller", cells_name, i, &args); - if (ret || !args.np) { + if (ret) { dev_err(dev, "i2s-controller property parse error: %d\n", i); ret = -EINVAL; goto dai_node_put; -- 2.25.1