AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix leak in getaddrinfo introduced by the fix for CVE-2023-4806 [BZ #30843]

Browse Source 
This patch fixes a very recently added leak in getaddrinfo.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Romain Geissler 2023-09-25 01:21:51 +01:00 committed by Siddhesh Poyarekar
parent 5d00c201b9
commit ec6b95c330
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nss/Makefile
View File

@ -149,6 +149,15 @@ endif
extra-test-objs += nss_test1.os nss_test2.os nss_test_errno.os \ extra-test-objs += nss_test1.os nss_test2.os nss_test_errno.os \
nss_test_gai_hv2_canonname.os nss_test_gai_hv2_canonname.os
ifeq ($(run-built-tests),yes)
ifneq (no,$(PERL))
tests-special += $(objpfx)mtrace-tst-nss-gai-hv2-canonname.out
endif
endif
generated += mtrace-tst-nss-gai-hv2-canonname.out \
tst-nss-gai-hv2-canonname.mtrace
include ../Rules include ../Rules
ifeq (yes,$(have-selinux)) ifeq (yes,$(have-selinux))
@ -217,6 +226,17 @@ endif
$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so $(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so
$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so $(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so
tst-nss-gai-hv2-canonname-ENV = \
MALLOC_TRACE=$(objpfx)tst-nss-gai-hv2-canonname.mtrace \
LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so
$(objpfx)mtrace-tst-nss-gai-hv2-canonname.out: \
$(objpfx)tst-nss-gai-hv2-canonname.out
{ test -r $(objpfx)tst-nss-gai-hv2-canonname.mtrace \
|| ( echo "tst-nss-gai-hv2-canonname.mtrace does not exist"; exit 77; ) \
&& $(common-objpfx)malloc/mtrace \
$(objpfx)tst-nss-gai-hv2-canonname.mtrace; } > $@; \
$(evaluate-test)
# Disable DT_RUNPATH on NSS tests so that the glibc internal NSS # Disable DT_RUNPATH on NSS tests so that the glibc internal NSS
# functions can load testing NSS modules via DT_RPATH. # functions can load testing NSS modules via DT_RPATH.
LDFLAGS-tst-nss-test1 = -Wl,--disable-new-dtags LDFLAGS-tst-nss-test1 = -Wl,--disable-new-dtags

3
nss/tst-nss-gai-hv2-canonname.c
View File

@ -21,6 +21,7 @@
#include <netdb.h> #include <netdb.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <mcheck.h>
#include <support/check.h> #include <support/check.h>
#include <support/xstdio.h> #include <support/xstdio.h>
#include "nss/tst-nss-gai-hv2-canonname.h" #include "nss/tst-nss-gai-hv2-canonname.h"
@ -41,6 +42,8 @@ static void do_prepare (int a, char **av)
static int static int
do_test (void) do_test (void)
{ {
mtrace ();
__nss_configure_lookup ("hosts", "test_gai_hv2_canonname"); __nss_configure_lookup ("hosts", "test_gai_hv2_canonname");
struct addrinfo hints = {}; struct addrinfo hints = {};

4
sysdeps/posix/getaddrinfo.c
View File

@ -1196,9 +1196,7 @@ free_and_return:
if (malloc_name) if (malloc_name)
free ((char *) name); free ((char *) name);
free (addrmem); free (addrmem);
if (res.free_at) gaih_result_reset (&res);
free (res.at);
free (res.canon);
return result; return result;
} }