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=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 5019FC433E0 for ; Sun, 27 Dec 2020 08:27:43 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 79508216FD for ; Sun, 27 Dec 2020 08:27:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79508216FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id DFD741735; Sun, 27 Dec 2020 09:26:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DFD741735 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1609057658; bh=1+3mjEfNVYt6Al6EnFVH/66k9ICh2GkojNH2vhmlz+E=; h=Date:From:To:Subject:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=YRlio425EBS7xfEUPu2GQNN5fpRlSvya6vw3d2j4kWVe5+s4qOk+JtJhFxMz/V7xw VZDUcuVHtJi8mPssJnXoRY545I3lOOELmwJhhRlA/5/tqxl9AatWEEIYPbsQFFBfQV oYOiBP/1qm/ewAx51WjtkQfOFULAMmQdxYN3gsh8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7A08FF8020C; Sun, 27 Dec 2020 09:26:48 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3EBC5F800C8; Sun, 27 Dec 2020 09:26:47 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 23D97F800C8 for ; Sun, 27 Dec 2020 09:26:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 23D97F800C8 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 46406AE52; Sun, 27 Dec 2020 08:26:44 +0000 (UTC) Date: Sun, 27 Dec 2020 09:26:44 +0100 Message-ID: From: Takashi Iwai To: Alex Henrie Subject: Re: [PATCH 4/9] confmisc: fix memory leak in snd_func_concat In-Reply-To: <20201226213547.175071-5-alexhenrie24@gmail.com> References: <20201226213547.175071-1-alexhenrie24@gmail.com> <20201226213547.175071-5-alexhenrie24@gmail.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Cc: alsa-devel@alsa-project.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Sat, 26 Dec 2020 22:35:42 +0100, Alex Henrie wrote: > > Signed-off-by: Alex Henrie > --- > src/confmisc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/confmisc.c b/src/confmisc.c > index eb8218c1..aece39c3 100644 > --- a/src/confmisc.c > +++ b/src/confmisc.c > @@ -440,8 +440,8 @@ int snd_func_concat(snd_config_t **dst, snd_config_t *root, snd_config_t *src, > err = snd_config_get_id(src, &id); > if (err >= 0) > err = snd_config_imake_string(dst, id, res); > - free(res); > __error: > + free(res); > return err; > } > #ifndef DOC_HIDDEN I guess this would lead to the double-free at the error path after realloc() that already freed res before the goto line. Care to fix it and resubmit this one? thanks, Takashi