about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-06-06 15:29:00 -0400
committerRich Felker <dalias@aerifal.cx>2014-06-06 15:29:00 -0400
commit1d348566e6ab446d9c452b1b93aede74368b6618 (patch)
tree9f3b972e73192c244c798eac2be44f892d780a38
parentabce3156399f30d9b16e198af62af7f7c33fcbe0 (diff)
downloadmusl-1d348566e6ab446d9c452b1b93aede74368b6618.tar.gz
musl-1d348566e6ab446d9c452b1b93aede74368b6618.tar.xz
musl-1d348566e6ab446d9c452b1b93aede74368b6618.zip
add SOCK_CLOEXEC fallback for socketpair on old kernels
as usual, this is non-atomic, but better than producing an error or
failing to set the close-on-exec flag at all.
-rw-r--r--src/network/socketpair.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/network/socketpair.c b/src/network/socketpair.c
index b15f8467..f3489621 100644
--- a/src/network/socketpair.c
+++ b/src/network/socketpair.c
@@ -1,7 +1,25 @@
 #include <sys/socket.h>
+#include <fcntl.h>
+#include <errno.h>
 #include "syscall.h"
 
 int socketpair(int domain, int type, int protocol, int fd[2])
 {
-	return socketcall(socketpair, domain, type, protocol, fd, 0, 0);
+	int r = socketcall(socketpair, domain, type, protocol, fd, 0, 0);
+	if (r<0 && (errno==EINVAL || errno==EPROTONOSUPPORT)
+	    && (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) {
+		r = socketcall(socketpair, domain,
+			type & ~(SOCK_CLOEXEC|SOCK_NONBLOCK),
+			protocol, fd, 0, 0);
+		if (r < 0) return r;
+		if (type & SOCK_CLOEXEC) {
+			__syscall(SYS_fcntl, fd[0], F_SETFD, FD_CLOEXEC);
+			__syscall(SYS_fcntl, fd[1], F_SETFD, FD_CLOEXEC);
+		}
+		if (type & SOCK_NONBLOCK) {
+			__syscall(SYS_fcntl, fd[0], F_SETFL, O_NONBLOCK);
+			__syscall(SYS_fcntl, fd[1], F_SETFL, O_NONBLOCK);
+		}
+	}
+	return r;
 }