From ce8a99578254242a89adbde1cbbf0f34daeec79b Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 20 Jul 2013 13:19:14 -0400 Subject: [PATCH] fix shm_open wrongly being cancellable --- src/mman/shm_open.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mman/shm_open.c b/src/mman/shm_open.c index b23eac7f..d042a5a8 100644 --- a/src/mman/shm_open.c +++ b/src/mman/shm_open.c @@ -4,6 +4,7 @@ #include #include #include +#include char *__strchrnul(const char *, int); @@ -27,9 +28,13 @@ char *__shm_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 = __shm_mapname(name, buf))) return -1; - return open(name, flag|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK, mode); + 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) -- 2.25.1