]> granicus.if.org Git - strace/blobdiff - net.c
Remove linux/ptp_clock.h
[strace] / net.c
diff --git a/net.c b/net.c
index 113632cb2a33b38d09c74a8f2059f45fc3cce2e6..498a6384a041b51464caab80209d265d2b7338b7 100644 (file)
--- a/net.c
+++ b/net.c
@@ -3,6 +3,7 @@
  * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
  * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
  * Copyright (c) 1996-2000 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 1999-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,6 +30,8 @@
  */
 
 #include "defs.h"
+#include "print_fields.h"
+
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ -55,7 +58,7 @@
 #if defined(HAVE_LINUX_IP_VS_H)
 # include <linux/ip_vs.h>
 #endif
-#include <linux/netlink.h>
+#include "netlink.h"
 #if defined(HAVE_LINUX_NETFILTER_ARP_ARP_TABLES_H)
 # include <linux/netfilter_arp/arp_tables.h>
 #endif
 
 #include "xlat/inet_protocols.h"
 
-#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-#endif
-#include "xlat/netlink_protocols.h"
-
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 # include <bluetooth/bluetooth.h>
 # include "xlat/bt_protocols.h"
 #endif
 
-#include "xlat/msg_flags.h"
-
-void
-print_ifindex(unsigned int ifindex)
-{
-#ifdef HAVE_IF_INDEXTONAME
-       char buf[IFNAMSIZ + 1];
-
-       if (if_indextoname(ifindex, buf)) {
-               tprints("if_nametoindex(");
-               print_quoted_string(buf, sizeof(buf), QUOTE_0_TERMINATED);
-               tprints(")");
-               return;
-       }
-#endif
-       tprintf("%u", ifindex);
-}
-
-#include "xlat/scmvals.h"
-#include "xlat/ip_cmsg_types.h"
-
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-struct cmsghdr32 {
-       uint32_t cmsg_len;
-       int cmsg_level;
-       int cmsg_type;
-};
-#endif
-
-typedef union {
-       char *ptr;
-       struct cmsghdr *cmsg;
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       struct cmsghdr32 *cmsg32;
-#endif
-} union_cmsghdr;
-
-static void
-print_scm_rights(struct tcb *tcp, const void *cmsg_data,
-                const size_t data_len)
-{
-       const int *fds = cmsg_data;
-       const char *end = (const char *) cmsg_data + data_len;
-       bool seen = false;
-
-       if (sizeof(*fds) > data_len)
-               return;
-
-       tprints(", [");
-       while ((const char *) fds < end) {
-               if (seen)
-                       tprints(", ");
-               else
-                       seen = true;
-               printfd(tcp, *fds++);
-       }
-       tprints("]");
-}
-
-static void
-print_scm_creds(struct tcb *tcp, const void *cmsg_data,
-               const size_t data_len)
-{
-       const struct ucred *uc = cmsg_data;
-
-       if (sizeof(*uc) > data_len)
-               return;
-
-       tprintf(", {pid=%u, uid=%u, gid=%u}",
-               (unsigned) uc->pid, (unsigned) uc->uid, (unsigned) uc->gid);
-}
-
-static void
-print_scm_security(struct tcb *tcp, const void *cmsg_data,
-                  const size_t data_len)
-{
-       if (!data_len)
-               return;
-
-       tprints(", ");
-       print_quoted_string(cmsg_data, data_len, 0);
-}
-
-static void
-print_cmsg_ip_pktinfo(struct tcb *tcp, const void *cmsg_data,
-                     const size_t data_len)
-{
-       const struct in_pktinfo *info = cmsg_data;
-
-       if (sizeof(*info) > data_len)
-               return;
-
-       tprints(", {ipi_ifindex=");
-       print_ifindex(info->ipi_ifindex);
-       tprintf(", ipi_spec_dst=inet_addr(\"%s\"), ipi_addr=inet_addr(\"%s\")}",
-               inet_ntoa(info->ipi_spec_dst), inet_ntoa(info->ipi_addr));
-}
-
-static void
-print_cmsg_ip_ttl(struct tcb *tcp, const void *cmsg_data,
-                 const size_t data_len)
-{
-       const unsigned int *ttl = cmsg_data;
-
-       if (sizeof(*ttl) > data_len)
-               return;
-
-       tprintf(", {ttl=%u}", *ttl);
-}
-
-static void
-print_cmsg_ip_tos(struct tcb *tcp, const void *cmsg_data,
-                 const size_t data_len)
-{
-       const uint8_t *tos = cmsg_data;
-
-       if (sizeof(*tos) > data_len)
-               return;
-
-       tprintf(", {tos=%x}", *tos);
-}
-
-static void
-print_cmsg_ip_checksum(struct tcb *tcp, const void *cmsg_data,
-                      const size_t data_len)
-{
-       const uint32_t *csum = cmsg_data;
-
-       if (sizeof(*csum) > data_len)
-               return;
-
-       tprintf(", {csum=%u}", *csum);
-}
-
-static void
-print_cmsg_ip_opts(struct tcb *tcp, const void *cmsg_data,
-                  const size_t data_len)
-{
-       const unsigned char *opts = cmsg_data;
-       size_t i;
-
-       if (!data_len)
-               return;
-
-       tprints(", {opts=0x");
-       for (i = 0; i < data_len; ++i)
-               tprintf("%02x", opts[i]);
-       tprints("}");
-}
-
 static void
