diff options
| author | Andreas Schwab <schwab@suse.de> | 2014-05-26 18:01:31 +0200 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2015-04-07 09:55:31 -0300 |
| commit | 45af2f6fe19b8a776373cac5a2691460179aa1a3 (patch) | |
| tree | 9a494683212717b0ecbacda77a5a4dcfe1f3e8c6 | |
| parent | a33fd93601cae52dd1c53f92240e11b25b053e18 (diff) | |
| download | glibc-45af2f6fe19b8a776373cac5a2691460179aa1a3.tar.gz glibc-45af2f6fe19b8a776373cac5a2691460179aa1a3.tar.xz glibc-45af2f6fe19b8a776373cac5a2691460179aa1a3.zip | |
Fix invalid file descriptor reuse while sending DNS query (BZ #15946)
Conflicts: NEWS
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | resolv/res_send.c | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 249dbedf70..6df40a4763 100644 --- 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 3122290731..324dd55d75 100644 --- 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 60da5c901b..7586f15d1a 100644 --- 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; |