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=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,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 5AB66C33C9E for ; Tue, 7 Jan 2020 13:04:47 +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 D3ADF2081E for ; Tue, 7 Jan 2020 13:04:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="iwaBvzxp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3ADF2081E 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 D3A78182D; Tue, 7 Jan 2020 14:03:54 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D3A78182D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1578402285; bh=7SGoRX12AV7mzND9yvomXhNE0Qb60t4dwV6FSgRM0ho=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=iwaBvzxpTRBB4D1bQsjrseNHS2qCnU55Z887eIQUNu+enjPZmTvvHi+s6Ic3hXmG0 MyPuXpmqZDRu1EK7ueAsV7aVZ9LTs4VXEdoX/+pxthuhOExBt+IPvNHeMgmW89/IbC BUPtGl0gX/vD+xtBOwkPrKwKTqh2LSS2Dxy+mtbw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 591E8F8010D; Tue, 7 Jan 2020 14:03:54 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 03990F8014A; Tue, 7 Jan 2020 14:03:53 +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 5A978F8010D for ; Tue, 7 Jan 2020 14:03:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5A978F8010D X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id E0ED3B089; Tue, 7 Jan 2020 13:03:48 +0000 (UTC) Date: Tue, 07 Jan 2020 14:03:48 +0100 Message-ID: From: Takashi Iwai To: David Fries In-Reply-To: <20200106214129.fnrokzkh4qnbvzdl@spacedout.fries.net> References: <20200106214129.fnrokzkh4qnbvzdl@spacedout.fries.net> 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") Cc: alsa-devel@alsa-project.org Subject: Re: [alsa-devel] [PATCH] mixer: Fix memory leak for more than 16 file descriptor case 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Mon, 06 Jan 2020 22:41:29 +0100, David Fries wrote: > > --- > I saw this when digging through the source code, wrote up a test case, > and verified with valgrind. I don't have that many sound cards so I > modified mixer.c to always take the conditional. alloca seemed like > the least effort way to fix this. Other thoughts were to test pfds != > spfds and free, but given how little bytes would be allocated putting > on the stack seems reasonable. Looks good to me. Could you give your sign-off? It's not strictly needed for alsa-lib, but we prefer having it. thanks, Takashi > > I also created the github pull request 20. > https://github.com/alsa-project/alsa-lib/pull/20 > > src/mixer/mixer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c > index 82056474..b1af9945 100644 > --- a/src/mixer/mixer.c > +++ b/src/mixer/mixer.c > @@ -767,7 +767,7 @@ int snd_mixer_wait(snd_mixer_t *mixer, int timeout) > if (count < 0) > return count; > if ((unsigned int) count > sizeof(spfds) / sizeof(spfds[0])) { > - pfds = malloc(count * sizeof(*pfds)); > + pfds = alloca(count * sizeof(*pfds)); > if (!pfds) > return -ENOMEM; > err = snd_mixer_poll_descriptors(mixer, pfds, > -- > 2.11.0 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > https://mailman.alsa-project.org/mailman/listinfo/alsa-devel > _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel