diff options
| author | Nick Kralevich <nnk@google.com> | 2014-06-30 23:23:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-30 23:23:47 +0000 |
| commit | b18a1c3d195ac7bc2affc713d06050d0503c1b22 (patch) | |
| tree | 0dda699d310a84e646c6b32fd45d789e75556c06 | |
| parent | dd9efcbab631a823d67c71a36e17c15ebd8fe502 (diff) | |
| parent | e844f27a05b32b7bf2fd68b1bd69e450040c1e24 (diff) | |
| download | bionic-b18a1c3d195ac7bc2affc713d06050d0503c1b22.zip bionic-b18a1c3d195ac7bc2affc713d06050d0503c1b22.tar.gz bionic-b18a1c3d195ac7bc2affc713d06050d0503c1b22.tar.bz2 | |
am e844f27a: am bcf77b5d: Merge "add CLOEXEC to various DNS related code"
* commit 'e844f27a05b32b7bf2fd68b1bd69e450040c1e24':
add CLOEXEC to various DNS related code
| -rw-r--r-- | libc/dns/gethnamaddr.c | 2 | ||||
| -rw-r--r-- | libc/dns/net/getaddrinfo.c | 8 | ||||
| -rw-r--r-- | libc/dns/resolv/res_init.c | 2 | ||||
| -rw-r--r-- | libc/dns/resolv/res_send.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libc/dns/gethnamaddr.c b/libc/dns/gethnamaddr.c index 1afad6d..6f30f75 100644 --- a/libc/dns/gethnamaddr.c +++ b/libc/dns/gethnamaddr.c @@ -539,7 +539,7 @@ static FILE* android_open_proxy() const int one = 1; struct sockaddr_un proxy_addr; - sock = socket(AF_UNIX, SOCK_STREAM, 0); + sock = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); if (sock < 0) { return NULL; } diff --git a/libc/dns/net/getaddrinfo.c b/libc/dns/net/getaddrinfo.c index 32d946c..2612d6a 100644 --- a/libc/dns/net/getaddrinfo.c +++ b/libc/dns/net/getaddrinfo.c @@ -362,7 +362,7 @@ str2number(const char *p) */ static int _test_connect(int pf, struct sockaddr *addr, size_t addrlen, unsigned mark) { - int s = socket(pf, SOCK_DGRAM, IPPROTO_UDP); + int s = socket(pf, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP); if (s < 0) return 0; if (mark != MARK_UNSET && setsockopt(s, SOL_SOCKET, SO_MARK, &mark, sizeof(mark)) < 0) @@ -433,7 +433,7 @@ android_getaddrinfo_proxy( return EAI_NODATA; } - sock = socket(AF_UNIX, SOCK_STREAM, 0); + sock = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); if (sock < 0) { return EAI_NODATA; } @@ -884,7 +884,7 @@ explore_null(const struct addrinfo *pai, const char *servname, * filter out AFs that are not supported by the kernel * XXX errno? */ - s = socket(pai->ai_family, SOCK_DGRAM, 0); + s = socket(pai->ai_family, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (s < 0) { if (errno != EMFILE) return 0; @@ -1792,7 +1792,7 @@ _find_src_addr(const struct sockaddr *addr, struct sockaddr *src_addr, unsigned return 0; } - sock = socket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP); + sock = socket(addr->sa_family, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP); if (sock == -1) { if (errno == EAFNOSUPPORT) { return 0; diff --git a/libc/dns/resolv/res_init.c b/libc/dns/resolv/res_init.c index 9f3a9da..158466e 100644 --- a/libc/dns/resolv/res_init.c +++ b/libc/dns/resolv/res_init.c @@ -611,7 +611,7 @@ net_mask(in) /* XXX - should really use system's version of this */ static int real_randomid(u_int *random_value) { /* open the nonblocking random device, returning -1 on failure */ - int random_device = open("/dev/urandom", O_RDONLY); + int random_device = open("/dev/urandom", O_RDONLY | O_CLOEXEC); if (random_device < 0) { return -1; } diff --git a/libc/dns/resolv/res_send.c b/libc/dns/resolv/res_send.c index e64ccde..820a226 100644 --- a/libc/dns/resolv/res_send.c +++ b/libc/dns/resolv/res_send.c @@ -774,7 +774,7 @@ send_vc(res_state statp, if (statp->_vcsock >= 0) res_nclose(statp); - statp->_vcsock = socket(nsap->sa_family, SOCK_STREAM, 0); + statp->_vcsock = socket(nsap->sa_family, SOCK_STREAM | SOCK_CLOEXEC, 0); if (statp->_vcsock > highestFD) { res_nclose(statp); errno = ENOTSOCK; @@ -1057,7 +1057,7 @@ send_dg(res_state statp, nsap = get_nsaddr(statp, (size_t)ns); nsaplen = get_salen(nsap); if (EXT(statp).nssocks[ns] == -1) { - EXT(statp).nssocks[ns] = socket(nsap->sa_family, SOCK_DGRAM, 0); + EXT(statp).nssocks[ns] = socket(nsap->sa_family, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (EXT(statp).nssocks[ns] > highestFD) { res_nclose(statp); errno = ENOTSOCK; |