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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD0D2C10F05 for ; Mon, 11 Dec 2023 14:04:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343859AbjLKOEo (ORCPT ); Mon, 11 Dec 2023 09:04:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344100AbjLKOEA (ORCPT ); Mon, 11 Dec 2023 09:04:00 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32E73D9 for ; Mon, 11 Dec 2023 06:02:32 -0800 (PST) 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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