-print_cmsg_ip_recverr(struct tcb *tcp, const void *cmsg_data,
-                     const size_t data_len)
+decode_sockbuf(struct tcb *const tcp, const int fd, const kernel_ulong_t addr,
+              const kernel_ulong_t addrlen)
 {
-       const struct {
-               uint32_t ee_errno;
-               uint8_t  ee_origin;
-               uint8_t  ee_type;
-               uint8_t  ee_code;
-               uint8_t  ee_pad;
-               uint32_t ee_info;
-               uint32_t ee_data;
-               struct sockaddr_in offender;
-       } *err = cmsg_data;
-
-       if (sizeof(*err) > data_len)
-               return;
-
-       tprintf(", {ee_errno=%u, ee_origin=%u, ee_type=%u, ee_code=%u"
-               ", ee_info=%u, ee_data=%u, offender=",
-               err->ee_errno, err->ee_origin, err->ee_type,
-               err->ee_code, err->ee_info, err->ee_data);
-       print_sockaddr(tcp, &err->offender, sizeof(err->offender));
-       tprints("}");
-}
-
-static void
-print_cmsg_ip_origdstaddr(struct tcb *tcp, const void *cmsg_data,
-                         const size_t data_len)
-{
-       if (sizeof(struct sockaddr_in) > data_len)
-               return;
-
-       tprints(", ");
-       print_sockaddr(tcp, cmsg_data, data_len);
-}
 
