netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / ipc_shmctl.c

diff --git a/ipc_shmctl.c b/ipc_shmctl.c
index 6bb468f022801a9158b0bac9b20587aa85189099..18b92b3a6d6e9660349bc096b87b0331a133347b 100644 (file)
--- a/ipc_shmctl.c
+++ b/ipc_shmctl.c
@@ -5,6 +5,7 @@
  * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
  * Copyright (c) 2003-2006 Roland McGrath <roland@redhat.com>
  * Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,17 +32,78 @@
  */
 
 #include "defs.h"
+
+#include DEF_MPERS_TYPE(shmid_ds_t)
+
 #include "ipc_defs.h"
 
-#include <sys/shm.h>
+#ifdef HAVE_SYS_SHM_H
+/* The C library generally exports the struct the current kernel expects. */
+# include <sys/shm.h>
+typedef struct shmid_ds shmid_ds_t;
+#elif defined HAVE_LINUX_SHM_H
+/* The linux header might provide the right struct. */
+# include <linux/shm.h>
+typedef struct shmid64_ds shmid_ds_t;
+#endif
+
+#include MPERS_DEFS
 
 #include "xlat/shmctl_flags.h"
 
+static void
+print_shmid_ds(struct tcb *const tcp, const kernel_ulong_t addr, int cmd)
+{
+       /* TODO: We don't properly decode old compat ipc calls. */
+       if (cmd & IPC_64)
+               cmd &= ~IPC_64;
+       shmid_ds_t shmid_ds;
+       switch (cmd) {
+       case IPC_SET:
+       case IPC_STAT:
+               if (umove_or_printaddr(tcp, addr, &shmid_ds))
+                       return;
+
+               tprints("{shm_perm={");
+               printuid("uid=", shmid_ds.shm_perm.uid);
+               printuid(", gid=", shmid_ds.shm_perm.gid);
+               tprints(", mode=");
+               print_numeric_umode_t(shmid_ds.shm_perm.mode);
+
+               if (cmd != IPC_STAT) {
+                       tprints("}, ...}");
+                       break;
+               }
+
+               tprintf(", key=%u", (unsigned) shmid_ds.shm_perm.__key);
+               printuid(", cuid=", shmid_ds.shm_perm.cuid);
+               printuid(", cgid=", shmid_ds.shm_perm.cgid);
+               tprints("}");
+               tprintf(", shm_segsz=%u", (unsigned) shmid_ds.shm_segsz);
+               tprintf(", shm_cpid=%u", (unsigned) shmid_ds.shm_cpid);
+               tprintf(", shm_lpid=%u", (unsigned) shmid_ds.shm_lpid);
+               tprintf(", shm_nattch=%u", (unsigned) shmid_ds.shm_nattch);
+               tprintf(", shm_atime=%u", (unsigned) shmid_ds.shm_atime);
+               tprintf(", shm_dtime=%u", (unsigned) shmid_ds.shm_dtime);
+               tprintf(", shm_ctime=%u", (unsigned) shmid_ds.shm_ctime);
+               tprints("}");
+               break;
+
+       default:
+               printaddr(addr);
+               break;
+       }
+}
+
 SYS_FUNC(shmctl)
 {
-       tprintf("%lu, ", tcp->u_arg[0]);
-       PRINTCTL(shmctl_flags, tcp->u_arg[1], "SHM_???");
-       tprints(", ");
-       printaddr(tcp->u_arg[indirect_ipccall(tcp) ? 3 : 2]);
-       return RVAL_DECODED;
+       if (entering(tcp)) {
+               tprintf("%d, ", (int) tcp->u_arg[0]);
+               PRINTCTL(shmctl_flags, tcp->u_arg[1], "SHM_???");
+               tprints(", ");
+       } else {
+               const kernel_ulong_t addr = tcp->u_arg[indirect_ipccall(tcp) ? 3 : 2];
+               print_shmid_ds(tcp, addr, tcp->u_arg[1]);
+       }
+       return 0;
 }