X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Funistd%2Ffaccessat.c;h=76bbd4c72a16dbea7cdef397aa12ccb013adaa85;hb=18fbc7e4fa254696eb024f56ee74704805925fad;hp=6a88097dde9db8b877648729ecbafb63d33588a0;hpb=9848e64819ce31787085a3d44df628bdf1091792;p=musl

diff --git a/src/unistd/faccessat.c b/src/unistd/faccessat.c
index 6a88097d..76bbd4c7 100644
--- a/src/unistd/faccessat.c
+++ b/src/unistd/faccessat.c
@@ -1,5 +1,6 @@
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/wait.h>
 #include "syscall.h"
 #include "pthread_impl.h"
 
@@ -14,12 +15,12 @@ static int checker(void *p)
 {
 	struct ctx *c = p;
 	int ret;
-	if (__syscall(SYS_setgid, __syscall(SYS_getegid))
-	    || __syscall(SYS_setuid, __syscall(SYS_geteuid)))
+	if (__syscall(SYS_setregid, __syscall(SYS_getegid), -1)
+	    || __syscall(SYS_setreuid, __syscall(SYS_geteuid), -1))
 		__syscall(SYS_exit, 1);
 	ret = __syscall(SYS_faccessat, c->fd, c->filename, c->amode, 0);
 	__syscall(SYS_write, c->p, &ret, sizeof ret);
-	__syscall(SYS_exit, 0);
+	return 0;
 }
 
 int faccessat(int fd, const char *filename, int amode, int flag)
@@ -32,19 +33,22 @@ int faccessat(int fd, const char *filename, int amode, int flag)
 
 	char stack[1024];
 	sigset_t set;
+	pid_t pid;
+	int status;
 	int ret, p[2];
 
-	if (pipe(p)) return __syscall_ret(-EBUSY);
+	if (pipe2(p, O_CLOEXEC)) return __syscall_ret(-EBUSY);
 	struct ctx c = { .fd = fd, .filename = filename, .amode = amode, .p = p[1] };
 
 	__block_all_sigs(&set);
 	
-	ret = __clone(checker, stack+sizeof stack, 0, &c);
+	pid = __clone(checker, stack+sizeof stack, 0, &c);
 	__syscall(SYS_close, p[1]);
 
-	if (ret<0 || __syscall(SYS_read, p[0], &ret, sizeof ret) != sizeof(ret))
+	if (pid<0 || __syscall(SYS_read, p[0], &ret, sizeof ret) != sizeof(ret))
 		ret = -EBUSY;
 	__syscall(SYS_close, p[0]);
+	__syscall(SYS_wait4, pid, &status, __WCLONE, 0);
 
 	__restore_sigs(&set);