niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

getsourcefilter: Get rid of alloca.

Browse source 
Use a scratch_buffer rather than alloca to avoid potential stack
overflows.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Joe Simmons-Talbott 2023-05-30 14:13:40 -04:00 • committed by Adhemerval Zanella
parent 29e25f6f13
commit d1eaab5a79
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sysdeps/unix/sysv/linux/getsourcefilter.c
View file

@ -16,10 +16,10 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <alloca.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <scratch_buffer.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <netatalk/at.h> #include <netatalk/at.h>
@ -95,17 +95,12 @@ getsourcefilter (int s, uint32_t interface, const struct sockaddr *group,
/* We have to create an struct ip_msfilter object which we can pass /* We have to create an struct ip_msfilter object which we can pass
to the kernel. */ to the kernel. */
socklen_t needed = GROUP_FILTER_SIZE (*numsrc); socklen_t needed = GROUP_FILTER_SIZE (*numsrc);
int use_alloca = __libc_use_alloca (needed);
struct group_filter *gf; struct scratch_buffer buf;
if (use_alloca) scratch_buffer_init (&buf);
gf = (struct group_filter *) alloca (needed); if (!scratch_buffer_set_array_size (&buf, 1, needed))
else return -1;
{ struct group_filter *gf = buf.data;
gf = (struct group_filter *) malloc (needed);
if (gf == NULL)
return -1;
}
gf->gf_interface = interface; gf->gf_interface = interface;
memcpy (&gf->gf_group, group, grouplen); memcpy (&gf->gf_group, group, grouplen);
@ -135,12 +130,7 @@ getsourcefilter (int s, uint32_t interface, const struct sockaddr *group,
} }
} }
if (! use_alloca) scratch_buffer_free (&buf);
{
int save_errno = errno;
free (gf);
__set_errno (save_errno);
}
return result; return result;
} }