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 X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 036BCC433E0 for ; Mon, 27 Jul 2020 14:26:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CDA5E20663 for ; Mon, 27 Jul 2020 14:26:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859978; bh=m+cqJk/Uajl6vw/kWiB+Qzjbwq+4YqOUuVYyI4zk7Hk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dYaRy201cJXhXwjVoV5x1RKe2V/ceuMZUZKu7tXbuPyG5bKHhf4MrBLzWYNZ6Gqsm 1Qrd8TPvefyHJQTaBFCp64jO8Aaui+qoMWv0yWUYdRob0oPuhOKzo8st78kUUCGKWl p/V0TEF5MmfMPhd7oA9HsIGllbEpisGZG/HcEovE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730108AbgG0O0R (ORCPT ); Mon, 27 Jul 2020 10:26:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:56392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732565AbgG0O0K (ORCPT ); Mon, 27 Jul 2020 10:26:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BF5ED20663; Mon, 27 Jul 2020 14:26:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859970; bh=m+cqJk/Uajl6vw/kWiB+Qzjbwq+4YqOUuVYyI4zk7Hk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S0pLL0wfk1w2q9PffGy3Y2s657Oqqi3nVTQ/QKN51Iih1g+BnbXrpq88781L4G5FT 9P3N9K5+AKPZ04fvPkPNLBuQtYjM+IBjv4NEtqRnjaorRnr1kt02JJnISdTLFdODEi 1MOwQB8RsLaQPkCtlkDomvSo57TpA2ov7wxcvlCU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pierre-Louis Bossart , Ranjani Sridharan , Kai Vehmanen , Mark Brown Subject: [PATCH 5.7 175/179] ASoC: topology: fix tlvs in error handling for widget_dmixer Date: Mon, 27 Jul 2020 16:05:50 +0200 Message-Id: <20200727134941.181158722@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pierre-Louis Bossart commit 8edac489e7c3fce44208373bb3e7b5835a672c66 upstream. we need to free all allocated tlvs, not just the one allocated in the loop before releasing kcontrols - other the tlvs references will leak. Fixes: 9f90af3a995298 ('ASoC: topology: Consolidate and fix asoc_tplg_dapm_widget_*_create flow') Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Reviewed-by: Kai Vehmanen Link: https://lore.kernel.org/r/20200707203749.113883-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1395,7 +1395,6 @@ static struct snd_kcontrol_new *soc_tplg if (err < 0) { dev_err(tplg->dev, "ASoC: failed to init %s\n", mc->hdr.name); - soc_tplg_free_tlv(tplg, &kc[i]); goto err_sm; } } @@ -1403,6 +1402,7 @@ static struct snd_kcontrol_new *soc_tplg err_sm: for (; i >= 0; i--) { + soc_tplg_free_tlv(tplg, &kc[i]); sm = (struct soc_mixer_control *)kc[i].private_value; kfree(sm); kfree(kc[i].name);