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 E9D411DB148; Thu, 17 Apr 2025 18:10:17 +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=1744913418; cv=none; b=L2yuoW+P2f3zQVF3ScgRgsQqX6zqp1UW8cxmHioPYHqr2BpVm5z8SwJ4I8/NFVPVztd75MihJQICi5I7594GGUUqCJ220uRmxYMrS2/js9nmS7tN/ycTxgIETYYJGYQtDWdGvvVGtPxhPWxX0gzP32TuSnKtPi5BVzG9NG7fqVg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744913418; c=relaxed/simple; bh=GdICQ+sIzqU12zG4twUO83OMfMj7JNBekFjtqykb/Tc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WDrPwNApdPSfyU/4n9wSDvX/G7A4Bv8MC6JiFunMnZ3qgQWl1PYAuSs4/N0VpO3uAkK/8QozR9KB6Sn8+t+gvF8uWg8c1Ykaya4aniWtfqwBaWgA98b3R4bOQpKgWIM+HJ2QhEDJC06g7DRm3lVyY4Ou6Cn9X1VXY/Q7bY7qfcA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XySvnUvK; 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="XySvnUvK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 599D1C4CEE4; Thu, 17 Apr 2025 18:10:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744913417; bh=GdICQ+sIzqU12zG4twUO83OMfMj7JNBekFjtqykb/Tc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XySvnUvK65NTavbklCJ6+YNtE+B9/akKpSOkmHK7qsBVFtWHIcqrr6CuU/j1H3m3+ BBY6QC0rURspI5HnnvQ6tuYByiIEmVthpnKQ/D4gLvRHntZLKF49QYB8gHsxvFqDYJ kHXSF6X00rbImJ4sDjD+hE6H8VS/p1nO3qInfCGA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haoxiang Li , Mark Brown Subject: [PATCH 6.14 293/449] ASoC: codecs: wcd937x: fix a potential memory leak in wcd937x_soc_codec_probe() Date: Thu, 17 Apr 2025 19:49:41 +0200 Message-ID: <20250417175129.874592358@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175117.964400335@linuxfoundation.org> References: <20250417175117.964400335@linuxfoundation.org> User-Agent: quilt/0.68 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 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haoxiang Li commit 3e330acf4efd63876d673c046cd073a1d4ed57a8 upstream. When snd_soc_dapm_new_controls() or snd_soc_dapm_add_routes() fails, wcd937x_soc_codec_probe() returns without releasing 'wcd937x->clsh_info', which is allocated by wcd_clsh_ctrl_alloc. Add wcd_clsh_ctrl_free() to prevent potential memory leak. Fixes: 313e978df7fc ("ASoC: codecs: wcd937x: add audio routing and Kconfig") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Link: https://patch.msgid.link/20250226085050.3584898-1-haoxiang_li2024@163.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/wcd937x.c | 2 ++ 1 file changed, 2 insertions(+) --- a/sound/soc/codecs/wcd937x.c +++ b/sound/soc/codecs/wcd937x.c @@ -2563,6 +2563,7 @@ static int wcd937x_soc_codec_probe(struc ARRAY_SIZE(wcd9375_dapm_widgets)); if (ret < 0) { dev_err(component->dev, "Failed to add snd_ctls\n"); + wcd_clsh_ctrl_free(wcd937x->clsh_info); return ret; } @@ -2570,6 +2571,7 @@ static int wcd937x_soc_codec_probe(struc ARRAY_SIZE(wcd9375_audio_map)); if (ret < 0) { dev_err(component->dev, "Failed to add routes\n"); + wcd_clsh_ctrl_free(wcd937x->clsh_info); return ret; } }