-static void
-print_cmsg_type_data(struct tcb *tcp, const int cmsg_level, const int cmsg_type,
-                    const void *cmsg_data, const size_t data_len)
-{
-       switch (cmsg_level) {
-       case SOL_SOCKET:
-               printxval(scmvals, cmsg_type, "SCM_???");
-               switch (cmsg_type) {
-               case SCM_RIGHTS:
-                       print_scm_rights(tcp, cmsg_data, data_len);
-                       break;
-               case SCM_CREDENTIALS:
-                       print_scm_creds(tcp, cmsg_data, data_len);
-                       break;
-               case SCM_SECURITY:
-                       print_scm_security(tcp, cmsg_data, data_len);
-                       break;
-               }
-               break;
-       case SOL_IP:
-               printxval(ip_cmsg_types, cmsg_type, "IP_???");
-               switch (cmsg_type) {
-               case IP_PKTINFO:
-                       print_cmsg_ip_pktinfo(tcp, cmsg_data, data_len);
-                       break;
-               case IP_TTL:
-                       print_cmsg_ip_ttl(tcp, cmsg_data, data_len);
-                       break;
-               case IP_TOS:
-                       print_cmsg_ip_tos(tcp, cmsg_data, data_len);
-                       break;
-               case IP_RECVOPTS:
-               case IP_RETOPTS:
-                       print_cmsg_ip_opts(tcp, cmsg_data, data_len);
-                       break;
-               case IP_RECVERR:
-                       print_cmsg_ip_recverr(tcp, cmsg_data, data_len);
-                       break;
-               case IP_ORIGDSTADDR:
-                       print_cmsg_ip_origdstaddr(tcp, cmsg_data, data_len);
-                       break;
-               case IP_CHECKSUM:
-                       print_cmsg_ip_checksum(tcp, cmsg_data, data_len);
-                       break;
-               case SCM_SECURITY:
-                       print_scm_security(tcp, cmsg_data, data_len);
-                       break;
-               }
+       switch (verbose(tcp) ? getfdproto(tcp, fd) : SOCK_PROTO_UNKNOWN) {
+       case SOCK_PROTO_NETLINK:
+               decode_netlink(tcp, fd, addr, addrlen);
                break;
        default:
-               tprintf("%u", cmsg_type);
-       }
-}
-
-static void
-printcmsghdr(struct tcb *tcp, unsigned long addr, size_t len)
-{
-       const size_t cmsg_size =
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-               (current_wordsize < sizeof(long)) ? sizeof(struct cmsghdr32) :
-#endif
-                       sizeof(struct cmsghdr);
-
-       char *buf = len < cmsg_size ? NULL : malloc(len);
-       if (!buf || umoven(tcp, addr, len, buf) < 0) {
-               tprints(", msg_control=");
-               printaddr(addr);
-               free(buf);
-               return;
-       }
-
-       union_cmsghdr u = { .ptr = buf };
-
-       tprints(", [");
-       while (len >= cmsg_size) {
-               size_t cmsg_len =
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-                       (current_wordsize < sizeof(long)) ? u.cmsg32->cmsg_len :
-#endif
-                               u.cmsg->cmsg_len;
-               int cmsg_level =
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-                       (current_wordsize < sizeof(long)) ? u.cmsg32->cmsg_level :
-#endif
-                               u.cmsg->cmsg_level;
-               int cmsg_type =
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-                       (current_wordsize < sizeof(long)) ? u.cmsg32->cmsg_type :
-#endif
-                               u.cmsg->cmsg_type;
-
-               if (u.ptr != buf)
-                       tprints(", ");
-               tprintf("{cmsg_len=%lu, cmsg_level=", (unsigned long) cmsg_len);
-               printxval(socketlayers, cmsg_level, "SOL_???");
-               tprints(", cmsg_type=");
-
-               if (cmsg_len > len)
-                       cmsg_len = len;
-
-               print_cmsg_type_data(tcp, cmsg_level, cmsg_type,
-                                    (const void *) (u.ptr + cmsg_size),
-                                    cmsg_len > cmsg_size ? cmsg_len - cmsg_size: 0);
-               tprints("}");
-
-               if (cmsg_len < cmsg_size) {
-                       len -= cmsg_size;
-                       break;
-               }
-               cmsg_len = (cmsg_len + current_wordsize - 1) &
-                       (size_t) ~(current_wordsize - 1);
-               if (cmsg_len >= len) {
-                       len = 0;
-                       break;
-               }
-               u.ptr += cmsg_len;
-               len -= cmsg_len;
-       }
-       if (len)
-               tprints(", ...");
-       tprints("]");
-       free(buf);
-}
-
-static void
-do_msghdr(struct tcb *tcp, struct msghdr *msg, unsigned long data_size)
-{
-       tprintf("{msg_name(%d)=", msg->msg_namelen);
-       decode_sockaddr(tcp, (long)msg->msg_name, msg->msg_namelen);
-
-       tprintf(", msg_iov(%lu)=", (unsigned long)msg->msg_iovlen);
-
-       tprint_iov_upto(tcp, (unsigned long)msg->msg_iovlen,
-                       (unsigned long)msg->msg_iov, IOV_DECODE_STR, data_size);
-
-       tprintf(", msg_controllen=%lu", (unsigned long)msg->msg_controllen);
-       if (msg->msg_controllen)
-               printcmsghdr(tcp, (unsigned long) msg->msg_control,
-                            msg->msg_controllen);
-       tprints(", msg_flags=");
-       printflags(msg_flags, msg->msg_flags, "MSG_???");
-       tprints("}");
-}
-
-struct msghdr32 {
-       uint32_t /* void* */    msg_name;
-       uint32_t /* socklen_t */msg_namelen;
-       uint32_t /* iovec* */   msg_iov;
-       uint32_t /* size_t */   msg_iovlen;
-       uint32_t /* void* */    msg_control;
-       uint32_t /* size_t */   msg_controllen;
-       uint32_t /* int */      msg_flags;
-};
-struct mmsghdr32 {
-       struct msghdr32         msg_hdr;
-       uint32_t /* unsigned */ msg_len;
-};
-
-#ifndef HAVE_STRUCT_MMSGHDR
-struct mmsghdr {
-       struct msghdr msg_hdr;
-       unsigned msg_len;
-};
-#endif
-
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-static void
-copy_from_msghdr32(struct msghdr *to_msg, struct msghdr32 *from_msg32)
-{
-       to_msg->msg_name       = (void*)(long)from_msg32->msg_name;
-       to_msg->msg_namelen    =              from_msg32->msg_namelen;
-       to_msg->msg_iov        = (void*)(long)from_msg32->msg_iov;
-       to_msg->msg_iovlen     =              from_msg32->msg_iovlen;
-       to_msg->msg_control    = (void*)(long)from_msg32->msg_control;
-       to_msg->msg_controllen =              from_msg32->msg_controllen;
-       to_msg->msg_flags      =              from_msg32->msg_flags;
-}
-#endif
-
-static bool
-extractmsghdr(struct tcb *tcp, long addr, struct msghdr *msg)
-{
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       if (current_wordsize == 4) {
-               struct msghdr32 msg32;
-
-               if (umove(tcp, addr, &msg32) < 0)
-                       return false;
-               copy_from_msghdr32(msg, &msg32);
-       } else
-#endif
-       if (umove(tcp, addr, msg) < 0)
-               return false;
-       return true;
-}
-
-static bool
-extractmmsghdr(struct tcb *tcp, long addr, unsigned int idx, struct mmsghdr *mmsg)
-{
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       if (current_wordsize == 4) {
-               struct mmsghdr32 mmsg32;
-
-               addr += sizeof(struct mmsghdr32) * idx;
-               if (umove(tcp, addr, &mmsg32) < 0)
-                       return false;
-
-               copy_from_msghdr32(&mmsg->msg_hdr, &mmsg32.msg_hdr);
-               mmsg->msg_len = mmsg32.msg_len;
-       } else
-#endif
-       {
-               addr += sizeof(*mmsg) * idx;
-               if (umove(tcp, addr, mmsg) < 0)
-                       return false;
-       }
-       return true;
-}
-
-static void
-printmsghdr(struct tcb *tcp, long addr, unsigned long data_size)
-{
-       struct msghdr msg;
-
-       if (verbose(tcp) && extractmsghdr(tcp, addr, &msg))
-               do_msghdr(tcp, &msg, data_size);
-       else
-               printaddr(addr);
-}
-
-void
-dumpiov_in_msghdr(struct tcb *tcp, long addr, unsigned long data_size)
-{
-       struct msghdr msg;
-
-       if (extractmsghdr(tcp, addr, &msg))
-               dumpiov_upto(tcp, msg.msg_iovlen, (long)msg.msg_iov, data_size);
-}
-
-static void
-printmmsghdr(struct tcb *tcp, long addr, unsigned int idx, unsigned long msg_len)
-{
-       struct mmsghdr mmsg;
-
-       if (extractmmsghdr(tcp, addr, idx, &mmsg)) {
-               tprints("{");
-               do_msghdr(tcp, &mmsg.msg_hdr, msg_len ? msg_len : mmsg.msg_len);
-               tprintf(", %u}", mmsg.msg_len);
-       }
-       else
-               printaddr(addr);
-}
-
-static void
-decode_mmsg(struct tcb *tcp, unsigned long msg_len)
-{
-       /* mmsgvec */
-       if (syserror(tcp)) {
-               printaddr(tcp->u_arg[1]);
-       } else {
-               unsigned int len = tcp->u_rval;
-               unsigned int i;
-
-               tprints("{");
-               for (i = 0; i < len; ++i) {
-                       if (i)
-                               tprints(", ");
-                       printmmsghdr(tcp, tcp->u_arg[1], i, msg_len);
-               }
-               tprints("}");
-       }
-       /* vlen */
-       tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
-       /* flags */
-       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-}
-
-void
-dumpiov_in_mmsghdr(struct tcb *tcp, long addr)
-{
-       unsigned int len = tcp->u_rval;
-       unsigned int i;
-       struct mmsghdr mmsg;
-
-       for (i = 0; i < len; ++i) {
-               if (extractmmsghdr(tcp, addr, i, &mmsg)) {
-                       tprintf(" = %lu buffers in vector %u\n",
-                               (unsigned long)mmsg.msg_hdr.msg_iovlen, i);
-                       dumpiov_upto(tcp, mmsg.msg_hdr.msg_iovlen,
-                               (long)mmsg.msg_hdr.msg_iov, mmsg.msg_len);
-               }
+               printstrn(tcp, addr, addrlen);
        }
 }
 
@@ -614,78 +145,79 @@ SYS_FUNC(socket)
 #endif
 
        default:
-               tprintf("%lu", tcp->u_arg[2]);
+               tprintf("%" PRI_klu, tcp->u_arg[2]);
                break;
        }
 
        return RVAL_DECODED | RVAL_FD;
 }
 
