diff options
| author | Andreas Schwab <schwab@suse.de> | 2014-05-07 11:47:20 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2014-05-07 14:21:27 +0200 |
| commit | 8dc9751764eb1bedf06d19695524b31a16773413 (patch) | |
| tree | 27d244d23ae708f0c299033d84fb2cde101d6024 | |
| parent | a11892631d92f594c690d0d50a642b0d1aba58b8 (diff) | |
| download | glibc-8dc9751764eb1bedf06d19695524b31a16773413.tar.gz glibc-8dc9751764eb1bedf06d19695524b31a16773413.tar.xz glibc-8dc9751764eb1bedf06d19695524b31a16773413.zip | |
Fix parsing of getai result from nscd for IPv6-only request
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 6c50016e7a..cb09dd711b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ +2014-05-07 Andreas Schwab <schwab@suse.de> + + * sysdeps/posix/getaddrinfo.c (gaih_inet): Advance address pointer + when skipping over non-matching result from nscd. + 2014-05-07 Ondřej Bílka <neleai@seznam.cz> [BZ #16876] * nptl/sockperf.c (client): Check socket return value. + [BZ #16877] * nscd/selinux.c (nscd_request_avc_has_perm): Check if there is nscd security class. diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 3385bed333..6258330759 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -710,16 +710,20 @@ gaih_inet (const char *name, const struct gaih_service *service, struct gaih_addrtuple *addrfree = addrmem; for (int i = 0; i < air->naddrs; ++i) { + socklen_t size = (air->family[i] == AF_INET + ? INADDRSZ : IN6ADDRSZ); + if (!((air->family[i] == AF_INET && req->ai_family == AF_INET6 && (req->ai_flags & AI_V4MAPPED) != 0) || req->ai_family == AF_UNSPEC || air->family[i] == req->ai_family)) - /* Skip over non-matching result. */ - continue; + { + /* Skip over non-matching result. */ + addrs += size; + continue; + } - socklen_t size = (air->family[i] == AF_INET - ? INADDRSZ : IN6ADDRSZ); if (*pat == NULL) { *pat = addrfree++; |