RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some more O_CLOEXEC/SOCK_CLOEXEC issues

This commit is contained in:
Rich Felker 2012-09-29 17:59:50 -04:00
parent 3609e019f3
commit f2d08cf755
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ldso/dynlink.c
View File

@ -376,7 +376,7 @@ static int path_open(const char *name, const char *search, char *buf, size_t buf
z = strchr(s, ':'); z = strchr(s, ':');
l = z ? z-s : strlen(s); l = z ? z-s : strlen(s);
snprintf(buf, buf_size, "%.*s/%s", l, s, name); snprintf(buf, buf_size, "%.*s/%s", l, s, name);
if ((fd = open(buf, O_RDONLY))>=0) return fd; if ((fd = open(buf, O_RDONLY|O_CLOEXEC))>=0) return fd;
s += l; s += l;
} }
} }
@ -423,7 +423,7 @@ static struct dso *load_library(const char *name)
} }
if (strchr(name, '/')) { if (strchr(name, '/')) {
pathname = name; pathname = name;
fd = open(name, O_RDONLY); fd = open(name, O_RDONLY|O_CLOEXEC);
} else { } else {
/* Search for the name to see if it's already loaded */ /* Search for the name to see if it's already loaded */
for (p=head->next; p; p=p->next) { for (p=head->next; p; p=p->next) {

2
src/misc/realpath.c
View File

@ -19,7 +19,7 @@ char *realpath(const char *restrict filename, char *restrict resolved)
return 0; return 0;
} }
fd = open(filename, O_RDONLY|O_NONBLOCK); fd = open(filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC);
if (fd < 0) return 0; if (fd < 0) return 0;
snprintf(buf, sizeof buf, "/proc/self/fd/%d", fd); snprintf(buf, sizeof buf, "/proc/self/fd/%d", fd);

4
src/network/__dns.c
View File

@ -91,7 +91,7 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt)
/* Get local address and open/bind a socket */ /* Get local address and open/bind a socket */
sa.sin.sin_family = family; sa.sin.sin_family = family;
fd = socket(family, SOCK_DGRAM, 0); fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
pthread_cleanup_push(cleanup, (void *)(intptr_t)fd); pthread_cleanup_push(cleanup, (void *)(intptr_t)fd);
pthread_setcancelstate(cs, 0); pthread_setcancelstate(cs, 0);
@ -100,8 +100,6 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt)
errcode = EAI_SYSTEM; errcode = EAI_SYSTEM;
goto out; goto out;
} }
/* Nonblocking to work around Linux UDP select bug */
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
pfd.fd = fd; pfd.fd = fd;
pfd.events = POLLIN; pfd.events = POLLIN;

2
src/stdio/__fopen_rb_ca.c
View File

@ -4,7 +4,7 @@ FILE *__fopen_rb_ca(const char *filename, FILE *f, unsigned char *buf, size_t le
{ {
memset(f, 0, sizeof *f); memset(f, 0, sizeof *f);
f->fd = syscall(SYS_open, filename, O_RDONLY|O_LARGEFILE, 0); f->fd = syscall(SYS_open, filename, O_RDONLY|O_LARGEFILE|O_CLOEXEC, 0);
if (f->fd < 0) return 0; if (f->fd < 0) return 0;
f->flags = F_NOWR | F_PERM; f->flags = F_NOWR | F_PERM;