-SYS_FUNC(bind)
-{
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       decode_sockaddr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu", tcp->u_arg[2]);
-
-       return RVAL_DECODED;
-}
-
-SYS_FUNC(listen)
+static bool
+fetch_socklen(struct tcb *const tcp, int *const plen,
+             const kernel_ulong_t sockaddr, const kernel_ulong_t socklen)
 {
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       tprintf("%lu", tcp->u_arg[1]);
-
-       return RVAL_DECODED;
+       return verbose(tcp) && sockaddr && socklen
+              && umove(tcp, socklen, plen) == 0;
 }
 
 static int
-do_sockname(struct tcb *tcp, int flags_arg)
+decode_sockname(struct tcb *tcp)
 {
+       int ulen, rlen;
+
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
-               return 0;
+               if (fetch_socklen(tcp, &ulen, tcp->u_arg[1], tcp->u_arg[2])) {
+                       set_tcb_priv_ulong(tcp, ulen);
+                       return 0;
+               } else {
+                       printaddr(tcp->u_arg[1]);
+                       tprints(", ");
+                       printaddr(tcp->u_arg[2]);
+                       return RVAL_DECODED;
+               }
        }
 
-       int len;
-       if (!tcp->u_arg[2] || !verbose(tcp) || syserror(tcp) ||
-           umove(tcp, tcp->u_arg[2], &len) < 0) {
+       ulen = get_tcb_priv_ulong(tcp);
+
+       if (syserror(tcp) || umove(tcp, tcp->u_arg[2], &rlen) < 0) {
                printaddr(tcp->u_arg[1]);
-               tprints(", ");
-               printaddr(tcp->u_arg[2]);
+               tprintf(", [%d]", ulen);
        } else {
-               decode_sockaddr(tcp, tcp->u_arg[1], len);
-               tprintf(", [%d]", len);
+               decode_sockaddr(tcp, tcp->u_arg[1], ulen > rlen ? rlen : ulen);
+               if (ulen != rlen)
+                       tprintf(", [%d->%d]", ulen, rlen);
+               else
+                       tprintf(", [%d]", rlen);
        }
 
-       if (flags_arg >= 0) {
-               tprints(", ");
-               printflags(sock_type_flags, tcp->u_arg[flags_arg],
-                          "SOCK_???");
-       }
-       return 0;
+       return RVAL_DECODED;
 }
 
 SYS_FUNC(accept)
 {
-       do_sockname(tcp, -1);
-       return RVAL_FD;
+       return decode_sockname(tcp) | RVAL_FD;
 }
 
 SYS_FUNC(accept4)
 {
-       do_sockname(tcp, 3);
-       return RVAL_FD;
+       int rc = decode_sockname(tcp);
+
+       if (rc & RVAL_DECODED) {
+               tprints(", ");
+               printflags(sock_type_flags, tcp->u_arg[3], "SOCK_???");
+       }
+
+       return rc | RVAL_FD;
 }
 
 SYS_FUNC(send)
 {
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu, ", tcp->u_arg[2]);
+       decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
        /* flags */
        printflags(msg_flags, tcp->u_arg[3], "MSG_???");
 
@@ -696,61 +228,34 @@ SYS_FUNC(sendto)
 {
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu, ", tcp->u_arg[2]);
+       decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
        /* flags */
        printflags(msg_flags, tcp->u_arg[3], "MSG_???");
        /* to address */
+       const int addrlen = tcp->u_arg[5];
        tprints(", ");
-       decode_sockaddr(tcp, tcp->u_arg[4], tcp->u_arg[5]);
+       decode_sockaddr(tcp, tcp->u_arg[4], addrlen);
        /* to length */
-       tprintf(", %lu", tcp->u_arg[5]);
+       tprintf(", %d", addrlen);
 
        return RVAL_DECODED;
 }
 
-SYS_FUNC(sendmsg)
-{
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       printmsghdr(tcp, tcp->u_arg[1], (unsigned long) -1L);
-       /* flags */
-       tprints(", ");
-       printflags(msg_flags, tcp->u_arg[2], "MSG_???");
-
-       return RVAL_DECODED;
-}
-
-SYS_FUNC(sendmmsg)
-{
-       if (entering(tcp)) {
-               /* sockfd */
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               if (!verbose(tcp)) {
-                       printaddr(tcp->u_arg[1]);
-                       tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
-                       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-               }
-       } else {
-               if (verbose(tcp))
-                       decode_mmsg(tcp, (unsigned long) -1L);
-       }
-       return 0;
-}
-
 SYS_FUNC(recv)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               if (syserror(tcp))
+               if (syserror(tcp)) {
                        printaddr(tcp->u_arg[1]);
-               else
-                       printstr(tcp, tcp->u_arg[1], tcp->u_rval);
+               } else {
+                       decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1],
+                                    tcp->u_rval);
+               }
 
-               tprintf(", %lu, ", tcp->u_arg[2]);
+               tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
                printflags(msg_flags, tcp->u_arg[3], "MSG_???");
        }
        return 0;
@@ -758,114 +263,59 @@ SYS_FUNC(recv)
 
 SYS_FUNC(recvfrom)
 {
-       int fromlen;
+       int ulen, rlen;
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
+               if (fetch_socklen(tcp, &ulen, tcp->u_arg[4], tcp->u_arg[5])) {
+                       set_tcb_priv_ulong(tcp, ulen);
+               }
        } else {
                /* buf */
                if (syserror(tcp)) {
                        printaddr(tcp->u_arg[1]);
                } else {
-                       printstr(tcp, tcp->u_arg[1], tcp->u_rval);
+                       decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1],
+                                    tcp->u_rval);
                }
-               /* len */
-               tprintf(", %lu, ", tcp->u_arg[2]);
+               /* size */
+               tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
                /* flags */
                printflags(msg_flags, tcp->u_arg[3], "MSG_???");
                tprints(", ");
