From owner-svn-src-projects@freebsd.org Wed Mar 27 00:24:58 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FB0C1564BC0 for ; Wed, 27 Mar 2019 00:24:58 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 363D68D6D4; Wed, 27 Mar 2019 00:24:58 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1C65275B9; Wed, 27 Mar 2019 00:24:57 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2R0OvuS073869; Wed, 27 Mar 2019 00:24:57 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2R0Ov1e073868; Wed, 27 Mar 2019 00:24:57 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201903270024.x2R0Ov1e073868@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 27 Mar 2019 00:24:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345563 - projects/fuse2/tests/sys/fs/fusefs X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/tests/sys/fs/fusefs X-SVN-Commit-Revision: 345563 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 363D68D6D4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Mar 2019 00:24:58 -0000 Author: asomers Date: Wed Mar 27 00:24:57 2019 New Revision: 345563 URL: https://svnweb.freebsd.org/changeset/base/345563 Log: fusefs: fix a race condition in the allow_other test The test could occasionally hang if the parent's SIGUSR2 signal arrived before the child had pause()d. Using POSIX semaphores precludes that possibility. Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/tests/sys/fs/fusefs/allow_other.cc Modified: projects/fuse2/tests/sys/fs/fusefs/allow_other.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/allow_other.cc Tue Mar 26 22:45:41 2019 (r345562) +++ projects/fuse2/tests/sys/fs/fusefs/allow_other.cc Wed Mar 27 00:24:57 2019 (r345563) @@ -35,10 +35,11 @@ extern "C" { #include +#include #include #include #include -#include +#include } #include "mockfs.hh" @@ -101,12 +102,17 @@ TEST_F(AllowOther, allowed) uint64_t ino = 42; int fd; pid_t child; + sem_t *sem; + int mprot = PROT_READ | PROT_WRITE; + int mflags = MAP_ANON | MAP_SHARED; - signal(SIGUSR2, sighandler); + sem = (sem_t*)mmap(NULL, sizeof(*sem), mprot, mflags, -1, 0); + ASSERT_NE(NULL, sem) << strerror(errno); + ASSERT_EQ(0, sem_init(sem, 1, 0)) << strerror(errno); if ((child = fork()) == 0) { /* In child */ - pause(); + ASSERT_EQ(0, sem_wait(sem)) << strerror(errno); /* Drop privileges before accessing */ if (0 != setreuid(-1, m_uid)) { @@ -122,6 +128,8 @@ TEST_F(AllowOther, allowed) /* Deliberately leak fd */ } else if (child > 0) { + int child_status; + /* * In parent. Cleanup must happen here, because it's still * privileged. @@ -134,8 +142,7 @@ TEST_F(AllowOther, allowed) expect_getattr(ino, 0); m_mock->m_child_pid = child; /* Signal the child process to go */ - kill(child, SIGUSR2); - int child_status; + ASSERT_EQ(0, sem_post(sem)) << strerror(errno); wait(&child_status); ASSERT_EQ(0, WEXITSTATUS(child_status)); @@ -149,12 +156,17 @@ TEST_F(NoAllowOther, disallowed) const char FULLPATH[] = "mountpoint/some_file.txt"; int fd; pid_t child; - - signal(SIGUSR2, sighandler); + sem_t *sem; + int mprot = PROT_READ | PROT_WRITE; + int mflags = MAP_ANON | MAP_SHARED; + sem = (sem_t*)mmap(NULL, sizeof(*sem), mprot, mflags, -1, 0); + ASSERT_NE(NULL, sem) << strerror(errno); + ASSERT_EQ(0, sem_init(sem, 1, 0)) << strerror(errno); + if ((child = fork()) == 0) { /* In child */ - pause(); + ASSERT_EQ(0, sem_wait(sem)) << strerror(errno); /* Drop privileges before accessing */ if (0 != setreuid(-1, m_uid)) { @@ -180,7 +192,7 @@ TEST_F(NoAllowOther, disallowed) */ m_mock->m_child_pid = child; /* Signal the child process to go */ - kill(child, SIGUSR2); + ASSERT_EQ(0, sem_post(sem)) << strerror(errno); int child_status; wait(&child_status);