mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

core-util: make sure to enable FD_CLOEXEC unconditionally to cope with kernels that silently accept but ignore O_CLOEXEC

Browse source
This commit is contained in:
Lennart Poettering 2009-10-30 04:16:59 +01:00
parent 65e7bc18a9
commit a698ee3f52
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/pulsecore/core-util.c
View file

@ -2896,7 +2896,7 @@ int pa_open_cloexec(const char *fn, int flags, mode_t mode) {
#ifdef O_CLOEXEC #ifdef O_CLOEXEC
if ((fd = open(fn, flags|O_CLOEXEC, mode)) >= 0) if ((fd = open(fn, flags|O_CLOEXEC, mode)) >= 0)
return fd; goto finish;
if (errno != EINVAL) if (errno != EINVAL)
return fd; return fd;
@ -2905,6 +2905,10 @@ int pa_open_cloexec(const char *fn, int flags, mode_t mode) {
if ((fd = open(fn, flags, mode)) < 0) if ((fd = open(fn, flags, mode)) < 0)
return fd; return fd;
finish:
/* Some implementations might simply ignore O_CLOEXEC if it is not
* understood, make sure FD_CLOEXEC is enabled anyway */
pa_make_fd_cloexec(fd); pa_make_fd_cloexec(fd);
return fd; return fd;
} }
@ -2914,7 +2918,7 @@ int pa_socket_cloexec(int domain, int type, int protocol) {
#ifdef SOCK_CLOEXEC #ifdef SOCK_CLOEXEC
if ((fd = socket(domain, type | SOCK_CLOEXEC, protocol)) >= 0) if ((fd = socket(domain, type | SOCK_CLOEXEC, protocol)) >= 0)
return fd; goto finish;
if (errno != EINVAL) if (errno != EINVAL)
return fd; return fd;
@ -2923,6 +2927,10 @@ int pa_socket_cloexec(int domain, int type, int protocol) {
if ((fd = socket(domain, type, protocol)) < 0) if ((fd = socket(domain, type, protocol)) < 0)
return fd; return fd;
finish:
/* Some implementations might simply ignore SOCK_CLOEXEC if it is
* not understood, make sure FD_CLOEXEC is enabled anyway */
pa_make_fd_cloexec(fd); pa_make_fd_cloexec(fd);
return fd; return fd;
} }
@ -2932,7 +2940,7 @@ int pa_pipe_cloexec(int pipefd[2]) {
#ifdef HAVE_PIPE2 #ifdef HAVE_PIPE2
if ((r = pipe2(pipefd, O_CLOEXEC)) >= 0) if ((r = pipe2(pipefd, O_CLOEXEC)) >= 0)
return r; goto finish;
if (errno != EINVAL && errno != ENOSYS) if (errno != EINVAL && errno != ENOSYS)
return r; return r;
@ -2941,6 +2949,7 @@ int pa_pipe_cloexec(int pipefd[2]) {
if ((r = pipe(pipefd)) < 0) if ((r = pipe(pipefd)) < 0)
return r; return r;
finish:
pa_make_fd_cloexec(pipefd[0]); pa_make_fd_cloexec(pipefd[0]);
pa_make_fd_cloexec(pipefd[1]); pa_make_fd_cloexec(pipefd[1]);