qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

setipv4sourcefilter: Avoid using alloca. 

Use a scratch_buffer rather than alloca/malloc to avoid potential stack
overflow.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Joe Simmons-Talbott 2023-05-26 09:58:27 -04:00 committed by Siddhesh Poyarekar
parent a363f70751
commit 02f3d4c53a
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sysdeps/unix/sysv/linux/setipv4sourcefilter.c
View File

@ -16,12 +16,12 @@
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 <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <scratch_buffer.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -33,17 +33,12 @@ setipv4sourcefilter (int s, struct in_addr interface, struct in_addr 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. */
size_t needed = IP_MSFILTER_SIZE (numsrc); size_t needed = IP_MSFILTER_SIZE (numsrc);
int use_alloca = __libc_use_alloca (needed);
struct ip_msfilter *imsf; struct scratch_buffer buf;
if (use_alloca) scratch_buffer_init (&buf);
imsf = (struct ip_msfilter *) alloca (needed); if (!scratch_buffer_set_array_size (&buf, 1, needed))
else
{
imsf = (struct ip_msfilter *) malloc (needed);
if (imsf == NULL)
return -1; return -1;
} struct ip_msfilter *imsf = buf.data;
imsf->imsf_multiaddr = group; imsf->imsf_multiaddr = group;
imsf->imsf_interface = interface; imsf->imsf_interface = interface;
@ -53,12 +48,7 @@ setipv4sourcefilter (int s, struct in_addr interface, struct in_addr group,
int result = __setsockopt (s, SOL_IP, IP_MSFILTER, imsf, needed); int result = __setsockopt (s, SOL_IP, IP_MSFILTER, imsf, needed);
if (! use_alloca) scratch_buffer_free (&buf);
{
int save_errno = errno;
free (imsf);
__set_errno (save_errno);
}
return result; return result;
} }