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 92A3FC10F05 for ; Mon, 11 Dec 2023 14:04:03 +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 7611EDF9; Mon, 11 Dec 2023 15:03:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7611EDF9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1702303441; bh=VVYIxC1UF4w7geNyhIbLS8oR9kcAv16TTds9sDG9s/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=BdZrXHlTo4UeBYa2/XEyjF2AD+QBxwjH2bGlqBbM+pqKJfzgeMDmLBThp614yO6v5 5N95kp5W9ZeK146IBExRxN6aMQMm/qIkixWovIsx/tFDd6B3ZBMt3TPZ85DsWurAGc aqQi3hZCjWDKNvVUpTv8b3XlYL1zIMujtiEFwYPk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5D23EF805D7; Mon, 11 Dec 2023 15:02:51 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id DBE6CF805C6; Mon, 11 Dec 2023 15:02:50 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CC4B4F80578; Mon, 11 Dec 2023 15:02:46 +0100 (CET) Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) (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 C8FEBF80124 for ; Mon, 11 Dec 2023 15:02:34 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C8FEBF80124 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=ArVrGxnl Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 9CDFFCE111F; Mon, 11 Dec 2023 14:02:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2E44C433C8; Mon, 11 Dec 2023 14:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702303351; bh=VVYIxC1UF4w7geNyhIbLS8oR9kcAv16TTds9sDG9s/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ArVrGxnlFX5Buy5g929xfA6ME57XAAvSgmgt+a70C+scTr2sJujjdWccrroevVHRd c1GAo1MMnCEptW28DAqYwo/eyNv782Clr1onoGjKirb4z1eTzkN3J88GcSePtAKqEl UceEniESZpoSqWQBKUS6aKVxcXWavcqLxYoCXAMbjhv+i1gv/5ti2YX4kPnLOe308E e0FbOBQQt2lUB26Dod1hIm1lxfozTDPDk6zcYgLGXIOAWH6Vcrf3SqsouDMfdkw6EI QosEXrEcT8Dv/0tIzSDzQyLRdxyWV1/9aKgubeJx8Ak3pgc5JnAAQBYsruEhPbIJ3P gDCm2Q9RXpucg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kamil Duljas , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Mark Brown , Sasha Levin , cezary.rojewski@intel.com, pierre-louis.bossart@linux.intel.com, liam.r.girdwood@linux.intel.com, peter.ujfalusi@linux.intel.com, yung-chuan.liao@linux.intel.com, ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com, perex@perex.cz, tiwai@suse.com, zhangyiqun@phytium.com.cn, kuninori.morimoto.gx@renesas.com, suhui@nfschina.com, alsa-devel@alsa-project.org, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 03/12] ASoC: Intel: Skylake: mem leak in skl register function Date: Mon, 11 Dec 2023 09:01:56 -0500 Message-ID: <20231211140219.392379-3-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211140219.392379-1-sashal@kernel.org> References: <20231211140219.392379-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.263 Content-Transfer-Encoding: 8bit Message-ID-Hash: LLQ7RKU5PDD7JYCLA3T2V5ZQ2JPKZVJB X-Message-ID-Hash: LLQ7RKU5PDD7JYCLA3T2V5ZQ2JPKZVJB 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.9 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: Kamil Duljas [ Upstream commit f8ba14b780273fd290ddf7ee0d7d7decb44cc365 ] skl_platform_register() uses krealloc. When krealloc is fail, then previous memory is not freed. The leak is also when soc component registration failed. Signed-off-by: Kamil Duljas Reviewed-by: Amadeusz Sławiński Link: https://lore.kernel.org/r/20231116224112.2209-2-kamil.duljas@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/skylake/skl-pcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 19176ae272742..3256f7c4eb747 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -1492,6 +1492,7 @@ int skl_platform_register(struct device *dev) dais = krealloc(skl->dais, sizeof(skl_fe_dai) + sizeof(skl_platform_dai), GFP_KERNEL); if (!dais) { + kfree(skl->dais); ret = -ENOMEM; goto err; } @@ -1504,8 +1505,10 @@ int skl_platform_register(struct device *dev) ret = devm_snd_soc_register_component(dev, &skl_component, skl->dais, num_dais); - if (ret) + if (ret) { + kfree(skl->dais); dev_err(dev, "soc component registration failed %d\n", ret); + } err: return ret; } -- 2.42.0