From patchwork Fri Aug 3 17:01:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 143429 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp386949ljj; Fri, 3 Aug 2018 10:01:58 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe32nZCv8kAxjOAWoRD+eTCZEjQKElT6gpLIyeeu9aTRd/AbmqdkaVQ9eqKiGnN3YmZIcqv X-Received: by 2002:adf:ed41:: with SMTP id u1-v6mr3050610wro.262.1533315718659; Fri, 03 Aug 2018 10:01:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533315718; cv=none; d=google.com; s=arc-20160816; b=hgo74lk0mhgD4QrNKSQhjz27PoOkyNA30W9l2ipoOiY76K6/iMe65bhYyIMpSgNwqb q3YCBioSpTMnSubVWgH8f1l30GFX1xrN+0V5STBnoRaIVFr2CccPMcmVwxlEcqSEaLeF +pLsvTsoee1DzhR/ipAlgv6PVQqQ9HWpj7CiH1x3UsuiNkPNJc2n42ave7nP094rdna8 pya5gelzaognrS4NGMYdjIAZfS6G99Uy6EZm90Xt/QIbkWI2sFq2qg1TAtjBsYb2ySHl SnNWsKOlBHGehccKF5iRoh3N+NXkiaS8zpYw0G+HMOGneeVP7OSGboy8V/lgq9QW6CGO gLxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=rjyHsu+0WNLSsL4kphrO1YiXoP3+c6R2wq4DjEluVqo=; b=ozdSyRkqLOzg6oyXbvvPY23n8tu29khBwqpEimN2U32fgJ6+LZvWGQkVCg7531BphD XELR2J0FYzyDmaBfb2S7i7Mj6ETjdR1U0G0CFXMGjYJEF4yF6FRPYQXi4ziCho/ebbLL VDdq8S8FlnckYlkLEIPYLcWbAG9XyEHSqHc12ppRbnZ3LSt4kCwlt1QjwhXI1dqier+q LLEMzE9hllhA3YKJpZnGMMDVTKvuatm8ea1H9ATh2NYmRYrh/VK69/v+G9qUqdraCqc2 fdcqPl+ycUrjrBC7aNflM7HQwQpo1ZVY07ZSXDsWvcxRdd2zqDeK8bcQ9ZubnKFoWoF5 ciPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=dJH0Iw11; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id y12-v6si3925282wrr.254.2018.08.03.10.01.58; Fri, 03 Aug 2018 10:01:58 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=dJH0Iw11; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 822862677E4; Fri, 3 Aug 2018 19:01:57 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5FC222677F0; Fri, 3 Aug 2018 19:01:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id B17632677E7 for ; Fri, 3 Aug 2018 19:01:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=EzmebrKN4mOYuNuGzuRVbaLjbGY5d94aAfUDsHJquL8=; b=dJH0Iw11VkPh IRezob8WjUTb5rLr0Pr/S9L2yznIWzjTeXaxR1oOdRtOZ7Sjs4VETqkm/Ht0cPzJocaaR6E2oUdSl BcyAVx2saVOwKl3SJNkC+ECUpzQad6FAVzZwDeyZrFcTw2Vz73w65BwwnBTVKQ0Xg5ZJpT34NrxMT 35BlA=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1fldSb-0003mi-EV; Fri, 03 Aug 2018 17:01:53 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 2FC2C1123AA1; Fri, 3 Aug 2018 18:01:53 +0100 (BST) From: Mark Brown To: Gustavo A. R. Silva In-Reply-To: <20180803134211.GA24593@embeddedor.com> Message-Id: <20180803170153.2FC2C1123AA1@debutante.sirena.org.uk> Date: Fri, 3 Aug 2018 18:01:53 +0100 (BST) Cc: alsa-devel@alsa-project.org, Banajit Goswami , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org, Patrick Lai , Takashi Iwai , Liam Girdwood , Mark Brown , Rohit kumar Subject: [alsa-devel] Applied "ASoC: smd845: fix memory leak" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: smd845: fix memory leak has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 8530ebf1079ccc84ffa32d970cdcae168b2f3684 Mon Sep 17 00:00:00 2001 From: "Gustavo A. R. Silva" Date: Fri, 3 Aug 2018 08:42:11 -0500 Subject: [PATCH] ASoC: smd845: fix memory leak In case memory resources for *card* were allocated, release them before return. Addresses-Coverity-ID: 1472244 ("Resource leak") Fixes: 6b1687bf76ef ("ASoC: qcom: add sdm845 sound card support") Signed-off-by: Gustavo A. R. Silva Signed-off-by: Mark Brown --- sound/soc/qcom/sdm845.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.18.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index be0cb1122036..c1adb77230eb 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -222,8 +222,10 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev) /* Allocate the private data */ data = kzalloc(sizeof(*data), GFP_KERNEL); - if (!data) - return -ENOMEM; + if (!data) { + ret = -ENOMEM; + goto data_alloc_fail; + } card->dev = dev; dev_set_drvdata(dev, card); @@ -248,6 +250,7 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev) kfree(card->dai_link); parse_dt_fail: kfree(data); +data_alloc_fail: kfree(card); return ret; }