 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_unix.c,v 1.19 2020/07/06 16:24:06 christos Exp $	*/
+/*	$NetBSD: t_unix.c,v 1.20 2020/08/26 22:52:58 christos Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -28,40 +28,41 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __RCSID
-__RCSID("$Id: t_unix.c,v 1.19 2020/07/06 16:24:06 christos Exp $");
+__RCSID("$Id: t_unix.c,v 1.20 2020/08/26 22:52:58 christos Exp $");
 #else
 #define getprogname() argv[0]
 #endif
 #ifdef __linux__
 #define LX -1
 #else
 #define LX
 #endif
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <err.h>
 #include <errno.h>
 #include <string.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdbool.h>
 #include "test.h"
 #define OF offsetof(struct sockaddr_un, sun_path)
 @@ -136,33 +137,60 @@ peercred(int s, uid_t *euid, gid_t *egid
 	if (getsockopt(s, 0, LOCAL_PEEREID, &cred, &crl) == -1)
 		return -1;
 	*euid = cred.unp_euid;
 	*egid = cred.unp_egid;
 	*pid = cred.unp_pid;
 	return 0;
 #else
 	*pid = -1;
 	return getpeereid(s, euid, egid);
 #endif
+}
 static int
-test(bool forkit, bool closeit, size_t len)
+check_cred(int fd, bool statit, pid_t checkpid, const char *s)
+{
 	pid_t pid;
 	uid_t euid;
 	gid_t egid;
 	if (statit) {
 		struct stat st;
 		if (fstat(fd, &st) == -1)
 			FAIL("fstat (%s)", s);
 		euid = st.st_uid;
 		egid = st.st_gid;
 		pid = checkpid;
 	} else {
 		if (peercred(fd, &euid, &egid, &pid) == -1)
 			FAIL("peercred (%s)", s);
+	}
 	printf("%s(%s) euid=%jd egid=%jd pid=%jd\n",
 	    statit ? "fstat" : "peercred", s,
 	    (intmax_t)euid, (intmax_t)egid, (intmax_t)pid);
 	CHECK_EQUAL(euid, geteuid(), s);
 	CHECK_EQUAL(egid, getegid(), s);
 	CHECK_EQUAL(pid, checkpid, s);
 	return 0;
 fail:
 	return -1;
+}
 static int
 test(bool forkit, bool closeit, bool statit, size_t len)
+{
 	size_t slen;
 	socklen_t sl;
 	int srvr = -1, clnt = -1, acpt = -1;
 	uid_t euid;
 	gid_t egid;
 	pid_t srvrpid, clntpid;
 	struct sockaddr_un *sock_addr = NULL, *sun = NULL;
 	socklen_t sock_addrlen;
 	socklen_t peer_addrlen;
 	struct sockaddr_un peer_addr;
 	srvrpid = clntpid = getpid();
 	srvr = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (srvr == -1)
 		FAIL("socket(server)");
 	slen = len + OF + 1;
 @@ -194,72 +222,56 @@ test(bool forkit, bool closeit, size_t l
 		switch (clntpid = fork()) {
 		case 0:	/* child */
 			srvrpid = getppid();
 			clntpid = getpid();
 			break;
 		case -1:
 			FAIL("fork");
 		default:
 			break;
+		}
+	}
 	if (clntpid == getpid()) {
 		pid_t pid = srvrpid;
 		clnt = socket(AF_UNIX, SOCK_STREAM, 0);
 		if (clnt == -1)
 			FAIL("socket(client)");
 		if (connect(clnt, (const struct sockaddr *)sun, sl) == -1)
 			FAIL("connect");
 		check_cred(clnt, statit, srvrpid, "client");
 		if (peercred(clnt, &euid, &egid, &pid) == -1)
 			FAIL("peercred (client)");
 		printf("peercred(client) euid=%jd egid=%jd pid=%jd\n",
 			(intmax_t)euid, (intmax_t)egid, (intmax_t)pid);
 		CHECK_EQUAL(euid, geteuid(), "client");
 		CHECK_EQUAL(egid, getegid(), "client");
 		CHECK_EQUAL(pid, srvrpid, "client");
+	}
 	if (srvrpid == getpid()) {
 		acpt = acc(srvr);
 		peer_addrlen = sizeof(peer_addr);
 		memset(&peer_addr, 0, sizeof(peer_addr));
 		if (getpeername(acpt, (struct sockaddr *)&peer_addr,
 		    &peer_addrlen) == -1)
 			FAIL("getpeername");
 		print("peer", &peer_addr, peer_addrlen);
+	}
 	if (clntpid == getpid()) {
 		if (closeit) {
 			if (close(clnt) == -1)
 				FAIL("close");
 			clnt = -1;
+		}
+	}
 	if (srvrpid == getpid()) {
-		pid_t pid = clntpid;
+		check_cred(acpt, statit, clntpid, "server");
 		if (peercred(acpt, &euid, &egid, &pid) == -1)
 			FAIL("peercred (server)");
 		printf("peercred(server) euid=%jd egid=%jd pid=%jd\n",
 			(intmax_t)euid, (intmax_t)egid, (intmax_t)pid);
 		CHECK_EQUAL(euid, geteuid(), "server");
 		CHECK_EQUAL(egid, getegid(), "server");
 		CHECK_EQUAL(pid, clntpid, "server");
 		if ((sock_addr = calloc(1, slen)) == NULL)
 			FAIL("calloc");
 		sock_addrlen = slen;
 		if (getsockname(srvr, (struct sockaddr *)sock_addr,
 		    &sock_addrlen) == -1)
 			FAIL("getsockname");
 		print("sock", sock_addr, sock_addrlen);
 		if (sock_addr->sun_family != AF_UNIX)
 			FAIL("sock_addr->sun_family %d != AF_UNIX",
 			    sock_addr->sun_family);
 		len += OF;
 @@ -312,85 +324,101 @@ fail:
 #ifndef TEST
 ATF_TC(sockaddr_un_len_exceed);
 ATF_TC_HEAD(sockaddr_un_len_exceed, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Check that exceeding the size of "
 	    "unix domain sockets does not trash memory or kernel when "
 	    "exceeding the size of the fixed sun_path");
+}
 ATF_TC_BODY(sockaddr_un_len_exceed, tc)
