From patchwork Thu Apr 12 16:17:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133303 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1846470ljb; Thu, 12 Apr 2018 09:17:24 -0700 (PDT) X-Google-Smtp-Source: AIpwx48Dp301FzT6im+V4HhTX6qAdlmzOR47hQu0gOjR8GgRI/YPheJaq+Ig3Qb5hwct9i0Xo5R4 X-Received: by 10.223.191.11 with SMTP id p11mr1345350wrh.160.1523549844204; Thu, 12 Apr 2018 09:17:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523549844; cv=none; d=google.com; s=arc-20160816; b=GfORHguMJSeuYOvywGwxDw7ET4n2hsSQH7/LWT+4LYLAX8Vlos5mnK2Ap8b9QHfsZN MU2qkCu5TKnFAyZFzG01Wz8BYZo+ESuG6Z27jTmfoTIKnNODl5CsjSiFlf7dYMCpSOeJ WzG0OlroIYYFRfEv4zq4Hn8uYFeXnC9NccB4V2yXWVhvXto1Yiz6IJ+G6+sm6TKj1YU5 9SkszhqU8+RmMmBTpZG2cBy2tyzfqAjGPDLfuOQJLjCxAhDCZWnijwoQrlsDGiGAnDP2 O078i2okJjuFOUI1Df7JQZS0Hj/EOwLikYbxS5JEnsUn/rHtZGmU+Y32JtFAYkhCSAIw ltsw== 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=a+IVF1H/TPQdKgj+Gg+tN7bapcrJY1+IHQZ6Vcjz1bA=; b=Mh1n0Sbo1/msJ6I/Few/WdKEi6jPtc9aFF0UVCrMHr63igHbb2ac7hPGP7EclgQ3Ia INaTmUT4pU48CFulb4njb+vSO+VBFhXqLoERY1AtEuGEik6YKwwCFcubzpUkUt97OG69 HKuZL5ls4o2b9qVsbV6JxUvqw7WS9PbPH457JURvvW+iDFFJbHReQWh38vBIomHdhkQR aY45tv7ZIqiNyVUppD53hsZsC9qe2cOxN5kT4+uJ7NFyN8DePW3iOSF2r5US+uMm2wq9 HJXbhAo0Qdw0CtoGktaNEM8QcUKe8XC+u+uJC/waCcQeLJSSZXtTmN++Jfr6V2nIrTzz 9jZA== 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=CXd1mDFQ; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id y184si2655956wmg.61.2018.04.12.09.17.24; Thu, 12 Apr 2018 09:17:24 -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=CXd1mDFQ; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9574C267408; Thu, 12 Apr 2018 18:17:18 +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 2CB112675E6; Thu, 12 Apr 2018 18:17:15 +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.2 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 1E9C626736C for ; Thu, 12 Apr 2018 18:17:12 +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=I8CSqkgyhakfgJQLe1A5j4sGI0cAAAhKhyBGMi2m2HE=; b=CXd1mDFQSuuY 24SO706cxVj6tU6qhh+yuS0xddjMTaJW/ERfaCQTJbCld3w+SZF3jSD+6O6ECjGeLG+MCfddWdtyO OPoKjJM/7si2YIF3X1uFNccwT1JB09WOv3mScN53ZjKxZKKBayZxoHglQz3/FvDNuhZPbLv5/Ib6O 2h0OE=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f6euG-0006Mq-B0; Thu, 12 Apr 2018 16:17:04 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f6euF-0008JM-RX; Thu, 12 Apr 2018 17:17:03 +0100 From: Mark Brown To: Dan Carpenter In-Reply-To: <20180405112518.GE4218@mwanda> Message-Id: Date: Thu, 12 Apr 2018 17:17:03 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown , kernel-janitors@vger.kernel.org, Liam Girdwood , Takashi Iwai Subject: [alsa-devel] Applied "ASoC: topology: fix some tiny memory leaks" 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: topology: fix some tiny memory leaks 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 65030ff305bc9c51cb75705483bdaac7813778f0 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 5 Apr 2018 14:25:18 +0300 Subject: [PATCH] ASoC: topology: fix some tiny memory leaks These tiny memory leaks don't have a huge real life impact but they cause static checker warnings so let's fix them. Signed-off-by: Dan Carpenter Signed-off-by: Mark Brown --- sound/soc/soc-topology.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index fa27d0fca6dc..942c6e5eb4b7 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1325,8 +1325,10 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_denum_create( ec->hdr.name); kc[i].name = kstrdup(ec->hdr.name, GFP_KERNEL); - if (kc[i].name == NULL) + if (kc[i].name == NULL) { + kfree(se); goto err_se; + } kc[i].private_value = (long)se; kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER; kc[i].access = ec->hdr.access; @@ -1442,8 +1444,10 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dbytes_create( be->hdr.name, be->hdr.access); kc[i].name = kstrdup(be->hdr.name, GFP_KERNEL); - if (kc[i].name == NULL) + if (kc[i].name == NULL) { + kfree(sbe); goto err; + } kc[i].private_value = (long)sbe; kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER; kc[i].access = be->hdr.access;