From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6833B26B756; Wed, 3 Dec 2025 16:09:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778156; cv=none; b=lLYWk1q00pRpgMd9qi667QwIUnU7IZ0B6yiZs2q5kqxDhp9SbJ03TMNmrVpGXT2SalsbNuRt3CXCQj3f6jOif06xe044HS1ZY6f/SBGyYU0G7dLL0tsI6OPa3Lc2BK9tiPsXCNVHOPyT9oiRifOxKSA61Bza9IGFZw8XTk21voI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778156; c=relaxed/simple; bh=UjjfYtCQFpVVS7MQ5gDTps54xg5orISmvHbgK5odRCk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YmV/3AXd4IYeuAVaRrwH2+Ia6xV8T39rdv9XF5ixABz4GiYt2ttjDlDGB+8xWxwcV5rlXIw0rloETgQge3qA2z1kVKIIUALDemZRw6IF1jrbdaIhYArzm1eKInQMme8YeuoiVisUC+5SqhXi5sf8YYFdSLsXRXLA4BjIV1719Y4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1+PYkX/n; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1+PYkX/n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 785ACC4CEF5; Wed, 3 Dec 2025 16:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764778156; bh=UjjfYtCQFpVVS7MQ5gDTps54xg5orISmvHbgK5odRCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1+PYkX/nbDfii28LAOqCn8qz7m6L6iJmPBKYQ+Ar62YspP+9adKrjxFmN+5EejFCW Gc6qHmJW3rvTADsgO3/DNjfmVtHUH4qC6OJhmcvnIGCkQ5ggT3pa1xG276PqjzkBwl NJ45fQxqf135sfptsnYn4HJfokVIEzadhZD0Nrzk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haotian Zhang , Charles Keepax , Mark Brown , Sasha Levin Subject: [PATCH 5.15 260/392] ASoC: cs4271: Fix regulator leak on probe failure Date: Wed, 3 Dec 2025 16:26:50 +0100 Message-ID: <20251203152423.735520011@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152414.082328008@linuxfoundation.org> References: <20251203152414.082328008@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haotian Zhang [ Upstream commit 6b6eddc63ce871897d3a5bc4f8f593e698aef104 ] The probe function enables regulators at the beginning but fails to disable them in its error handling path. If any operation after enabling the regulators fails, the probe will exit with an error, leaving the regulators permanently enabled, which could lead to a resource leak. Add a proper error handling path to call regulator_bulk_disable() before returning an error. Fixes: 9a397f473657 ("ASoC: cs4271: add regulator consumer support") Signed-off-by: Haotian Zhang Reviewed-by: Charles Keepax Link: https://patch.msgid.link/20251105062246.1955-1-vulab@iscas.ac.cn Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/cs4271.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index 7663f89ac6a24..c3f447a6ff62e 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -594,17 +594,17 @@ static int cs4271_component_probe(struct snd_soc_component *component) ret = regcache_sync(cs4271->regmap); if (ret < 0) - return ret; + goto err_disable_regulator; ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2, CS4271_MODE2_PDN | CS4271_MODE2_CPEN, CS4271_MODE2_PDN | CS4271_MODE2_CPEN); if (ret < 0) - return ret; + goto err_disable_regulator; ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2, CS4271_MODE2_PDN, 0); if (ret < 0) - return ret; + goto err_disable_regulator; /* Power-up sequence requires 85 uS */ udelay(85); @@ -614,6 +614,10 @@ static int cs4271_component_probe(struct snd_soc_component *component) CS4271_MODE2_MUTECAEQUB); return 0; + +err_disable_regulator: + regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies); + return ret; } static void cs4271_component_remove(struct snd_soc_component *component) -- 2.51.0