Author: aurel32
Date: 2015-09-13 14:46:17 +0000 (Sun, 13 Sep 2015)
New Revision: 6566
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/git-updates.diff
Log:
Update from upstream stable branch:
- Fix getaddrinfo sometimes returning uninitialized data with nscd.
Closes: #798515.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2015-09-13 14:45:08 UTC (rev
6565)
+++ glibc-package/trunk/debian/changelog 2015-09-13 14:46:17 UTC (rev
6566)
@@ -31,6 +31,8 @@
#788999.
- Fix gprof entry point on ppc64el. Closes: #794222.
- Fix a buffer overflow in getanswer_r (CVE-2015-1781). Closes: #796105.
+ - Fix getaddrinfo sometimes returning uninitialized data with nscd.
+ Closes: #798515.
* sysdeps.mk/mips*.mk: force the ISA until it gets propagated to all GCC
versions.
Modified: glibc-package/trunk/debian/patches/git-updates.diff
===================================================================
--- glibc-package/trunk/debian/patches/git-updates.diff 2015-09-13 14:45:08 UTC
(rev 6565)
+++ glibc-package/trunk/debian/patches/git-updates.diff 2015-09-13 14:46:17 UTC
(rev 6566)
@@ -1,10 +1,16 @@
GIT update of git://sourceware.org/git/glibc.git/release/2.19/master from
glibc-2.19
diff --git a/ChangeLog b/ChangeLog
-index 81c393a..0eb6c3f 100644
+index 81c393a..3964305 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,341 @@
+@@ -1,3 +1,347 @@
++2014-03-20 Andreas Schwab <[email protected]>
++
++ [BZ #16743]
++ * sysdeps/posix/getaddrinfo.c (gaih_inet): Properly skip over
++ non-matching result from nscd.
++
+2015-04-21 Arjun Shankar <[email protected]>
+
+ [BZ #18287]
@@ -347,7 +353,7 @@
[BZ #16529]
diff --git a/NEWS b/NEWS
-index 98b479e..7f9388f 100644
+index 98b479e..be59ead 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,59 @@ See the end for copying conditions.
@@ -358,9 +364,9 @@
+
+* The following bugs are resolved with this release:
+
-+ 15946, 16545, 16574, 16623, 16657, 16695, 16878, 16882, 16885, 16916,
-+ 16932, 16943, 16958, 17048, 17069, 17137, 17213, 17263, 17325, 17555,
-+ 18287.
++ 15946, 16545, 16574, 16623, 16657, 16695, 16743, 16878, 16882, 16885,
++ 16916, 16932, 16943, 16958, 17048, 17069, 17137, 17213, 17263, 17325,
++ 17555, 18287.
+
+* A buffer overflow in gethostbyname_r and related functions performing DNS
+ requests has been fixed. If the NSS functions were called with a
@@ -2701,6 +2707,25 @@
res = do_sin (u, y, db, &cor);
cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
retval = ((res == res + cor) ? ((m) ? res : -res)
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index 8218237..b3cc124 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -710,6 +710,14 @@ gaih_inet (const char *name, const struct gaih_service
*service,
+ struct gaih_addrtuple *addrfree = addrmem;
+ for (int i = 0; i < air->naddrs; ++i)
+ {
++ 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;
++
+ socklen_t size = (air->family[i] == AF_INET
+ ? INADDRSZ : IN6ADDRSZ);
+ if (*pat == NULL)
diff --git a/sysdeps/powerpc/powerpc64/entry.h
b/sysdeps/powerpc/powerpc64/entry.h
index 76ead1d..30553c1 100644
--- a/sysdeps/powerpc/powerpc64/entry.h
