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

Conflicts:
	NEWS

diff --git a/ChangeLog b/ChangeLog
index 5b734230442ea83185c7de88e352e7a39ab71008..246f0a51840d839a37dbc264958c98cc5b6e6673 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.
+
 2015-02-05  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        [BZ #16618]

diff --git a/NEWS b/NEWS
index b0c3072c45b7cfb2eeeaeda319571c437b38719c..6a49b4bdb550b0392c14694f0e31b1da5397f2f5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,8 @@ Version 2.16.1
 * The following bugs are resolved with this release:
 
   6530, 14195, 14547, 14459, 14476, 14562, 14621, 14648, 14699, 14719,
-  14756, 14831, 15014, 15078, 15754, 15755, 16072, 16431, 16617, 16618,
-  17048, 17137, 17187, 17325, 17625, 17630.
+  14756, 14831, 15014, 15078, 15754, 15755, 15946, 16072, 16431, 16617,
+  16618, 17048, 17137, 17187, 17325, 17625, 17630.
 
 * CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag
   under certain input conditions resulting in the execution of a shell for

diff --git a/resolv/res_send.c b/resolv/res_send.c
index 0a28cd784b99d45eb70150f3ac50b75b14203976..a8d4849f0670729fbc47f4373ee38cd4673f2db1 100644 (file)
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -1402,6 +1402,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;