mq_notify: block all (application) signals in the worker thread

[musl] / src / ipc / shmctl.c

diff --git a/src/ipc/shmctl.c b/src/ipc/shmctl.c
index 3645fe2..1c9f78c 100644 (file)
--- a/src/ipc/shmctl.c
+++ b/src/ipc/shmctl.c
@@ -1,12 +1,51 @@
 #include <sys/shm.h>
+#include <endian.h>
 #include "syscall.h"
 #include "ipc.h"
 
+#if __BYTE_ORDER != __BIG_ENDIAN
+#undef SYSCALL_IPC_BROKEN_MODE
+#endif
+
 int shmctl(int id, int cmd, struct shmid_ds *buf)
 {
-#ifdef __NR_shmctl
-       return syscall(SYS_shmctl, id, cmd, buf);
+#if IPC_TIME64
+       struct shmid_ds out, *orig;
+       if (cmd&IPC_TIME64) {
+               out = (struct shmid_ds){0};
+               orig = buf;
+               buf = &out;
+       }
+#endif
+#ifdef SYSCALL_IPC_BROKEN_MODE
+       struct shmid_ds tmp;
+       if (cmd == IPC_SET) {
+               tmp = *buf;
+               tmp.shm_perm.mode *= 0x10000U;
+               buf = &tmp;
+       }
+#endif
+#ifndef SYS_ipc
+       int r = __syscall(SYS_shmctl, id, IPC_CMD(cmd), buf);
 #else
-       return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_MODERN, buf);
+       int r = __syscall(SYS_ipc, IPCOP_shmctl, id, IPC_CMD(cmd), 0, buf, 0);
+#endif
+#ifdef SYSCALL_IPC_BROKEN_MODE
+       if (r >= 0) switch (cmd | IPC_TIME64) {
+       case IPC_STAT:
+       case SHM_STAT:
+       case SHM_STAT_ANY:
+               buf->shm_perm.mode >>= 16;
+       }
+#endif
+#if IPC_TIME64
+       if (r >= 0 && (cmd&IPC_TIME64)) {
+               buf = orig;
+               *buf = out;
+               IPC_HILO(buf, shm_atime);
+               IPC_HILO(buf, shm_dtime);
+               IPC_HILO(buf, shm_ctime);
+       }
 #endif
+       return __syscall_ret(r);
 }