From patchwork Tue Mar 10 12:45:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229630 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 72EFCC18E5C for ; Tue, 10 Mar 2020 13:13:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4193424699 for ; Tue, 10 Mar 2020 13:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846033; bh=+2vvil5nc479+npVxFLXXZzKyjPWg+sqVM82dkKqrNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DPNgDHaNPO6NstNvlDmsMe0U/YF8/4/ZR5y6qrqlUpTSbAFvZySfEo/ACHE+NWgKh 7HRS7E8OaKNNx6f8MBm444+6vP7lgPvYBQyd4m6eOGqDsgM6oWjKwFqPC+ZxCHDX92 9G1oPXswYy5hwCVOJhli8lnqCWrwcdOmD9nftWs0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731782AbgCJNNw (ORCPT ); Tue, 10 Mar 2020 09:13:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:36994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731786AbgCJNNu (ORCPT ); Tue, 10 Mar 2020 09:13:50 -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 71A3224693; Tue, 10 Mar 2020 13:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846029; bh=+2vvil5nc479+npVxFLXXZzKyjPWg+sqVM82dkKqrNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rsu2ttZArCpL4h/hW2XW7Exol4T59UjWsuT09an2Ujh2AcrBWdmJfzONKw/UjfqiM xvkQ9hppru2wuMftNRzXxS5cSGqvUTBcGUta0A8gZBV3qZg0etgHvpRqsVBsl+Tz+X 0EJB4rma73U2ogNkqN9ceW8vX75QBwLOd6N7xuvw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dragos Tarcatu , Mark Brown Subject: [PATCH 4.19 60/86] ASoC: topology: Fix memleak in soc_tplg_link_elems_load() Date: Tue, 10 Mar 2020 13:45:24 +0100 Message-Id: <20200310124534.037010579@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310124530.808338541@linuxfoundation.org> References: <20200310124530.808338541@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dragos Tarcatu commit 2b2d5c4db732c027a14987cfccf767dac1b45170 upstream. If soc_tplg_link_config() fails, _link needs to be freed in case of topology ABI version mismatch. However the current code is returning directly and ends up leaking memory in this case. This patch fixes that. Fixes: 593d9e52f9bb ("ASoC: topology: Add support to configure existing physical DAI links") Signed-off-by: Dragos Tarcatu Link: https://lore.kernel.org/r/20200207185325.22320-2-dragos_tarcatu@mentor.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/soc-topology.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2154,8 +2154,11 @@ static int soc_tplg_link_elems_load(stru } ret = soc_tplg_link_config(tplg, _link); - if (ret < 0) + if (ret < 0) { + if (!abi_match) + kfree(_link); return ret; + } /* offset by version-specific struct size and * real priv data size