From nobody Mon Jun 22 13:26:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVd28lhz6hBtC for ; Mon, 22 Jun 2026 13:26:17 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkTVd0RcVz3r2g for ; Mon, 22 Jun 2026 13:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqbugRJMnp1C3vrNHE7Uhb5gQ87bxpRohtt77yy1v0w=; b=LMlLq4buSEOn51H8SvQC/UodBcUG5UNyq2Y3OHV0T5tkf/weVnO15bvInScWCQ7rCTHw/m eXS8aFUSKiYwrOfADAjZYwKkiAxHThc6Dqt/ynQ/kpdHjzLQ8p3PxRglNKVMavLZWvB7xu NrBE5oFYPMHuHPZvJzi67uA5ucEJlpqwRpyFUknBKKKlroDcbUaVglNqPqDigsYpqBJ22e PZH1lx5rUnb6TRXd/PJK7kITS9FN6rJvpP7h0voKi/PNdHCexBITw3M+4n8bBeDPZcgJYb TUNqBzA+TY7YPqyVGvhTmFc5Avim6korWvmeGHWYs9/CcCFiyWZc4Uou11Vmkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782134777; a=rsa-sha256; cv=none; b=ibFEhyOVUSDvlMg0g88LJw+1gVONd78+jbHugZMe1yN/NUq8sn+ngHcygVVDNKU2eYXI0N ggxbyVA24Mq8fhtr2bTcCHLbR63qMyEjXomfDd8szhbPRCds2LcpWsz9VWNgV5dWl3bLte I/pT8b+vm+fsf8bARasrX+kvXRtKVzEIpEoQQrN3Ax4SQAvFqLoa8TkhTDwqnCcizfmUyQ TGOE9vLVCa24gDBJ4l+3v++ncAohsekd6uMOZpmOVF+2riJ+xpR7he4indZcR3r0P6swxY Q8/3CTNo+yKrZENDQ7g+LE+S554sGpqy0konVYgnBc/oZHDAgBHlteysLplIGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqbugRJMnp1C3vrNHE7Uhb5gQ87bxpRohtt77yy1v0w=; b=aIrJfuWKvbKWC1bKRjfi9sz1atvfVqCo4woJ9HC8glAeemiyyPgIOcgjBgLOmo7gZL47EP wMHYCs3ZP/lppb9OpDPkP+5jTW6kMRwLN7j0ur0L4W+cW1B36YsoYJAjPoyoBSD9haLXUO 4CZfNBrT231lMHmaMD/G81YGjJud2rXPHdNvI1rXEZZmWtPKYPl4G7RelbWZaZZngJMTuk UWiY4hF0H8u/frJiArbPE1gtgj3C30H1wENT3/MVUghX0vlbwirsAq1WaQn6nTMxuPOwFZ HqSOrZh35fA/smE0q7ByQLaRFD/zG9hP/1VgSVVeDWmSlHjTO0ykm28fwHK1+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVc6Dz9zpNx for ; Mon, 22 Jun 2026 13:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a431 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 13:26:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 080a4087014e - main - tests: Fix race condition in aslr_setuid List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 080a4087014e1d19136cc77028019d98b5c69e1e Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 13:26:16 +0000 Message-Id: <6a3937f8.3a431.48c84de4@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=080a4087014e1d19136cc77028019d98b5c69e1e commit 080a4087014e1d19136cc77028019d98b5c69e1e Author: Dag-Erling Smørgrav AuthorDate: 2026-06-22 13:23:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-22 13:23:48 +0000 tests: Fix race condition in aslr_setuid Use a cloexec pipe to block the parent until the child is ready. While here, redirect the output from ping to /dev/null, and mark the test as requiring the inet feature since we ping the IPv4 loopback. PR: 296116 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D57734 --- tests/sys/kern/Makefile | 1 + tests/sys/kern/aslr.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 3b09ee3181d2..728917b062c5 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -92,6 +92,7 @@ PROGS+= coredump_phnum_helper PROGS+= pdeathsig_helper PROGS+= sendfile_helper +CFLAGS.aslr+= -I${SRCTOP}/tests LIBADD.aslr+= util LIBADD.copy_file_range+= md LIBADD.jail_lookup_root+= jail util diff --git a/tests/sys/kern/aslr.c b/tests/sys/kern/aslr.c index 13038054603c..7d5282fc7cf3 100644 --- a/tests/sys/kern/aslr.c +++ b/tests/sys/kern/aslr.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -19,6 +20,7 @@ #include #include +#include "freebsd_test_suite/macros.h" /* * Spawn an unprivileged child with ASLR force-disabled, which then execs @@ -30,16 +32,21 @@ spawn_ping(const atf_tc_t *tc) const char *user; struct passwd *passwd; pid_t child; - int arg, error; + int arg, error, ctl[2]; + char dummy; user = atf_tc_get_config_var(tc, "unprivileged_user"); passwd = getpwnam(user); ATF_REQUIRE(passwd != NULL); + ATF_REQUIRE(pipe2(ctl, O_CLOEXEC) == 0); child = fork(); ATF_REQUIRE(child >= 0); if (child == 0) { - if (seteuid(passwd->pw_uid) != 0) + if (close(ctl[0]) != 0 || + close(STDOUT_FILENO) != 0 || + open("/dev/null", O_WRONLY | O_APPEND) != STDOUT_FILENO || + seteuid(passwd->pw_uid) != 0) _exit(1); arg = PROC_ASLR_FORCE_DISABLE; @@ -50,7 +57,9 @@ spawn_ping(const atf_tc_t *tc) execl("/sbin/ping", "ping", "127.0.0.1", NULL); _exit(127); } - usleep(500000); /* XXX-MJ */ + ATF_REQUIRE(close(ctl[1]) == 0); + ATF_REQUIRE(read(ctl[0], &dummy, 1) == 0); + ATF_REQUIRE(close(ctl[0]) == 0); return (child); } @@ -98,6 +107,7 @@ ATF_TC_BODY(aslr_setuid, tc) pid_t child, pid; int arg, error, st; + ATF_REQUIRE_FEATURE("inet"); if (!atf_tc_has_config_var(tc, "unprivileged_user")) atf_tc_skip("unprivileged_user not set");