X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fsem_open.c;h=fda0acd35c717992e44b4c5191e6f400d1190532;hb=f9cccfc16e58b39ee381fbdfb8688db3bb8e3555;hp=8a72d4c62a317314e077716c7569306a349a90c8;hpb=52d4444f8eec1a4e7e0861859c705c3a558b4e2a;p=musl

diff --git a/src/thread/sem_open.c b/src/thread/sem_open.c
index 8a72d4c6..fda0acd3 100644
--- a/src/thread/sem_open.c
+++ b/src/thread/sem_open.c
@@ -20,7 +20,7 @@ static struct {
 	sem_t *sem;
 	int refcnt;
 } *semtab;
-static int lock[2];
+static volatile int lock[2];
 
 #define FLAGS (O_RDWR|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK)
 
@@ -67,15 +67,15 @@ sem_t *sem_open(const char *name, int flags, ...)
 
 	flags &= (O_CREAT|O_EXCL);
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+
 	/* Early failure check for exclusive open; otherwise the case
 	 * where the semaphore already exists is expensive. */
 	if (flags == (O_CREAT|O_EXCL) && access(name, F_OK) == 0) {
 		errno = EEXIST;
-		return SEM_FAILED;
+		goto fail;
 	}
 
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
-
 	for (;;) {
 		/* If exclusive mode is not requested, try opening an
 		 * existing file first and fall back to creation. */
@@ -123,9 +123,10 @@ sem_t *sem_open(const char *name, int flags, ...)
 			goto fail;
 		}
 		close(fd);
-		if (link(tmp, name) == 0) break;
-		e = errno;
+		e = link(tmp, name) ? errno : 0;
 		unlink(tmp);
+		if (!e) break;
+		munmap(map, sizeof(sem_t));
 		/* Failure is only fatal when doing an exclusive open;
 		 * otherwise, next iteration will try to open the
 		 * existing file. */
@@ -153,6 +154,9 @@ sem_t *sem_open(const char *name, int flags, ...)
 
 fail:
 	pthread_setcancelstate(cs, 0);
+	LOCK(lock);
+	semtab[slot].sem = 0;
+	UNLOCK(lock);
 	return SEM_FAILED;
 }