-               if (syserror(tcp) || !tcp->u_arg[4] || !tcp->u_arg[5] ||
-                   umove(tcp, tcp->u_arg[5], &fromlen) < 0) {
-                       /* from address, len */
+
+               ulen = get_tcb_priv_ulong(tcp);
+
+               if (!fetch_socklen(tcp, &rlen, tcp->u_arg[4], tcp->u_arg[5])) {
+                       /* from address */
                        printaddr(tcp->u_arg[4]);
                        tprints(", ");
+                       /* from length */
                        printaddr(tcp->u_arg[5]);
                        return 0;
                }
+               if (syserror(tcp)) {
+                       /* from address */
+                       printaddr(tcp->u_arg[4]);
+                       /* from length */
+                       tprintf(", [%d]", ulen);
+                       return 0;
+               }
                /* from address */
-               decode_sockaddr(tcp, tcp->u_arg[4], fromlen);
+               decode_sockaddr(tcp, tcp->u_arg[4], ulen > rlen ? rlen : ulen);
                /* from length */
-               tprintf(", [%u]", fromlen);
-       }
-       return 0;
-}
-
-SYS_FUNC(recvmsg)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               if (syserror(tcp))
-                       printaddr(tcp->u_arg[1]);
+               if (ulen != rlen)
+                       tprintf(", [%d->%d]", ulen, rlen);
                else
-                       printmsghdr(tcp, tcp->u_arg[1], tcp->u_rval);
-               /* flags */
-               tprints(", ");
-               printflags(msg_flags, tcp->u_arg[2], "MSG_???");
+                       tprintf(", [%d]", rlen);
        }
        return 0;
 }
 
-SYS_FUNC(recvmmsg)
-{
-       static char str[sizeof("left") + TIMESPEC_TEXT_BUFSIZE];
-
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               if (verbose(tcp)) {
-                       /* Abusing tcp->auxstr as temp storage.
-                        * Will be used and cleared on syscall exit.
-                        */
-                       tcp->auxstr = sprint_timespec(tcp, tcp->u_arg[4]);
-               } else {
-                       printaddr(tcp->u_arg[1]);
-                       tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
-                       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-                       tprints(", ");
-                       print_timespec(tcp, tcp->u_arg[4]);
-               }
-               return 0;
-       } else {
-               if (verbose(tcp)) {
-                       decode_mmsg(tcp, 0);
-                       tprints(", ");
-                       /* timeout on entrance */
-                       tprints(tcp->auxstr);
-                       tcp->auxstr = NULL;
-               }
-               if (syserror(tcp))
-                       return 0;
-               if (tcp->u_rval == 0) {
-                       tcp->auxstr = "Timeout";
-                       return RVAL_STR;
-               }
-               if (!verbose(tcp))
-                       return 0;
-               /* timeout on exit */
-               snprintf(str, sizeof(str), "left %s",
-                        sprint_timespec(tcp, tcp->u_arg[4]));
-               tcp->auxstr = str;
-               return RVAL_STR;
-       }
-}
-
-#include "xlat/shutdown_modes.h"
-
-SYS_FUNC(shutdown)
-{
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
-
-       return RVAL_DECODED;
-}
-
 SYS_FUNC(getsockname)
 {
-       return do_sockname(tcp, -1);
+       return decode_sockname(tcp);
 }
 
 static void
@@ -879,7 +329,7 @@ printpair_fd(struct tcb *tcp, const int i0, const int i1)
 }
 
 static void
-decode_pair_fd(struct tcb *tcp, const long addr)
+decode_pair_fd(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        int pair[2];
 
@@ -924,7 +374,7 @@ SYS_FUNC(socketpair)
                printxval(addrfams, tcp->u_arg[0], "AF_???");
                tprints(", ");
                tprint_sock_type(tcp->u_arg[1]);
-               tprintf(", %lu", tcp->u_arg[2]);
+               tprintf(", %" PRI_klu, tcp->u_arg[2]);
        } else {
                tprints(", ");
                decode_pair_fd(tcp, tcp->u_arg[3]);
@@ -940,8 +390,9 @@ SYS_FUNC(socketpair)
 #include "xlat/getsockipv6options.h"
 #include "xlat/setsockipv6options.h"
 #include "xlat/sockipxoptions.h"
-#include "xlat/sockrawoptions.h"
+#include "xlat/socknetlinkoptions.h"
 #include "xlat/sockpacketoptions.h"
+#include "xlat/sockrawoptions.h"
 #include "xlat/socksctpoptions.h"
 #include "xlat/socktcpoptions.h"
 
@@ -981,6 +432,9 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
        case SOL_RAW:
                printxval(sockrawoptions, name, "RAW_???");
                break;
+       case SOL_NETLINK:
+               printxval(socknetlinkoptions, name, "NETLINK_???");
+               break;
 
                /* Other SOL_* protocol levels still need work. */
 
@@ -992,42 +446,80 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
 }
 
 static void
