forked from pool/glibc
Andreas Schwab
746e16d2b9
- Update to glibc 2.17.90 85891acadf1b: * CVE-2013-2207 Incorrectly granting access to another user's pseudo-terminal has been fixed by disabling the use of pt_chown (Bugzilla #15755). Distributions can re-enable building and using pt_chown via the new configure option `--enable-pt_chown'. Enabling the use of pt_chown carries with it considerable security risks and should only be used if the distribution understands and accepts the risks. * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla #15078). * CVE-2013-1914 Stack overflow in getaddrinfo with many results has been fixed (Bugzilla #15330). * Add support for calling C++11 thread_local object destructors on thread and program exit. This needs compiler support for offloading C++11 destructor calls to glibc. * Improved worst case performance of libm functions with double inputs and output. * Support for priority inherited mutexes in pthread condition variables on non-x86 architectures. * Optimized string functions for AArch64. Implemented by Marcus Shawcroft. * Optimized string functions for ARM. Implemented by Will Newton and Richard Henderson. * Added a benchmark framework to track performance of functions in glibc. * New <math.h> macro named issignaling to check for a signaling NaN (sNaN). It is based on draft TS 18661 and currently enabled as a GNU extension. * On Linux, the clock function now uses the clock_gettime system call for improved precision, rather than old times system call. * Added new API functions pthread_getattr_default_np and pthread_setattr_default_np to get and set the default pthread attributes of a process. * Added support for TSX lock elision for pthread mutexes on i386 and x86-64. OBS-URL: https://build.opensuse.org/request/show/186119 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=304
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
Index: glibc-2.17.90/sysdeps/posix/getaddrinfo.c
|
|
===================================================================
|
|
--- glibc-2.17.90.orig/sysdeps/posix/getaddrinfo.c
|
|
+++ glibc-2.17.90/sysdeps/posix/getaddrinfo.c
|
|
@@ -270,7 +270,7 @@ extern service_user *__nss_hosts_databas
|
|
static int
|
|
gaih_inet (const char *name, const struct gaih_service *service,
|
|
const struct addrinfo *req, struct addrinfo **pai,
|
|
- unsigned int *naddrs)
|
|
+ unsigned int *naddrs, bool usable_ipv6)
|
|
{
|
|
const struct gaih_typeproto *tp = gaih_inet_typeproto;
|
|
struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
|
|
@@ -840,7 +840,10 @@ gaih_inet (const char *name, const struc
|
|
if (req->ai_family == PF_UNSPEC)
|
|
fct4 = __nss_lookup_function (nip, "gethostbyname4_r");
|
|
|
|
- if (fct4 != NULL)
|
|
+ /* If we don't want ipv6, don't use gethostbyname4_r,
|
|
+ as it's using T_UNSPEC to libc_res_nsearch, which always
|
|
+ create T_A and T_AAAA queries. */
|
|
+ if (usable_ipv6 && fct4 != NULL)
|
|
{
|
|
int herrno;
|
|
|
|
@@ -943,7 +946,7 @@ gaih_inet (const char *name, const struc
|
|
if (fct != NULL)
|
|
{
|
|
if (req->ai_family == AF_INET6
|
|
- || req->ai_family == AF_UNSPEC)
|
|
+ || (req->ai_family == AF_UNSPEC && usable_ipv6))
|
|
{
|
|
gethosts (AF_INET6, struct in6_addr);
|
|
no_inet6_data = no_data;
|
|
@@ -2471,7 +2474,11 @@ getaddrinfo (const char *name, const cha
|
|
if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET
|
|
|| hints->ai_family == AF_INET6)
|
|
{
|
|
- last_i = gaih_inet (name, pservice, hints, end, &naddrs);
|
|
+ if (!check_pf_called)
|
|
+ __check_pf (&seen_ipv4, &seen_ipv6, &in6ai, &in6ailen);
|
|
+ check_pf_called = true;
|
|
+
|
|
+ last_i = gaih_inet (name, pservice, hints, end, &naddrs, seen_ipv6);
|
|
if (last_i != 0)
|
|
{
|
|
freeaddrinfo (p);
|