aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-10-13 23:03:28 +0200
committerOndřej Bílka <neleai@seznam.cz>2013-10-14 08:17:09 +0200
commitcabba9343c8bd99e4aea66aa1e0ec7d93aa18a7e (patch)
tree43d7ccc69f7ae2656a5c4b38d4e6f61715bcd71e
parent94bf958a9435b8d8fbf92c15d8cd5d310029a22c (diff)
downloadglibc-cabba9343c8bd99e4aea66aa1e0ec7d93aa18a7e.tar
glibc-cabba9343c8bd99e4aea66aa1e0ec7d93aa18a7e.tar.gz
glibc-cabba9343c8bd99e4aea66aa1e0ec7d93aa18a7e.tar.bz2
glibc-cabba9343c8bd99e4aea66aa1e0ec7d93aa18a7e.zip
Correctly copy resolver address. Fixes bug #13028.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS13
-rw-r--r--resolv/res_send.c2
3 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 432c0416d7..3905a29b1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-14 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #13028]
+ * res_send.c(__libc_res_nsend): Correctly copy the nameserver
+ address.
+
2013-10-14 P. J. McDermott <pj@pehjota.net>
[BZ #832]
diff --git a/NEWS b/NEWS
index b6afde08b5..156e98891f 100644
--- a/NEWS
+++ b/NEWS
@@ -9,12 +9,13 @@ Version 2.19
* The following bugs are resolved with this release:
- 156, 431, 832, 13982, 13985, 14155, 14547, 14699, 14910, 15048, 15362,
- 15400, 15427, 15522, 15531, 15532, 15608, 15609, 15610, 15632, 15640,
- 15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760,
- 15764, 15797, 15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867,
- 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919,
- 15921, 15923, 15939, 15963, 15966, 15988, 16032, 16034, 16036.
+ 156, 431, 832, 13028, 13982, 13985, 14155, 14547, 14699, 14910, 15048,
+ 15362, 15400, 15427, 15522, 15531, 15532, 15608, 15609, 15610, 15632,
+ 15640, 15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754,
+ 15760, 15764, 15797, 15844, 15847, 15849, 15855, 15856, 15857, 15859,
+ 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909,
+ 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909,
+ 15919, 15921, 15923, 15939, 15963, 15966, 15988, 16032, 16034, 16036.
* CVE-2012-4412 The strcoll implementation caches indices and rules for
large collation sequences to optimize multiple passes. This cache
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 5a73696e55..7f2e85f324 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -441,7 +441,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
malloc(sizeof (struct sockaddr_in6));
if (EXT(statp).nsaddrs[n] != NULL) {
memset (mempcpy(EXT(statp).nsaddrs[n],
- &statp->nsaddr_list[n],
+ &statp->nsaddr_list[ns],
sizeof (struct sockaddr_in)),
'\0',
sizeof (struct sockaddr_in6)