fix double-processing of DT_RELR relocations in ldso relocating itself

[musl] / src / ipc / msgctl.c

diff --git a/src/ipc/msgctl.c b/src/ipc/msgctl.c
index 868197f..9c11440 100644 (file)
--- a/src/ipc/msgctl.c
+++ b/src/ipc/msgctl.c
@@ -9,6 +9,14 @@
 
 int msgctl(int q, int cmd, struct msqid_ds *buf)
 {
+#if IPC_TIME64
+       struct msqid_ds out, *orig;
+       if (cmd&IPC_TIME64) {
+               out = (struct msqid_ds){0};
+               orig = buf;
+               buf = &out;
+       }
+#endif
 #ifdef SYSCALL_IPC_BROKEN_MODE
        struct msqid_ds tmp;
        if (cmd == IPC_SET) {
@@ -18,17 +26,26 @@ int msgctl(int q, int cmd, struct msqid_ds *buf)
        }
 #endif
 #ifndef SYS_ipc
-       int r = __syscall(SYS_msgctl, q, cmd | IPC_64, buf);
+       int r = __syscall(SYS_msgctl, q, IPC_CMD(cmd), buf);
 #else
-       int r = __syscall(SYS_ipc, IPCOP_msgctl, q, cmd | IPC_64, 0, buf, 0);
+       int r = __syscall(SYS_ipc, IPCOP_msgctl, q, IPC_CMD(cmd), 0, buf, 0);
 #endif
 #ifdef SYSCALL_IPC_BROKEN_MODE
-       if (r >= 0) switch (cmd) {
+       if (r >= 0) switch (cmd | IPC_TIME64) {
        case IPC_STAT:
        case MSG_STAT:
        case MSG_STAT_ANY:
                buf->msg_perm.mode >>= 16;
        }
+#endif
+#if IPC_TIME64
+       if (r >= 0 && (cmd&IPC_TIME64)) {
+               buf = orig;
+               *buf = out;
+               IPC_HILO(buf, msg_stime);
+               IPC_HILO(buf, msg_rtime);
+               IPC_HILO(buf, msg_ctime);
+       }
 #endif
        return __syscall_ret(r);
 }