public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: Joe Simmons-Talbott <josimmon@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH] setsourcefilter: Use malloc() rather than alloca().
Date: Mon, 15 May 2023 15:35:10 -0300	[thread overview]
Message-ID: <a9bd0759-263d-574b-4a39-0dbce3907234@linaro.org> (raw)
In-Reply-To: <20230511150915.2468745-1-josimmon@redhat.com>



On 11/05/23 12:09, Joe Simmons-Talbott via Libc-alpha wrote:
> To prevent possible stack overflow use malloc() rather than alloca().
> ---
>  sysdeps/unix/sysv/linux/setsourcefilter.c | 22 ++++++----------------
>  1 file changed, 6 insertions(+), 16 deletions(-)
> 
> diff --git a/sysdeps/unix/sysv/linux/setsourcefilter.c b/sysdeps/unix/sysv/linux/setsourcefilter.c
> index 538f4de696..6678572968 100644
> --- a/sysdeps/unix/sysv/linux/setsourcefilter.c
> +++ b/sysdeps/unix/sysv/linux/setsourcefilter.c
> @@ -16,7 +16,6 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -#include <alloca.h>
>  #include <errno.h>
>  #include <stdlib.h>
>  #include <string.h>
> @@ -34,17 +33,11 @@ setsourcefilter (int s, uint32_t interface, const struct sockaddr *group,
>    /* We have to create an struct ip_msfilter object which we can pass
>       to the kernel.  */
>    size_t needed = GROUP_FILTER_SIZE (numsrc);
> -  int use_alloca = __libc_use_alloca (needed);
>  
>    struct group_filter *gf;
> -  if (use_alloca)
> -    gf = (struct group_filter *) alloca (needed);
> -  else
> -    {
> -      gf = (struct group_filter *) malloc (needed);
> -      if (gf == NULL)
> -	return -1;
> -    }
> +  gf = (struct group_filter *) malloc (needed);
> +  if (gf == NULL)
> +    return -1;
>  
>    gf->gf_interface = interface;
>    memcpy (&gf->gf_group, group, grouplen);
> @@ -63,12 +56,9 @@ setsourcefilter (int s, uint32_t interface, const struct sockaddr *group,
>    else
>      result = __setsockopt (s, sol, MCAST_MSFILTER, gf, needed);
>  
> -  if (! use_alloca)
> -    {
> -      int save_errno = errno;
> -      free (gf);
> -      __set_errno (save_errno);
> -    }
> +  int save_errno = errno;
> +  free (gf);
> +  __set_errno (save_errno);
>  
>    return result;
>  }

free now must preserve errno (check 69fda43b8dd795c3658869633ca0708ed3134006),
so there is no need to save/restore it.  The rest looks ok for me.

  reply	other threads:[~2023-05-15 18:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-11 15:09 Joe Simmons-Talbott
2023-05-15 18:35 ` Adhemerval Zanella Netto [this message]
2023-05-15 19:09   ` Joe Simmons-Talbott

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=a9bd0759-263d-574b-4a39-0dbce3907234@linaro.org \
    --to=adhemerval.zanella@linaro.org \
    --cc=josimmon@redhat.com \
    --cc=libc-alpha@sourceware.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).