generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am bcf77b5d: Merge "add CLOEXEC to various DNS related code"

Browse Source 
* commit 'bcf77b5dfff2c93187c42c613ada6d2b97bb02d4':
  add CLOEXEC to various DNS related code
This commit is contained in:
Nick Kralevich 2014-06-30 23:20:54 +00:00 committed by Android Git Automerger
commit e844f27a05
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/dns/gethnamaddr.c
View File

@ -539,7 +539,7 @@ static FILE* android_open_proxy()
const int one = 1; const int one = 1;
struct sockaddr_un proxy_addr; struct sockaddr_un proxy_addr;
sock = socket(AF_UNIX, SOCK_STREAM, 0); sock = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (sock < 0) { if (sock < 0) {
return NULL; return NULL;
} }

8
libc/dns/net/getaddrinfo.c
View File

@ -362,7 +362,7 @@ str2number(const char *p)
*/ */
static int static int
_test_connect(int pf, struct sockaddr *addr, size_t addrlen, unsigned mark) { _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) if (s < 0)
return 0; return 0;
if (mark != MARK_UNSET && setsockopt(s, SOL_SOCKET, SO_MARK, &mark, sizeof(mark)) < 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; return EAI_NODATA;
} }
sock = socket(AF_UNIX, SOCK_STREAM, 0); sock = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (sock < 0) { if (sock < 0) {
return EAI_NODATA; 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 * filter out AFs that are not supported by the kernel
* XXX errno? * XXX errno?
*/ */
s = socket(pai->ai_family, SOCK_DGRAM, 0); s = socket(pai->ai_family, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (s < 0) { if (s < 0) {
if (errno != EMFILE) if (errno != EMFILE)
return 0; return 0;
@ -1792,7 +1792,7 @@ _find_src_addr(const struct sockaddr *addr, struct sockaddr *src_addr, unsigned
return 0; 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 (sock == -1) {
if (errno == EAFNOSUPPORT) { if (errno == EAFNOSUPPORT) {
return 0; return 0;

2
libc/dns/resolv/res_init.c
View File

@ -611,7 +611,7 @@ net_mask(in) /* XXX - should really use system's version of this */
static int static int
real_randomid(u_int *random_value) { real_randomid(u_int *random_value) {
/* open the nonblocking random device, returning -1 on failure */ /* 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) { if (random_device < 0) {
return -1; return -1;
} }

4
libc/dns/resolv/res_send.c
View File

@ -779,7 +779,7 @@ send_vc(res_state statp,
if (statp->_vcsock >= 0) if (statp->_vcsock >= 0)
res_nclose(statp); 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) { if (statp->_vcsock > highestFD) {
res_nclose(statp); res_nclose(statp);
errno = ENOTSOCK; errno = ENOTSOCK;
@ -1062,7 +1062,7 @@ send_dg(res_state statp,
nsap = get_nsaddr(statp, (size_t)ns); nsap = get_nsaddr(statp, (size_t)ns);
nsaplen = get_salen(nsap); nsaplen = get_salen(nsap);
if (EXT(statp).nssocks[ns] == -1) { 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) { if (EXT(statp).nssocks[ns] > highestFD) {
res_nclose(statp); res_nclose(statp);
errno = ENOTSOCK; errno = ENOTSOCK;