mem: decode hugetlb page size in mmap flags

[strace] / netlink_sock_diag.c

diff --git a/netlink_sock_diag.c b/netlink_sock_diag.c
index 4687b119a84553d61503a625bdc8b70127274129..dd1e03d3602a0592458782a2c179c4b81ea23736 100644 (file)
--- a/netlink_sock_diag.c
+++ b/netlink_sock_diag.c
@@ -28,105 +28,35 @@
  */
 
 #include "defs.h"
-
-#include <sys/socket.h>
-#include <linux/netlink.h>
-#include <linux/unix_diag.h>
-
-#include "xlat/tcp_states.h"
-#include "xlat/tcp_state_flags.h"
-
-#include "xlat/unix_diag_show.h"
+#include "netlink.h"
+#include "netlink_sock_diag.h"
 
 static void
 decode_family(struct tcb *const tcp, const uint8_t family,
-             const kernel_ulong_t addr, const kernel_ulong_t len)
+             const kernel_ulong_t addr, const unsigned int len)
 {
        tprints("{family=");
        printxval(addrfams, family, "AF_???");
        if (len > sizeof(family)) {
                tprints(", ");
-               printstrn(tcp, addr + sizeof(family),
-                         len - sizeof(family));
+               printstr_ex(tcp, addr + sizeof(family),
+                           len - sizeof(family), QUOTE_FORCE_HEX);
        }
        tprints("}");
 }
 
-static void
-decode_unix_diag_req(struct tcb *const tcp,
-                    const struct nlmsghdr *const nlmsghdr,
-                    const uint8_t family,
-                    const kernel_ulong_t addr,
-                    const kernel_ulong_t len)
-{
-       struct unix_diag_req req = { .sdiag_family = family };
-       const size_t offset = sizeof(req.sdiag_family);
-
-       tprints("{sdiag_family=");
-       printxval(addrfams, req.sdiag_family, "AF_???");
-
-       tprints(", ");
-       if (len >= sizeof(req)) {
-               if (!umoven_or_printaddr(tcp, addr + offset,
-                                        sizeof(req) - offset,
-                                        (void *) &req + offset)) {
-                       tprintf("sdiag_protocol=%" PRIu8 ", udiag_states=",
-                               req.sdiag_protocol);
-                       printflags(tcp_state_flags, req.udiag_states,
-                                  "1<<TCP_???");
-                       tprintf(", udiag_ino=%" PRIu32 ", udiag_show=",
-                               req.udiag_ino);
-                       printflags(unix_diag_show, req.udiag_show,
-                                  "UDIAG_SHOW_???");
-                       tprintf(", udiag_cookie=[%" PRIu32 ", %" PRIu32 "]",
-                               req.udiag_cookie[0], req.udiag_cookie[1]);
-               }
-       } else
-               tprints("...");
-       tprints("}");
-}
-
-static void
-decode_unix_diag_msg(struct tcb *const tcp,
-                    const struct nlmsghdr *const nlmsghdr,
-                    const uint8_t family,
-                    const kernel_ulong_t addr,
-                    const kernel_ulong_t len)
-{
-       struct unix_diag_msg msg = { .udiag_family = family };
-       const size_t offset = sizeof(msg.udiag_family);
-
-       tprints("{udiag_family=");
-       printxval(addrfams, msg.udiag_family, "AF_???");
-
-       tprints(", ");
-       if (len >= sizeof(msg)) {
-               if (!umoven_or_printaddr(tcp, addr + offset,
-                                        sizeof(msg) - offset,
-                                        (void *) &msg + offset)) {
-                       tprints("udiag_type=");
-                       printxval(socktypes, msg.udiag_type, "SOCK_???");
-                       tprintf(", udiag_state=");
-                       printxval(tcp_states, msg.udiag_state, "TCP_???");
-                       tprintf(", udiag_ino=%" PRIu32
-                               ", udiag_cookie=[%" PRIu32 ", %" PRIu32 "]",
-                               msg.udiag_ino,
-                               msg.udiag_cookie[0], msg.udiag_cookie[1]);
-               }
-       } else
-               tprints("...");
-       tprints("}");
-}
-
-typedef void (*netlink_diag_decoder_t)(struct tcb *,
-                                      const struct nlmsghdr *,
-                                      uint8_t family,
-                                      kernel_ulong_t addr,
-                                      kernel_ulong_t len);
+typedef DECL_NETLINK_DIAG_DECODER((*netlink_diag_decoder_t));
 
 static const struct {
        const netlink_diag_decoder_t request, response;
 } diag_decoders[] = {
+       [AF_INET] = { decode_inet_diag_req, decode_inet_diag_msg },
+       [AF_INET6] = { decode_inet_diag_req, decode_inet_diag_msg },
+       [AF_NETLINK] = { decode_netlink_diag_req, decode_netlink_diag_msg },
+       [AF_PACKET] = { decode_packet_diag_req, decode_packet_diag_msg },
+#ifdef AF_SMC
+       [AF_SMC] = { decode_smc_diag_req, decode_smc_diag_msg },
+#endif
        [AF_UNIX] = { decode_unix_diag_req, decode_unix_diag_msg }
 };
 
@@ -134,10 +64,13 @@ bool
 decode_netlink_sock_diag(struct tcb *const tcp,
                         const struct nlmsghdr *const nlmsghdr,
                         const kernel_ulong_t addr,
-                        const kernel_ulong_t len)
+                        const unsigned int len)
 {
        uint8_t family;
 
+       if (nlmsghdr->nlmsg_type == NLMSG_DONE)
+               return false;
+
        if (!umove_or_printaddr(tcp, addr, &family)) {
                if (family < ARRAY_SIZE(diag_decoders)
                    && len > sizeof(family)) {