X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmman%2Fshm_open.c;h=d042a5a882bd347dd937bceb8f851bb98cb418b8;hb=3b26a32df42092af6d0cdac655e52635b91d36b2;hp=d368622d6f297be1f2a6ff4d2f778cf0d0323f82;hpb=ebd7af6940bebb3b083a4d9239da27a66d1c32ec;p=musl

diff --git a/src/mman/shm_open.c b/src/mman/shm_open.c
index d368622d..d042a5a8 100644
--- a/src/mman/shm_open.c
+++ b/src/mman/shm_open.c
@@ -3,19 +3,43 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
+#include <limits.h>
+#include <pthread.h>
 
-int shm_open(const char *name, int flag, mode_t mode)
-{
-	int fd, dir;
+char *__strchrnul(const char *, int);
 
+char *__shm_mapname(const char *name, char *buf)
+{
+	char *p;
 	while (*name == '/') name++;
-	if (strchr(name, '/')) {
+	if (*(p = __strchrnul(name, '/')) || p==name ||
+	    (p-name <= 2 && name[0]=='.' && p[-1]=='.')) {
 		errno = EINVAL;
-		return -1;
+		return 0;
 	}
+	if (p-name > NAME_MAX) {
+		errno = ENAMETOOLONG;
+		return 0;
+	}
+	memcpy(buf, "/dev/shm/", 9);
+	memcpy(buf+9, name, p-name+1);
+	return buf;
+}
 
-	if ((dir = open("/dev/shm", O_DIRECTORY|O_RDONLY)) < 0) return -1;
-	fd = openat(dir, name, flag|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK, mode);
-	close(dir);
+int shm_open(const char *name, int flag, mode_t mode)
+{
+	int cs;
+	char buf[NAME_MAX+10];
+	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 = __shm_mapname(name, buf))) return -1;
+	return unlink(name);
+}