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

Conflicts:
	NEWS

diff --git a/ChangeLog b/ChangeLog
index 249dbedf70623525e1d767fdaddc87cd7e84a64b..6df40a47636accf2387ffdb2da9f13c23c618fa5 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-03-10  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        * sysdeps/ieee754/dbl-64/Makefile (CFLAGS-e_pow.c): Add

diff --git a/NEWS b/NEWS
index 312229073115e7b0a02a87068004aff9ef19ba9c..324dd55d750b0e3f270f682fa82eeb20682a253f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,9 +10,9 @@ Version 2.18.1
 * The following bugs are resolved with this release:
 
   14143, 14155, 14547, 14699, 15532, 15427, 15522, 15680, 15723, 15734,
-  15735, 15797, 15892, 15895, 15909, 15915, 15917, 15996, 16072, 16150,
-  16414, 16430, 16431, 16617, 16618, 17048, 17137, 17187, 17325, 17625,
-  17630, 18104.
+  15735, 15797, 15892, 15895, 15909, 15915, 15917, 15946, 15996, 16072,
+  16150, 16414, 16430, 16431, 16617, 16618, 17048, 17137, 17187, 17325,
+  17625, 17630, 18104.
 
 * Support for powerpc64le has been added.
 

diff --git a/resolv/res_send.c b/resolv/res_send.c
index 60da5c901ba32470f75ad7234ec5ebd377ecbbf0..7586f15d1afd76194783f71d5d235fa544c66e8d 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;