Author: markj
Date: Tue Jul 31 00:48:08 2018
New Revision: 336957
URL: https://svnweb.freebsd.org/changeset/base/336957
Log:
Add a regression test related to PR 131876.
If an error occurs while copying a SCM_RIGHTS message to userspace,
we free the mbuf containing externalized rights, leaking them.
PR: 131876
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/tests/sys/kern/unix_passfd_test.c
Modified: head/tests/sys/kern/unix_passfd_test.c
==============================================================================
--- head/tests/sys/kern/unix_passfd_test.c Tue Jul 31 00:47:27 2018
(r336956)
+++ head/tests/sys/kern/unix_passfd_test.c Tue Jul 31 00:48:08 2018
(r336957)
@@ -447,6 +447,47 @@ ATF_TC_BODY(truncated_rights, tc)
closesocketpair(fd);
}
+ATF_TC_WITHOUT_HEAD(copyout_rights_error);
+ATF_TC_BODY(copyout_rights_error, tc)
+{
+ struct iovec iovec;
+ struct msghdr msghdr;
+ char buf[16];
+ ssize_t len;
+ int fd[2], error, nfds, putfd;
+
+ atf_tc_expect_fail("PR 131876: "
+ "FD leak when copyout of rights returns an error");
+
+ memset(buf, 0, sizeof(buf));
+ domainsocketpair(fd);
+ devnull(&putfd);
+ nfds = getnfds();
+
+ sendfd_payload(fd[0], putfd, buf, sizeof(buf));
+
+ bzero(&msghdr, sizeof(msghdr));
+
+ iovec.iov_base = buf;
+ iovec.iov_len = sizeof(buf);
+ msghdr.msg_control = (char *)-1; /* trigger EFAULT */
+ msghdr.msg_controllen = CMSG_SPACE(sizeof(int));
+ msghdr.msg_iov = &iovec;
+ msghdr.msg_iovlen = 1;
+
+ len = recvmsg(fd[1], &msghdr, 0);
+ error = errno;
+ ATF_REQUIRE_MSG(len == -1, "recvmsg succeeded: %zd", len);
+ ATF_REQUIRE_MSG(errno == EFAULT, "expected EFAULT, got %d (%s)",
+ error, strerror(errno));
+
+ /* Verify that no FDs were leaked. */
+ ATF_REQUIRE(getnfds() == nfds);
+
+ close(putfd);
+ closesocketpair(fd);
+}
+
ATF_TP_ADD_TCS(tp)
{
@@ -459,6 +500,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, devfs_orphan);
ATF_TP_ADD_TC(tp, rights_creds_payload);
ATF_TP_ADD_TC(tp, truncated_rights);
+ ATF_TP_ADD_TC(tp, copyout_rights_error);
return (atf_no_error());
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
