diff options
| author | Andreas Schwab <schwab@suse.de> | 2014-05-26 18:01:31 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-09-05 22:44:08 +1000 |
| commit | d3b2d64576fcc1281841a48740f5f481d1b46a90 (patch) | |
| tree | a6ca9c2eb89efc6c33011d8adce519790aafd98f | |
| parent | 40da893a143224b0a41a004eb5e971fc5d94381b (diff) | |
| download | glibc-d3b2d64576fcc1281841a48740f5f481d1b46a90.tar.gz glibc-d3b2d64576fcc1281841a48740f5f481d1b46a90.tar.xz glibc-d3b2d64576fcc1281841a48740f5f481d1b46a90.zip | |
Fix invalid file descriptor reuse while sending DNS query (BZ #15946)
(cherry picked from commit f9d2d03254a58d92635a311a42253eeed5a40a47) Conflicts: NEWS
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | resolv/res_send.c | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 62beb70792..a69a26953a 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. + 2014-02-18 Andreas Schwab <schwab@suse.de> [BZ #16574] diff --git a/NEWS b/NEWS index d2b3419831..4eebd67611 100644 --- 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 704542c730..416da8777e 100644 --- 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; |