-print_linger(struct tcb *tcp, long addr, int len)
+print_set_linger(struct tcb *const tcp, const kernel_ulong_t addr,
+                const int len)
+{
+       struct linger linger;
+
+       if (len < (int) sizeof(linger)) {
+               printaddr(addr);
+       } else if (!umove_or_printaddr(tcp, addr, &linger)) {
+               PRINT_FIELD_D("{", linger, l_onoff);
+               PRINT_FIELD_D(", ", linger, l_linger);
+               tprints("}");
+       }
+}
+
+static void
+print_get_linger(struct tcb *const tcp, const kernel_ulong_t addr,
+                unsigned int len)
 {
        struct linger linger;
 
-       if (len != sizeof(linger) ||
-           umove(tcp, addr, &linger) < 0) {
+       if (len < sizeof(linger)) {
+               if (len != sizeof(linger.l_onoff)) {
+                       printstr_ex(tcp, addr, len, QUOTE_FORCE_HEX);
+                       return;
+               }
+       } else {
+               len = sizeof(linger);
+       }
+
+       if (umoven(tcp, addr, len, &linger) < 0) {
                printaddr(addr);
                return;
        }
 
-       tprintf("{onoff=%d, linger=%d}",
-               linger.l_onoff,
-               linger.l_linger);
+       PRINT_FIELD_D("{", linger, l_onoff);
+       if (len == sizeof(linger))
+               PRINT_FIELD_D(", ", linger, l_linger);
+       tprints("}");
 }
 
 #ifdef SO_PEERCRED
 static void
-print_ucred(struct tcb *tcp, long addr, int len)
+print_ucred(struct tcb *const tcp, const kernel_ulong_t addr, unsigned int len)
 {
        struct ucred uc;
 
-       if (len != sizeof(uc) ||
-           umove(tcp, addr, &uc) < 0) {
-               printaddr(addr);
+       if (len < sizeof(uc)) {
+               if (len != sizeof(uc.pid)
+                   && len != offsetofend(struct ucred, uid)) {
+                       printstr_ex(tcp, addr, len, QUOTE_FORCE_HEX);
+                       return;
+               }
        } else {
-               tprintf("{pid=%u, uid=%u, gid=%u}",
-                       (unsigned) uc.pid,
-                       (unsigned) uc.uid,
-                       (unsigned) uc.gid);
+               len = sizeof(uc);
+       }
+
+       if (umoven(tcp, addr, len, &uc) < 0) {
+               printaddr(addr);
+               return;
        }
+
+       PRINT_FIELD_D("{", uc, pid);
+       if (len > sizeof(uc.pid))
+               PRINT_FIELD_UID(", ", uc, uid);
+       if (len == sizeof(uc))
+               PRINT_FIELD_UID(", ", uc, gid);
+       tprints("}");
 }
 #endif /* SO_PEERCRED */
 
 #ifdef PACKET_STATISTICS
 static void
-print_tpacket_stats(struct tcb *tcp, long addr, int len)
+print_tpacket_stats(struct tcb *const tcp, const kernel_ulong_t addr,
+                   const int len)
 {
        struct tpacket_stats stats;
 
@@ -1035,9 +527,9 @@ print_tpacket_stats(struct tcb *tcp, long addr, int len)
            umove(tcp, addr, &stats) < 0) {
                printaddr(addr);
        } else {
-               tprintf("{packets=%u, drops=%u}",
-                       stats.tp_packets,
-                       stats.tp_drops);
+               PRINT_FIELD_U("{", stats, tp_packets);
+               PRINT_FIELD_U("{", stats, tp_drops);
+               tprints("}");
        }
 }
 #endif /* PACKET_STATISTICS */
@@ -1045,7 +537,7 @@ print_tpacket_stats(struct tcb *tcp, long addr, int len)
 #include "xlat/icmpfilterflags.h"
 
 static void
-print_icmp_filter(struct tcb *tcp, const long addr, int len)
+print_icmp_filter(struct tcb *const tcp, const kernel_ulong_t addr, int len)
 {
        struct icmp_filter filter = {};
 
@@ -1064,22 +556,39 @@ print_icmp_filter(struct tcb *tcp, const long addr, int len)
        tprints(")");
 }
 
+static bool
+print_uint32(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
+{
+       tprintf("%u", *(uint32_t *) elem_buf);
+
+       return true;
+}
+
 static void
-print_getsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
-                long addr, int len)
+print_getsockopt(struct tcb *const tcp, const unsigned int level,
+                const unsigned int name, const kernel_ulong_t addr,
+                const int ulen, const int rlen)
 {
        if (addr && verbose(tcp))
        switch (level) {
        case SOL_SOCKET:
                switch (name) {
                case SO_LINGER:
-                       print_linger(tcp, addr, len);
-                       goto done;
+                       print_get_linger(tcp, addr, rlen);
+                       return;
 #ifdef SO_PEERCRED
                case SO_PEERCRED:
-                       print_ucred(tcp, addr, len);
-                       goto done;
+                       print_ucred(tcp, addr, rlen);
+                       return;
 #endif
+#ifdef SO_ATTACH_FILTER
+               case SO_ATTACH_FILTER:
+                       if (rlen && (unsigned short) rlen == (unsigned int) rlen)
+                               print_sock_fprog(tcp, addr, rlen);
+                       else
+                               printaddr(addr);
+                       return;
+#endif /* SO_ATTACH_FILTER */
                }
                break;
 
@@ -1087,8 +596,8 @@ print_getsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
                switch (name) {
 #ifdef PACKET_STATISTICS
                case PACKET_STATISTICS:
-                       print_tpacket_stats(tcp, addr, len);
-                       goto done;
+                       print_tpacket_stats(tcp, addr, rlen);
+                       return;
 #endif
                }
                break;
@@ -1096,42 +605,81 @@ print_getsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
        case SOL_RAW:
                switch (name) {
                case ICMP_FILTER:
-                       print_icmp_filter(tcp, addr, len);
-                       goto done;
+                       print_icmp_filter(tcp, addr, rlen);
+                       return;
                }
                break;
+
+       case SOL_NETLINK:
+               if (ulen < 0 || rlen < 0) {
+                       /*
+                        * As the kernel neither accepts nor returns a negative
+                        * length, in case of successful getsockopt syscall
+                        * invocation these negative values must have come
+                        * from userspace.
+                        */
+                       printaddr(addr);
+                       return;
+               }
+               switch (name) {
+               case NETLINK_LIST_MEMBERSHIPS: {
+                       uint32_t buf;
+                       print_array(tcp, addr, MIN(ulen, rlen) / sizeof(buf),
+                                   &buf, sizeof(buf),
+                                   umoven_or_printaddr, print_uint32, 0);
+                       break;
+                       }
+               default:
+                       printnum_int(tcp, addr, "%d");
+                       break;
+               }
+               return;
        }
 
        /* default arg printing */
 
        if (verbose(tcp)) {
-               if (len == sizeof(int)) {
+               if (rlen == sizeof(int)) {
                        printnum_int(tcp, addr, "%d");
                } else {
-                       printstr(tcp, addr, len);
+                       printstrn(tcp, addr, rlen);
                }
        } else {
                printaddr(addr);
        }
-done:
-       tprintf(", [%d]", len);
 }
 
 SYS_FUNC(getsockopt)
 {
+       int ulen, rlen;
+
        if (entering(tcp)) {
                print_sockopt_fd_level_name(tcp, tcp->u_arg[0],
                                            tcp->u_arg[1], tcp->u_arg[2], true);
-       } else {
-               int len;
 
-               if (syserror(tcp) || umove(tcp, tcp->u_arg[4], &len) < 0) {
+               if (verbose(tcp) && tcp->u_arg[4]
+                   && umove(tcp, tcp->u_arg[4], &ulen) == 0) {
+                       set_tcb_priv_ulong(tcp, ulen);
+                       return 0;
+               } else {
                        printaddr(tcp->u_arg[3]);
                        tprints(", ");
                        printaddr(tcp->u_arg[4]);
+                       return RVAL_DECODED;
+               }
+       } else {
+               ulen = get_tcb_priv_ulong(tcp);
+
+               if (syserror(tcp) || umove(tcp, tcp->u_arg[4], &rlen) < 0) {
+                       printaddr(tcp->u_arg[3]);
+                       tprintf(", [%d]", ulen);
                } else {
                        print_getsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
-                                        tcp->u_arg[3], len);
+                                        tcp->u_arg[3], ulen, rlen);
+                       if (ulen != rlen)
+                               tprintf(", [%d->%d]", ulen, rlen);
+                       else
+                               tprintf(", [%d]", rlen);
                }
        }
        return 0;
@@ -1139,79 +687,41 @@ SYS_FUNC(getsockopt)
 
 #ifdef IP_ADD_MEMBERSHIP
 static void
-print_mreq(struct tcb *tcp, long addr, unsigned int len)
+print_mreq(struct tcb *const tcp, const kernel_ulong_t addr,
+          const int len)
 {
        struct ip_mreq mreq;
 
-       if (len < sizeof(mreq)) {
-               printstr(tcp, addr, len);
-               return;
+       if (len < (int) sizeof(mreq)) {
+               printaddr(addr);
+       } else if (!umove_or_printaddr(tcp, addr, &mreq)) {
+               PRINT_FIELD_INET4_ADDR("{", mreq, imr_multiaddr);
+               PRINT_FIELD_INET4_ADDR(", ", mreq, imr_interface);
+               tprints("}");
        }
-       if (umove_or_printaddr(tcp, addr, &mreq))
-               return;
-
-       tprints("{imr_multiaddr=inet_addr(");
-       print_quoted_string(inet_ntoa(mreq.imr_multiaddr),
-                           16, QUOTE_0_TERMINATED);
-       tprints("), imr_interface=inet_addr(");
-       print_quoted_string(inet_ntoa(mreq.imr_interface),
-                           16, QUOTE_0_TERMINATED);
-       tprints(")}");
 }
 #endif /* IP_ADD_MEMBERSHIP */
 
 #ifdef IPV6_ADD_MEMBERSHIP
 static void
-print_mreq6(struct tcb *tcp, long addr, unsigned int len)
+print_mreq6(struct tcb *const tcp, const kernel_ulong_t addr,
+           const int len)
 {
        struct ipv6_mreq mreq;
 
-       if (len < sizeof(mreq))
-               goto fail;
-
-       if (umove_or_printaddr(tcp, addr, &mreq))
-               return;
-
-       const struct in6_addr *in6 = &mreq.ipv6mr_multiaddr;
-       char address[INET6_ADDRSTRLEN];
-
-       if (!inet_ntop(AF_INET6, in6, address, sizeof(address)))
-               goto fail;
-
-       tprints("{ipv6mr_multiaddr=inet_pton(");
-       print_quoted_string(address, sizeof(address), QUOTE_0_TERMINATED);
-       tprints("), ipv6mr_interface=");
-       print_ifindex(mreq.ipv6mr_interface);
-       tprints("}");
-       return;
-
-fail:
-       printstr(tcp, addr, len);
-}
-#endif /* IPV6_ADD_MEMBERSHIP */
-
-#ifdef MCAST_JOIN_GROUP
-static void
-print_group_req(struct tcb *tcp, long addr, int len)
-{
-       struct group_req greq;
-
-       if (len != sizeof(greq) ||
-           umove(tcp, addr, &greq) < 0) {
+       if (len < (int) sizeof(mreq)) {
                printaddr(addr);
-               return;
+       } else if (!umove_or_printaddr(tcp, addr, &mreq)) {
+               PRINT_FIELD_INET_ADDR("{", mreq, ipv6mr_multiaddr, AF_INET6);
+               PRINT_FIELD_IFINDEX(", ", mreq, ipv6mr_interface);
+               tprints("}");
        }
-
-       tprintf("{gr_interface=%u, gr_group=", greq.gr_interface);
-       print_sockaddr(tcp, &greq.gr_group, sizeof(greq.gr_group));
-       tprintf("}");
-
 }
-#endif /* MCAST_JOIN_GROUP */
+#endif /* IPV6_ADD_MEMBERSHIP */
 
 #ifdef PACKET_RX_RING
 static void
-print_tpacket_req(struct tcb *tcp, long addr, int len)
+print_tpacket_req(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
 {
        struct tpacket_req req;
 
@@ -1219,12 +729,11 @@ print_tpacket_req(struct tcb *tcp, long addr, int len)
            umove(tcp, addr, &req) < 0) {
                printaddr(addr);
        } else {
-               tprintf("{block_size=%u, block_nr=%u, "
-                       "frame_size=%u, frame_nr=%u}",
-                       req.tp_block_size,
-                       req.tp_block_nr,
-                       req.tp_frame_size,
-                       req.tp_frame_nr);
+               PRINT_FIELD_U("{", req, tp_block_size);
+               PRINT_FIELD_U(", ", req, tp_block_nr);
+               PRINT_FIELD_U(", ", req, tp_frame_size);
+               PRINT_FIELD_U(", ", req, tp_frame_nr);
+               tprints("}");
        }
 }
 #endif /* PACKET_RX_RING */
@@ -1233,7 +742,7 @@ print_tpacket_req(struct tcb *tcp, long addr, int len)
 # include "xlat/packet_mreq_type.h"
 
 static void
-print_packet_mreq(struct tcb *tcp, long addr, int len)
+print_packet_mreq(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
 {
        struct packet_mreq mreq;
 
@@ -1243,9 +752,11 @@ print_packet_mreq(struct tcb *tcp, long addr, int len)
        } else {
                unsigned int i;
 
-               tprintf("{mr_ifindex=%u, mr_type=", mreq.mr_ifindex);
-               printxval(packet_mreq_type, mreq.mr_type, "PACKET_MR_???");
-               tprintf(", mr_alen=%u, mr_address=", mreq.mr_alen);
+               PRINT_FIELD_IFINDEX("{", mreq, mr_ifindex);
+               PRINT_FIELD_XVAL(", ", mreq, mr_type, packet_mreq_type,
+                                "PACKET_MR_???");
+               PRINT_FIELD_U(", ", mreq, mr_alen);
+               tprints(", mr_address=");
                if (mreq.mr_alen > ARRAY_SIZE(mreq.mr_address))
                        mreq.mr_alen = ARRAY_SIZE(mreq.mr_address);
                for (i = 0; i < mreq.mr_alen; ++i)
@@ -1256,16 +767,28 @@ print_packet_mreq(struct tcb *tcp, long addr, int len)
 #endif /* PACKET_ADD_MEMBERSHIP */
 
 static void
-print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
-                long addr, int len)
+print_setsockopt(struct tcb *const tcp, const unsigned int level,
+                const unsigned int name, const kernel_ulong_t addr,
+                const int len)
 {
        if (addr && verbose(tcp))
        switch (level) {
        case SOL_SOCKET:
                switch (name) {
                case SO_LINGER:
-                       print_linger(tcp, addr, len);
-                       goto done;
+                       print_set_linger(tcp, addr, len);
+                       return;
+#ifdef SO_ATTACH_FILTER
+               case SO_ATTACH_FILTER:
+# ifdef SO_ATTACH_REUSEPORT_CBPF
+               case SO_ATTACH_REUSEPORT_CBPF:
+# endif
+                       if ((unsigned int) len == get_sock_fprog_size())
+                               decode_sock_fprog(tcp, addr);
+                       else
+                               printaddr(addr);
+                       return;
+#endif /* SO_ATTACH_FILTER */
                }
                break;
 
@@ -1275,13 +798,13 @@ print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
                case IP_ADD_MEMBERSHIP:
                case IP_DROP_MEMBERSHIP:
                        print_mreq(tcp, addr, len);
-                       goto done;
+                       return;
 #endif /* IP_ADD_MEMBERSHIP */
 #ifdef MCAST_JOIN_GROUP
                case MCAST_JOIN_GROUP:
                case MCAST_LEAVE_GROUP:
                        print_group_req(tcp, addr, len);
-                       goto done;
+                       return;
 #endif /* MCAST_JOIN_GROUP */
                }
                break;
@@ -1298,8 +821,14 @@ print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
                case IPV6_LEAVE_ANYCAST:
 # endif
                        print_mreq6(tcp, addr, len);
-                       goto done;
+                       return;
 #endif /* IPV6_ADD_MEMBERSHIP */
+#ifdef MCAST_JOIN_GROUP
+               case MCAST_JOIN_GROUP:
+               case MCAST_LEAVE_GROUP:
+                       print_group_req(tcp, addr, len);
+                       return;
+#endif /* MCAST_JOIN_GROUP */
                }
                break;
 
@@ -1311,13 +840,13 @@ print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
                case PACKET_TX_RING:
 # endif
                        print_tpacket_req(tcp, addr, len);
-                       goto done;
+                       return;
 #endif /* PACKET_RX_RING */
 #ifdef PACKET_ADD_MEMBERSHIP
                case PACKET_ADD_MEMBERSHIP:
                case PACKET_DROP_MEMBERSHIP:
                        print_packet_mreq(tcp, addr, len);
-                       goto done;
+                       return;
 #endif /* PACKET_ADD_MEMBERSHIP */
                }
                break;
@@ -1326,9 +855,16 @@ print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
                switch (name) {
                case ICMP_FILTER:
                        print_icmp_filter(tcp, addr, len);
-                       goto done;
+                       return;
                }
                break;
+
+       case SOL_NETLINK:
+               if (len < (int) sizeof(int))
+                       printaddr(addr);
+               else
+                       printnum_int(tcp, addr, "%d");
+               return;
        }
 
        /* default arg printing */
@@ -1337,13 +873,11 @@ print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
                if (len == sizeof(int)) {
                        printnum_int(tcp, addr, "%d");
                } else {
-                       printstr(tcp, addr, len);
+                       printstrn(tcp, addr, len);
                }
        } else {
                printaddr(addr);
        }
-done:
-       tprintf(", %d", len);
 }
 
 SYS_FUNC(setsockopt)
@@ -1352,6 +886,7 @@ SYS_FUNC(setsockopt)
                                    tcp->u_arg[1], tcp->u_arg[2], false);
        print_setsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
                         tcp->u_arg[3], tcp->u_arg[4]);
+       tprintf(", %d", (int) tcp->u_arg[4]);
 
        return RVAL_DECODED;
 }