+{
-	ATF_REQUIRE_MSG(test(false, false, 254) == -1,
+	ATF_REQUIRE_MSG(test(false, false, false, 254) == -1,
-	    "test(false, false, 254): %s", strerror(errno));
+	    "test(false, false, false, 254): %s", strerror(errno));
+}
 ATF_TC(sockaddr_un_len_max);
 ATF_TC_HEAD(sockaddr_un_len_max, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Check that we can use the maximum "
 	    "unix domain socket pathlen (253): 255 - sizeof(sun_len) - "
 	    "sizeof(sun_family)");
+}
 ATF_TC_BODY(sockaddr_un_len_max, tc)
+{
-	ATF_REQUIRE_MSG(test(false, false, 253) == 0,
+	ATF_REQUIRE_MSG(test(false, false, false, 253) == 0,
-	    "test(false, false, 253): %s", strerror(errno));
+	    "test(false, false, false, 253): %s", strerror(errno));
+}
 ATF_TC(sockaddr_un_closed);
 ATF_TC_HEAD(sockaddr_un_closed, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Check that we can use the accepted "
 	    "address of unix domain socket when closed");
+}
 ATF_TC_BODY(sockaddr_un_closed, tc)
+{
-	ATF_REQUIRE_MSG(test(false, true, 100) == 0,
+	ATF_REQUIRE_MSG(test(false, true, false, 100) == 0,
-	    "test(false, true, 100): %s", strerror(errno));
+	    "test(false, true, false, 100): %s", strerror(errno));
+}
 ATF_TC(sockaddr_un_local_peereid);
 ATF_TC_HEAD(sockaddr_un_local_peereid, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Check that we get the right information"
 	    " from LOCAL_PEEREID");
+}
 ATF_TC_BODY(sockaddr_un_local_peereid, tc)
+{
-	ATF_REQUIRE_MSG(test(true, true, 100) == 0,
+	ATF_REQUIRE_MSG(test(true, true, false, 100) == 0,
-	    "test(true, true, 100): %s", strerror(errno));
+	    "test(true, true, false, 100): %s", strerror(errno));
+}
 ATF_TC(sockaddr_un_fstat);
 ATF_TC_HEAD(sockaddr_un_fstat, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Check that we get the right information"
 	    " from fstat");
+}
 ATF_TC_BODY(sockaddr_un_fstat, tc)
+{
 	ATF_REQUIRE_MSG(test(true, true, true, 100) == 0,
 	    "test(true, true, true, 100): %s", strerror(errno));
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, sockaddr_un_len_exceed);
 	ATF_TP_ADD_TC(tp, sockaddr_un_len_max);
 	ATF_TP_ADD_TC(tp, sockaddr_un_closed);
 	ATF_TP_ADD_TC(tp, sockaddr_un_local_peereid);
 	ATF_TP_ADD_TC(tp, sockaddr_un_fstat);
 	return atf_no_error();
+}
 #else
 int
 main(int argc, char *argv[])
+{
 	size_t len;
 	if (argc == 1) {
 		fprintf(stderr, "Usage: %s <len>\n", getprogname());
 		return EXIT_FAILURE;
+	}
-	test(false, false, atoi(argv[1]));
+	test(false, false, false, atoi(argv[1]));
-	test(false, true, atoi(argv[1]));
+	test(false, true, false, atoi(argv[1]));
-	test(true, false, atoi(argv[1]));
+	test(true, false, false, atoi(argv[1]));
-	test(true, true, atoi(argv[1]));
+	test(true, true, false, atoi(argv[1]));
 	test(true, true, true, atoi(argv[1]));
+}
 #endif