diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-12-17 18:09:11 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-12-17 18:09:11 +0000 |
| commit | 8ac5a76a99e51a91eac9cecbe941fc05ddf11e03 (patch) | |
| tree | 76a65f8b81308ff6f6c84f5b6b3628673b2178cf /resolv | |
| parent | 66ce3cb12f74d3dbd4018ce6498a36348acf7e83 (diff) | |
Fix resolver inet_* namespace (bug 17722).
Parts of the resolver brought in by pthreads (at least) use inet_*
functions that aren't in the 1995/6 edition of POSIX that introduced
pthreads (or in one case, use __inet_aton which is then defined in the
same file as non-weak inet_addr). This patch fixes this by making the
affected functions into weak alias for __inet_* and using those names
in the problematic resolver code.
Tested for x86_64 (testsuite, and that disassembly of installed shared
libraries is unchanged by the patch).
[BZ #17722]
* inet/inet_mkadr.c (inet_makeaddr): Rename to __inet_makeaddr and
define as weak alias of __inet_makeaddr.
* resolv/inet_addr.c (inet_addr): Rename to __inet_addr and define
as weak alias of __inet_addr.
* resolv/inet_pton.c (inet_pton): Rename to __inet_pton and define
as weak alias of __inet_pton. Use libc_hidden_weak.
* include/arpa/inet.h (__inet_pton): Declare. Use
libc_hidden_proto.
(inet_makeaddr): Don't use libc_hidden_proto.
(__inet_makeaddr): Declare. Use libc_hidden_proto.
* resolv/res_init.c (__res_vinit): Use __inet_pton instead of
inet_pton. Use __inet_makeaddr instead of inet_makeaddr.
* conform/Makefile (test-xfail-POSIX/pthread.h/linknamespace):
Remove variable.
(test-xfail-POSIX/sched.h/linknamespace): Likewise.
(test-xfail-POSIX/time.h/linknamespace): Likewise.
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/inet_addr.c | 3 | ||||
| -rw-r--r-- | resolv/inet_pton.c | 6 | ||||
| -rw-r--r-- | resolv/res_init.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c index 144b87a74c..ee42093754 100644 --- a/resolv/inet_addr.c +++ b/resolv/inet_addr.c @@ -90,13 +90,14 @@ static const char rcsid[] = "$BINDId: inet_addr.c,v 8.11 1999/10/13 16:39:25 vix * The value returned is in network order. */ in_addr_t -inet_addr(const char *cp) { +__inet_addr(const char *cp) { struct in_addr val; if (__inet_aton(cp, &val)) return (val.s_addr); return (INADDR_NONE); } +weak_alias (__inet_addr, inet_addr) /* * Check whether "cp" is a valid ascii representation diff --git a/resolv/inet_pton.c b/resolv/inet_pton.c index c507013e4e..3d8819512e 100644 --- a/resolv/inet_pton.c +++ b/resolv/inet_pton.c @@ -49,7 +49,7 @@ static int inet_pton6 (const char *src, u_char *dst) internal_function; * Paul Vixie, 1996. */ int -inet_pton(af, src, dst) +__inet_pton(af, src, dst) int af; const char *src; void *dst; @@ -65,7 +65,9 @@ inet_pton(af, src, dst) } /* NOTREACHED */ } -libc_hidden_def (inet_pton) +libc_hidden_def (__inet_pton) +weak_alias (__inet_pton, inet_pton) +libc_hidden_weak (inet_pton) /* int * inet_pton4(src, dst) diff --git a/resolv/res_init.c b/resolv/res_init.c index 6eddcdd0b2..d492a08aee 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -324,7 +324,7 @@ __res_vinit(res_state statp, int preinit) { if ((el = strchr(cp, SCOPE_DELIMITER)) != NULL) *el = '\0'; if ((*cp != '\0') && - (inet_pton(AF_INET6, cp, &a6) > 0)) { + (__inet_pton(AF_INET6, cp, &a6) > 0)) { struct sockaddr_in6 *sa6; sa6 = malloc(sizeof(*sa6)); @@ -428,7 +428,7 @@ __res_vinit(res_state statp, int preinit) { (void) fclose(fp); } if (__builtin_expect(statp->nscount == 0, 0)) { - statp->nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1); + statp->nsaddr.sin_addr = __inet_makeaddr(IN_LOOPBACKNET, 1); statp->nsaddr.sin_family = AF_INET; statp->nsaddr.sin_port = htons(NAMESERVER_PORT); statp->nscount = 1; |