From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: Joe Simmons-Talbott <josimmon@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH] setsourcefilter: Replace alloca with a scratch_buffer.
Date: Thu, 18 May 2023 09:58:37 -0300 [thread overview]
Message-ID: <a977247f-e65a-e18b-1216-e08eba73275e@linaro.org> (raw)
In-Reply-To: <20230516134549.1488655-1-josimmon@redhat.com>
On 16/05/23 10:45, Joe Simmons-Talbott wrote:
> Use a scratch_buffer rather than either alloca or malloc to reduce the
> possibility of a stack overflow.
>
> Suggested-by: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> sysdeps/unix/sysv/linux/setsourcefilter.c | 27 ++++++-----------------
> 1 file changed, 7 insertions(+), 20 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/setsourcefilter.c b/sysdeps/unix/sysv/linux/setsourcefilter.c
> index 538f4de696..479744f169 100644
> --- a/sysdeps/unix/sysv/linux/setsourcefilter.c
> +++ b/sysdeps/unix/sysv/linux/setsourcefilter.c
> @@ -16,13 +16,10 @@
> 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>
> -#include <stdint.h>
> #include <netinet/in.h>
> -#include <sys/socket.h>
> +#include <scratch_buffer.h>
> #include "getsourcefilter.h"
>
>
> @@ -34,17 +31,12 @@ 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;
> - }
> + struct scratch_buffer buf;
> + scratch_buffer_init (&buf);
> + if (!scratch_buffer_set_array_size (&buf, 1, needed))
> + return -1;
> + struct group_filter *gf = buf.data;
>
> gf->gf_interface = interface;
> memcpy (&gf->gf_group, group, grouplen);
> @@ -63,12 +55,7 @@ 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);
> - }
> + scratch_buffer_free (&buf);
>
> return result;
> }
prev parent reply other threads:[~2023-05-18 12:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-16 13:45 Joe Simmons-Talbott
2023-05-18 12:58 ` Adhemerval Zanella Netto [this message]
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=a977247f-e65a-e18b-1216-e08eba73275e@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).