1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
From 6a209f14ff7273d9429e5153c5b6b1990cb508e3 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 14 Mar 2017 14:31:34 -0400
Subject: [PATCH] fix possible fd leak, unrestored cancellation state on dns
socket fail
---
src/network/res_msend.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/network/res_msend.c b/src/network/res_msend.c
index de7f6157..3e018009 100644
--- a/src/network/res_msend.c
+++ b/src/network/res_msend.c
@@ -76,7 +76,11 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries,
fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
family = AF_INET;
}
- if (fd < 0 || bind(fd, (void *)&sa, sl) < 0) return -1;
+ if (fd < 0 || bind(fd, (void *)&sa, sl) < 0) {
+ if (fd >= 0) close(fd);
+ pthread_setcancelstate(cs, 0);
+ return -1;
+ }
/* Past this point, there are no errors. Each individual query will
* yield either no reply (indicated by zero length) or an answer
--
2.11.1
|
