diff options
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/Makefile | 4 | ||||
| -rw-r--r-- | resolv/Versions | 6 | ||||
| -rw-r--r-- | resolv/arpa/nameser.h | 2 | ||||
| -rw-r--r-- | resolv/inet_ntop.c | 2 | ||||
| -rw-r--r-- | resolv/mapv4v6addr.h | 10 | ||||
| -rw-r--r-- | resolv/nss_dns/dns-host.c | 15 | ||||
| -rw-r--r-- | resolv/nss_dns/dns-network.c | 43 | ||||
| -rw-r--r-- | resolv/res_libc.c | 2 | ||||
| -rw-r--r-- | resolv/tst-inet_ntop.c | 111 |
9 files changed, 31 insertions, 164 deletions
diff --git a/resolv/Makefile b/resolv/Makefile index 6ac226735a..f6230da8fb 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1994,1995,1996,1997,1998,1999,2000,2001,2003,2004,2007 +# Copyright (C) 1994,1995,1996,1997,1998,1999,2000,2001,2003,2004 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -32,7 +32,7 @@ distribute := ../conf/portability.h mapv4v6addr.h mapv4v6hostent.h \ routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \ res_hconf res_libc res-state -tests = tst-aton tst-leaks tst-inet_ntop +tests = tst-aton tst-leaks xtests = tst-leaks2 generate := mtrace-tst-leaks tst-leaks.mtrace tst-leaks2.mtrace diff --git a/resolv/Versions b/resolv/Versions index 7016365be5..5a350cae36 100644 --- a/resolv/Versions +++ b/resolv/Versions @@ -2,7 +2,7 @@ libc { GLIBC_2.0 { -%if !(USE_TLS && HAVE___THREAD) +%if !HAVE___THREAD # global variables _h_errno; %endif @@ -17,7 +17,7 @@ libc { # variables in normal name space h_errlist; h_nerr; -%if !(USE_TLS && HAVE___THREAD) +%if !HAVE___THREAD h_errno; %endif @@ -34,7 +34,7 @@ libc { GLIBC_PRIVATE { __gai_sigqueue; -%if USE_TLS && HAVE___THREAD +%if HAVE___THREAD # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol. h_errno; __resp; %endif diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index 496c8dbe85..f6330a8979 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -287,7 +287,7 @@ typedef enum __ns_type { ns_t_naptr = 35, /* Naming Authority PoinTeR */ ns_t_kx = 36, /* Key Exchange */ ns_t_cert = 37, /* Certification record */ - ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */ + ns_t_a6 = 38, /* IPv6 address (deprecated, use ns_t_aaaa) */ ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */ ns_t_sink = 40, /* Kitchen sink (experimentatl) */ ns_t_opt = 41, /* EDNS0 option (meta-RR) */ diff --git a/resolv/inet_ntop.c b/resolv/inet_ntop.c index 1222d08bda..e5553a1d3b 100644 --- a/resolv/inet_ntop.c +++ b/resolv/inet_ntop.c @@ -96,7 +96,7 @@ inet_ntop4(src, dst, size) static const char fmt[] = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; - if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) >= size) { + if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) { __set_errno (ENOSPC); return (NULL); } diff --git a/resolv/mapv4v6addr.h b/resolv/mapv4v6addr.h index bc3290f162..7f85f7d5e3 100644 --- a/resolv/mapv4v6addr.h +++ b/resolv/mapv4v6addr.h @@ -56,16 +56,14 @@ static void map_v4v6_address (const char *src, char *dst) { u_char *p = (u_char *) dst; - char tmp[INADDRSZ]; int i; - /* Stash a temporary copy so our caller can update in place. */ - memcpy (tmp, src, INADDRSZ); + /* Move the IPv4 part to the right position. */ + memcpy (dst + 12, src, INADDRSZ); + /* Mark this ipv6 addr as a mapped ipv4. */ for (i = 0; i < 10; i++) *p++ = 0x00; *p++ = 0xff; - *p++ = 0xff; - /* Retrieve the saved copy and we're done. */ - memcpy ((void *) p, tmp, INADDRSZ); + *p = 0xff; } diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index cf060be8ef..7045c5915b 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2003, 2004, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1996-2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -465,8 +465,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, char *aliases[MAX_NR_ALIASES]; unsigned char host_addr[16]; /* IPv4 or IPv6 */ char *h_addr_ptrs[0]; - } *host_data; - int linebuflen; + } *host_data = (struct host_data *) buffer; + int linebuflen = buflen - sizeof (struct host_data); register const HEADER *hp; const u_char *end_of_message, *cp; int n, ancount, qdcount; @@ -478,9 +478,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, u_char packtmp[NS_MAXCDNAME]; int have_to_map = 0; int32_t ttl = 0; - uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data); - buffer += pad; - if (__builtin_expect (buflen < sizeof (struct host_data) + pad, 0)) + + if (__builtin_expect (linebuflen, 0) < 0) { /* The buffer is too small. */ too_small: @@ -488,10 +487,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, *h_errnop = NETDB_INTERNAL; return NSS_STATUS_TRYAGAIN; } - host_data = (struct host_data *) buffer; - linebuflen = buflen - sizeof (struct host_data); - if (buflen - sizeof (struct host_data) != linebuflen) - linebuflen = INT_MAX; tname = qname; result->h_name = NULL; diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c index 4552b5b678..97d9263895 100644 --- a/resolv/nss_dns/dns-network.c +++ b/resolv/nss_dns/dns-network.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004, 2007 +/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -102,8 +102,7 @@ extern int __ns_name_unpack (const u_char *, const u_char *, /* Prototypes for local functions. */ static enum nss_status getanswer_r (const querybuf *answer, int anslen, struct netent *result, char *buffer, - size_t buflen, int *errnop, int *h_errnop, - lookup_method net_i); + size_t buflen, lookup_method net_i); enum nss_status @@ -143,8 +142,7 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result, ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND; } - status = getanswer_r (net_buffer.buf, anslen, result, buffer, buflen, - errnop, herrnop, BYNAME); + status = getanswer_r (net_buffer.buf, anslen, result, buffer, buflen, BYNAME); if (net_buffer.buf != orig_net_buffer) free (net_buffer.buf); return status; @@ -220,8 +218,7 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result, ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND; } - status = getanswer_r (net_buffer.buf, anslen, result, buffer, buflen, - errnop, herrnop, BYADDR); + status = getanswer_r (net_buffer.buf, anslen, result, buffer, buflen, BYADDR); if (net_buffer.buf != orig_net_buffer) free (net_buffer.buf); if (status == NSS_STATUS_SUCCESS) @@ -243,8 +240,7 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result, static enum nss_status getanswer_r (const querybuf *answer, int anslen, struct netent *result, - char *buffer, size_t buflen, int *errnop, int *h_errnop, - lookup_method net_i) + char *buffer, size_t buflen, lookup_method net_i) { /* * Find first satisfactory answer @@ -264,25 +260,8 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, { char *aliases[MAX_NR_ALIASES]; char linebuffer[0]; - } *net_data; - - uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct net_data); - buffer += pad; - - if (__builtin_expect (buflen < sizeof (*net_data) + pad, 0)) - { - /* The buffer is too small. */ - too_small: - *errnop = ERANGE; - *h_errnop = NETDB_INTERNAL; - return NSS_STATUS_TRYAGAIN; - } - buflen -= pad; - - net_data = (struct net_data *) buffer; + } *net_data = (struct net_data *) buffer; int linebuflen = buflen - offsetof (struct net_data, linebuffer); - if (buflen - offsetof (struct net_data, linebuffer) != linebuflen) - linebuflen = INT_MAX; const unsigned char *end_of_message = &answer->buf[anslen]; const HEADER *header_pointer = &answer->hdr; /* #/records in the answer section. */ @@ -340,7 +319,10 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1) { if (errno == EMSGSIZE) - goto too_small; + { + errno = ERANGE; + return NSS_STATUS_TRYAGAIN; + } n = -1; } @@ -364,7 +346,10 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1) { if (errno == EMSGSIZE) - goto too_small; + { + errno = ERANGE; + return NSS_STATUS_TRYAGAIN; + } n = -1; } diff --git a/resolv/res_libc.c b/resolv/res_libc.c index 834773c32f..8af57f7a4a 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -33,7 +33,7 @@ extern unsigned long long int __res_initstamp attribute_hidden; #if __WORDSIZE == 64 # define atomicinclock(lock) (void) 0 # define atomicincunlock(lock) (void) 0 -# define atomicinc(var) atomic_increment (&(var)) +# define atomicinc(var) catomic_increment (&(var)) #else __libc_lock_define_initialized (static, lock); # define atomicinclock(lock) __libc_lock_lock (lock) diff --git a/resolv/tst-inet_ntop.c b/resolv/tst-inet_ntop.c deleted file mode 100644 index a042c74c91..0000000000 --- a/resolv/tst-inet_ntop.c +++ /dev/null @@ -1,111 +0,0 @@ -#include <arpa/inet.h> -#include <errno.h> -#include <netinet/in.h> -#include <stdio.h> -#include <string.h> - -int -main (void) -{ - struct in_addr addr4; - struct in6_addr addr6; - char buf[64]; - int result = 0; - - addr4.s_addr = 0xe0e0e0e0; - addr6.s6_addr16[0] = 0; - addr6.s6_addr16[1] = 0; - addr6.s6_addr16[2] = 0; - addr6.s6_addr16[3] = 0; - addr6.s6_addr16[4] = 0; - addr6.s6_addr16[5] = 0xffff; - addr6.s6_addr32[3] = 0xe0e0e0e0; - memset (buf, 'x', sizeof buf); - - if (inet_ntop (AF_INET, &addr4, buf, 15) != NULL) - { - puts ("1st inet_ntop returned non-NULL"); - result++; - } - else if (errno != ENOSPC) - { - puts ("1st inet_ntop didn't fail with ENOSPC"); - result++; - } - if (buf[15] != 'x') - { - puts ("1st inet_ntop wrote past the end of buffer"); - result++; - } - - if (inet_ntop (AF_INET, &addr4, buf, 16) != buf) - { - puts ("2nd inet_ntop did not return buf"); - result++; - } - if (memcmp (buf, "224.224.224.224\0" "xxxxxxxx", 24) != 0) - { - puts ("2nd inet_ntop wrote past the end of buffer"); - result++; - } - - if (inet_ntop (AF_INET6, &addr6, buf, 22) != NULL) - { - puts ("3rd inet_ntop returned non-NULL"); - result++; - } - else if (errno != ENOSPC) - { - puts ("3rd inet_ntop didn't fail with ENOSPC"); - result++; - } - if (buf[22] != 'x') - { - puts ("3rd inet_ntop wrote past the end of buffer"); - result++; - } - - if (inet_ntop (AF_INET6, &addr6, buf, 23) != buf) - { - puts ("4th inet_ntop did not return buf"); - result++; - } - if (memcmp (buf, "::ffff:224.224.224.224\0" "xxxxxxxx", 31) != 0) - { - puts ("4th inet_ntop wrote past the end of buffer"); - result++; - } - - memset (&addr6.s6_addr, 0xe0, sizeof (addr6.s6_addr)); - - if (inet_ntop (AF_INET6, &addr6, buf, 39) != NULL) - { - puts ("5th inet_ntop returned non-NULL"); - result++; - } - else if (errno != ENOSPC) - { - puts ("5th inet_ntop didn't fail with ENOSPC"); - result++; - } - if (buf[39] != 'x') - { - puts ("5th inet_ntop wrote past the end of buffer"); - result++; - } - - if (inet_ntop (AF_INET6, &addr6, buf, 40) != buf) - { - puts ("6th inet_ntop did not return buf"); - result++; - } - if (memcmp (buf, "e0e0:e0e0:e0e0:e0e0:e0e0:e0e0:e0e0:e0e0\0" - "xxxxxxxx", 48) != 0) - { - puts ("6th inet_ntop wrote past the end of buffer"); - result++; - } - - - return result; -} |