Fix invalid file descriptor reuse while sending DNS query (BZ #15946)

(cherry picked from commit f9d2d03254a58d92635a311a42253eeed5a40a47)

Conflicts:
	NEWS

diff --git a/ChangeLog b/ChangeLog
index 62beb70792dc8588fb7dd45a4a10388816d0fc25..a69a26953a27c46a604e6839f8ee767160caa31e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-03  Andreas Schwab  <schwab@suse.de>
+
+       [BZ #15946]
+       * resolv/res_send.c (send_dg): Reload file descriptor after
+       calling reopen.
+
 2014-02-18  Andreas Schwab  <schwab@suse.de>
 
        [BZ #16574]

diff --git a/NEWS b/NEWS
index d2b3419831d2d9dc39a8e1fae8b24f26ebdd4f39..4eebd6761178c3afb592f8fada37913765caf13c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,8 @@ Version 2.19.1
 
 * The following bugs are resolved with this release:
 
-  16545, 16574, 16623, 16882, 16885, 16916, 16932, 16943, 16958, 17048.
+  15946, 16545, 16574, 16623, 16882, 16885, 16916, 16932, 16943, 16958,
+  17048.
 
 * CVE-2014-4043 The posix_spawn_file_actions_addopen implementation did not
   copy the path argument.  This allowed programs to cause posix_spawn to

diff --git a/resolv/res_send.c b/resolv/res_send.c
index 704542c730785d083b05c22f49b9294c5bec1213..416da8777eb36ee07039c2d001c5eb5cf1e37ad6 100644 (file)
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -1410,6 +1410,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;