Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: David Fries <David@Fries.net>
Cc: alsa-devel@alsa-project.org
Subject: Re: [alsa-devel] [PATCH] mixer: Fix memory leak for more than 16 file	descriptor case
Date: Tue, 07 Jan 2020 14:03:48 +0100	[thread overview]
Message-ID: <s5hd0bvquyz.wl-tiwai@suse.de> (raw)
In-Reply-To: <20200106214129.fnrokzkh4qnbvzdl@spacedout.fries.net>

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

  reply	other threads:[~2020-01-07 13:04 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-06 21:41 [alsa-devel] [PATCH] mixer: Fix memory leak for more than 16 file descriptor case David Fries
2020-01-07 13:03 ` Takashi Iwai [this message]
2020-01-07 15:18   ` David Fries
  -- strict thread matches above, loose matches on Subject: below --
2020-01-07 15:18 David Fries
2020-01-08  8:50 ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5hd0bvquyz.wl-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=David@Fries.net \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox