fix dup3 ignoring all flags but O_CLOEXEC on archs with SYS_dup2 syscall

[musl] / src / mman / shm_open.c

diff --git a/src/mman/shm_open.c b/src/mman/shm_open.c
index a9be899..79784bd 100644 (file)
--- a/src/mman/shm_open.c
+++ b/src/mman/shm_open.c
@@ -4,10 +4,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <limits.h>
+#include <pthread.h>
 
-char *__strchrnul(const char *, int);
-
-static const char *mapname(const char *name, char *buf)
+char *__shm_mapname(const char *name, char *buf)
 {
        char *p;
        while (*name == '/') name++;
@@ -27,14 +26,18 @@ static const char *mapname(const char *name, char *buf)
 
 int shm_open(const char *name, int flag, mode_t mode)
 {
+       int cs;
        char buf[NAME_MAX+10];
-       if (!(name = mapname(name, buf))) return -1;
-       return open(name, flag|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK, mode);
+       if (!(name = __shm_mapname(name, buf))) return -1;
+       pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+       int fd = open(name, flag|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK, mode);
+       pthread_setcancelstate(cs, 0);
+       return fd;
 }
 
 int shm_unlink(const char *name)
 {
        char buf[NAME_MAX+10];
-       if (!(name = mapname(name, buf))) return -1;
+       if (!(name = __shm_mapname(name, buf))) return -1;
        return unlink(name);
 }