From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 29 Jan 2015 15:19:21 +0000 (+0000)
Subject: tests: add a test for sockaddr_un.sun_path decoding
X-Git-Tag: v4.10~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9e241882739c2b41fd33c85e2d387fe05a5f7cc;p=strace

tests: add a test for sockaddr_un.sun_path decoding

* tests/net-accept-connect.c: Allow long socket addresses.
* tests/sun_path.test: New test.
* tests/Makefile.am (TESTS): Add it.
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2ee09384..b2b59457 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -53,6 +53,7 @@ TESTS = \
 	net.test \
 	net-fd.test \
 	net-yy.test \
+	sun_path.test \
 	unix-yy.test \
 	uid.test \
 	uid16.test \
diff --git a/tests/net-accept-connect.c b/tests/net-accept-connect.c
index f33d48f3..6d99e3aa 100644
--- a/tests/net-accept-connect.c
+++ b/tests/net-accept-connect.c
@@ -15,10 +15,11 @@ int main(int ac, const char **av)
 
 	assert(ac == 2);
 	assert(strlen(av[1]) > 0);
-	assert(strlen(av[1]) < sizeof(addr.sun_path));
 
-	strcpy(addr.sun_path, av[1]);
+	strncpy(addr.sun_path, av[1], sizeof(addr.sun_path));
 	len = offsetof(struct sockaddr_un, sun_path) + strlen(av[1]) + 1;
+	if (len > sizeof(addr))
+		len = sizeof(addr);
 
 	unlink(av[1]);
 	close(0);
@@ -30,6 +31,8 @@ int main(int ac, const char **av)
 
 	memset(&addr, 0, sizeof addr);
 	assert(getsockname(0, (struct sockaddr *) &addr, &len) == 0);
+	if (len > sizeof(addr))
+		len = sizeof(addr);
 
 	pid_t pid = fork();
 	assert(pid >= 0);
diff --git a/tests/sun_path.test b/tests/sun_path.test
new file mode 100755
index 00000000..6ae67f45
--- /dev/null
+++ b/tests/sun_path.test
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# Check how long sun_path addresses are traced.
+
+. "${srcdir=.}/init.sh"
+
+check_prog grep
+
+rm -f $LOG.*
+
+addr=123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678
+./net-accept-connect $addr ||
+	fail_ 'net-accept-connect failed'
+
+args="-tt -ff -ebind,connect,getsockname ./net-accept-connect $addr"
+$STRACE -o "$LOG" $args ||
+	fail_ "$STRACE $args failed"
+
+"$srcdir"/../strace-log-merge $LOG > $LOG || {
+	cat $LOG
+	fail_ 'strace-log-merge failed'
+}
+
+rm -f $LOG.*
+
+grep_log()
+{
+	local syscall="$1"; shift
+	local prefix='[1-9][0-9]* +[0-9]+:[0-9]+:[0-9]+\.[0-9]+ +'
+
+	LC_ALL=C grep -E -x "$prefix$syscall$*" $LOG > /dev/null || {
+		cat $LOG
+		fail_ "strace -enetwork failed to trace \"$syscall\" properly"
+	}
+}
+
+grep_log bind '\(0, \{sa_family=AF_(LOCAL|UNIX|FILE), sun_path="'$addr'"\}, 110\) += 0'
+grep_log getsockname '\(0, \{sa_family=AF_(LOCAL|UNIX|FILE), sun_path="'$addr'"\}, \[111\]\) += 0'
+grep_log connect '\(1, \{sa_family=AF_(LOCAL|UNIX|FILE), sun_path="'$addr'"\}, 110\) += 0'
+
+exit 0