Enhance diagnostics of address truncation in sockname family syscalls

* net.c (decode_sockname): Print both user and kernel address lengths
when the returned address is truncated.
* tests/sun_path.expected: Update expected output.

diff --git a/net.c b/net.c
index 86d93fc23c0fd6c31fa6b2845a339ede3569607a..245cae9a9f03eb3da8805d22a42a6699f467fb5f 100644 (file)
--- a/net.c
+++ b/net.c
@@ -225,7 +225,10 @@ decode_sockname(struct tcb *tcp)
                tprintf(", [%d]", ulen);
        } else {
                decode_sockaddr(tcp, tcp->u_arg[1], ulen > rlen ? rlen : ulen);
-               tprintf(", [%d]", rlen);
+               if (ulen < rlen)
+                       tprintf(", [%d->%d]", ulen, rlen);
+               else
+                       tprintf(", [%d]", rlen);
        }
 
        return RVAL_DECODED;

diff --git a/tests/sun_path.expected b/tests/sun_path.expected
index 44076862684d32557cb7f060f5b2bd1a78a39310..30a11c03dd686533d260406d6f92f50c4992efa0 100644 (file)
--- a/tests/sun_path.expected
+++ b/tests/sun_path.expected
@@ -1,3 +1,3 @@
 [1-9][0-9]* +[0-9]+:[0-9]+:[0-9]+\.[0-9]+ +bind\(0, \{sa_family=AF_(LOCAL|UNIX|FILE), sun_path="123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678"\}, 110\) += 0
-[1-9][0-9]* +[0-9]+:[0-9]+:[0-9]+\.[0-9]+ +getsockname\(0, \{sa_family=AF_(LOCAL|UNIX|FILE), sun_path="123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678"\}, \[111\]\) += 0
+[1-9][0-9]* +[0-9]+:[0-9]+:[0-9]+\.[0-9]+ +getsockname\(0, \{sa_family=AF_(LOCAL|UNIX|FILE), sun_path="123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678"\}, \[110->111\]\) += 0
 [1-9][0-9]* +[0-9]+:[0-9]+:[0-9]+\.[0-9]+ +connect\(1, \{sa_family=AF_(LOCAL|UNIX|FILE), sun_path="123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678"\}, 110\) += 0