diff options
| author | Stan Shebs <stanshebs@google.com> | 2016-05-09 13:54:38 -0700 |
|---|---|---|
| committer | Stan Shebs <stanshebs@google.com> | 2016-05-09 13:54:38 -0700 |
| commit | a39e9f7a233799f28a79c0a562b66c250e2cd4b2 (patch) | |
| tree | 722eb56c73705dcff300e3127a9c5cc7bc92bc50 | |
| parent | a48e32ee701ff0247601464e5b3d4b6b496eb423 (diff) | |
| download | glibc-a39e9f7a233799f28a79c0a562b66c250e2cd4b2.zip glibc-a39e9f7a233799f28a79c0a562b66c250e2cd4b2.tar.gz glibc-a39e9f7a233799f28a79c0a562b66c250e2cd4b2.tar.bz2 | |
fix where getaddrinfo() writes DNS queries to random file descriptors under high load (BZ15946, CVE-2013-7423)
| -rw-r--r-- | README.google | 8 | ||||
| -rw-r--r-- | resolv/res_send.c | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/README.google b/README.google index 57adcb4..b65b4ee 100644 --- a/README.google +++ b/README.google @@ -574,4 +574,10 @@ nptl/sysdeps/unix/sysv/linux/register-atfork.c resolv/nss_dns/dns-network.c For b/27917753, fix stack overflow in _nss_dns_getnetbyname_r (BZ19879) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=317b199b4aff8cfa27f2302ab404d2bb5032b9a4 - (stanshebs, google-local) + (stanshebs, backport) + +resolv/res_send.c + For b/28166767, fix where getaddrinfo() writes DNS queries to random file descriptors + under high load (BZ15946, CVE-2013-7423) + https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f9d2d03254a58d92635a311a42253eeed5a40a47 + (stanshebs, backport) diff --git a/resolv/res_send.c b/resolv/res_send.c index 6d8fb08..3eb6cbf 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -1414,6 +1414,7 @@ send_dg(res_state statp, retval = reopen (statp, terrno, ns); if (retval <= 0) return retval; + pfd[0].fd = EXT(statp).nssocks[ns]; } } goto wait; |