From owner-svn-src-projects@freebsd.org Wed Mar 27 03:02:56 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 B562D1567B3A for ; Wed, 27 Mar 2019 03:02:55 +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 5585291FBB; Wed, 27 Mar 2019 03:02:55 +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 3DED511D2; Wed, 27 Mar 2019 03:02:55 +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 x2R32txf057960; Wed, 27 Mar 2019 03:02:55 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2R32ti1057959; Wed, 27 Mar 2019 03:02:55 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201903270302.x2R32ti1057959@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 03:02:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345567 - 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: 345567 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5585291FBB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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 03:02:56 -0000 Author: asomers Date: Wed Mar 27 03:02:54 2019 New Revision: 345567 URL: https://svnweb.freebsd.org/changeset/base/345567 Log: fusefs: correct mmap()'s return value in the allow_other test Also, properly cleanup the semaphore. Reported by: ngie 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 Wed Mar 27 02:57:59 2019 (r345566) +++ projects/fuse2/tests/sys/fs/fusefs/allow_other.cc Wed Mar 27 03:02:54 2019 (r345567) @@ -107,7 +107,7 @@ TEST_F(AllowOther, allowed) int mflags = MAP_ANON | MAP_SHARED; sem = (sem_t*)mmap(NULL, sizeof(*sem), mprot, mflags, -1, 0); - ASSERT_NE(NULL, sem) << strerror(errno); + ASSERT_NE(MAP_FAILED, sem) << strerror(errno); ASSERT_EQ(0, sem_init(sem, 1, 0)) << strerror(errno); if ((child = fork()) == 0) { @@ -126,6 +126,7 @@ TEST_F(AllowOther, allowed) } _exit(0); + sem_destroy(sem); /* Deliberately leak fd */ } else if (child > 0) { int child_status; @@ -149,6 +150,7 @@ TEST_F(AllowOther, allowed) } else { FAIL() << strerror(errno); } + munmap(sem, sizeof(*sem)); } TEST_F(NoAllowOther, disallowed) @@ -161,7 +163,7 @@ TEST_F(NoAllowOther, disallowed) int mflags = MAP_ANON | MAP_SHARED; sem = (sem_t*)mmap(NULL, sizeof(*sem), mprot, mflags, -1, 0); - ASSERT_NE(NULL, sem) << strerror(errno); + ASSERT_NE(MAP_FAILED, sem) << strerror(errno); ASSERT_EQ(0, sem_init(sem, 1, 0)) << strerror(errno); if ((child = fork()) == 0) { @@ -184,6 +186,7 @@ TEST_F(NoAllowOther, disallowed) } _exit(0); + sem_destroy(sem); /* Deliberately leak fd */ } else if (child > 0) { /* @@ -200,4 +203,5 @@ TEST_F(NoAllowOther, disallowed) } else { FAIL() << strerror(errno); } + munmap(sem, sizeof(*sem)); }