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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 92659CDB47E for ; Wed, 18 Oct 2023 14:17:54 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 34F2BE96; Wed, 18 Oct 2023 16:17:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 34F2BE96 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1697638672; bh=mfNwd8a18pGzt/476le4pukhmP7xf/WAildRBkKKafA=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=t9zLT+vVXT7/SAE45WhyJCjSI07l/RBaqz/6AIoy91tafXU/nyQJaA6IMNG+6bor6 OO3Nm4Qh3aNDYiE7K9iCbBuNgRw2CL5XVSsU9dCn8KeZ5lQu83oAd0RXkN5SwFNVEU rlqTtP9Ik9QoXgrFGRE7ZQiaWOGcDhDI+pq1qF3Q= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 436A9F80580; Wed, 18 Oct 2023 16:16:24 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id DC962F80579; Wed, 18 Oct 2023 16:16:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 461DFF80564; Wed, 18 Oct 2023 16:16:20 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 73497F8027B for ; Wed, 18 Oct 2023 16:16:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 73497F8027B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=loM5Ep0B Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 60004617EF; Wed, 18 Oct 2023 14:16:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E840C433C9; Wed, 18 Oct 2023 14:16:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697638577; bh=mfNwd8a18pGzt/476le4pukhmP7xf/WAildRBkKKafA=; h=From:To:Cc:Subject:Date:From; b=loM5Ep0BKd1itNamwAUkp0Jqptl05SFilNLMZuRvU5H3mgbCEBDfwDLNqE7r/ReAd NVv+YVn6KCgaJSDySUbRimuON8yBydsNn4Y9R6AgPWI11eeVZwvmlF0wvEA5yrP+Ay 9XEuzjYtMmwy/QcEBetCEdNQCpk9Djri8oRy1SGEv3dMq0GlNr/JCa1aFCnlWYK6Kc IVhwMPz47KkCCDGnAp4/mVxx7w+CHN9FW3UN13/cnY5eh6OldmuuESr4SmqljDedHP 28bEn/cLVOkADYnBIcqWThi73+1tCiTUw2hjGPxF8qAb+x9WurnXaDZumJerL/2lJL 5+8v/F/THh07w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kuninori Morimoto , kernel test robot , Dan Carpenter , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, herve.codina@bootlin.com, astrid.rost@axis.com, christophe.leroy@csgroup.eu, aidanmacdonald.0x0@gmail.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.14 1/7] ASoC: simple-card: fixup asoc_simple_probe() error handling Date: Wed, 18 Oct 2023 10:16:06 -0400 Message-Id: <20231018141613.1335848-1-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.327 Content-Transfer-Encoding: 8bit Message-ID-Hash: IBUFLK4NHZCHLDZP27RF2E5TFCMWLG7P X-Message-ID-Hash: IBUFLK4NHZCHLDZP27RF2E5TFCMWLG7P X-MailFrom: sashal@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Kuninori Morimoto [ Upstream commit 41bae58df411f9accf01ea660730649b2fab1dab ] asoc_simple_probe() is used for both "DT probe" (A) and "platform probe" (B). It uses "goto err" when error case, but it is not needed for "platform probe" case (B). Thus it is using "return" directly there. static int asoc_simple_probe(...) { ^ if (...) { | ... (A) if (ret < 0) | goto err; v } else { ^ ... | if (ret < 0) (B) return -Exxx; v } ... ^ if (ret < 0) (C) goto err; v ... err: (D) simple_util_clean_reference(card); return ret; } Both case are using (C) part, and it calls (D) when err case. But (D) will do nothing for (B) case. Because of these behavior, current code itself is not wrong, but is confusable, and more, static analyzing tool will warning on (B) part (should use goto err). To avoid static analyzing tool warning, this patch uses "goto err" on (B) part. Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/87o7hy7mlh.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/generic/simple-card.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 6959a74a6f491..c5db2d9d44edd 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -441,10 +441,12 @@ static int asoc_simple_card_probe(struct platform_device *pdev) } else { struct asoc_simple_card_info *cinfo; + ret = -EINVAL; + cinfo = dev->platform_data; if (!cinfo) { dev_err(dev, "no info for asoc-simple-card\n"); - return -EINVAL; + goto err; } if (!cinfo->name || @@ -453,7 +455,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) !cinfo->platform || !cinfo->cpu_dai.name) { dev_err(dev, "insufficient asoc_simple_card_info settings\n"); - return -EINVAL; + goto err; } card->name = (cinfo->card) ? cinfo->card : cinfo->name; -- 2.40.1