From nobody Fri Jul 3 19:28:58 2026 X-Original-To: dev-commits-src-main@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 4gsP226wwSz6kN32 for ; Fri, 03 Jul 2026 19:28:58 +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 4gsP225WMvz421g for ; Fri, 03 Jul 2026 19:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783106938; 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=vbjTYQi8RS1qmZYVB0SWIvn0KNdnOMu3AvT4Q8aYZKw=; b=MaWfITTnZdRSxIKq6hq4BFq0W80IDRc+k6vmZ9DEcmNyTb3apgOmPEKdGzwi2Xt6Ixqqz6 eVkRX8HmAG2B3bL/9AqHxYLIhjZcSph2Ic8yu+5me+09hgUuvVnwGXP2fwNJveQAVasveR Yg6s7tNYylxJrI1AiPAv/ILCzVftTHNBZs5cypWxLbZSnpzETL6s4stAsX2rOx8RF2NFkM rNok36cvK+Nbn9QKhmIqOBSWUWEkumnYRAysD+EZesOmqPuIK/sIJTczO2PzZy0tfcKiMx M/n0E3mRv+i68qR3tDbX1p0McyhohM6vZ+hFeIfXq09wLa4VcdnNF9MRm/drvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783106938; a=rsa-sha256; cv=none; b=Aa1kVbh3MX1ufuM5a8z3vKchg8ohFRQ4A/l5AW/LboR4qcJpq6mPzO3fjwAyzH8f1905mm DKgqFMzhep6D0lRWXWUkjxANS64o0XqevWO5Ge/zSPFCEnGnVJNF00f263qG9EIII/YTqs ewElSr+PjOnJIaBI8dA4jem3y46n3eWiDEZqsWfex0Rv2WXoMrZRyLWYLAABP0hZ0yei2Q KEMPZm29iNbLfFa17uM/noVIV32af20cwt6bD6AfIvFi7Daus29TZ/GQy80wfi2bIyi+xI dT4WcpVIBw1jmN/k8dtxUfN1qMxMA2s93PcDo3b3eS38UDdvaYRrfZ4K+npETA== 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=1783106938; 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=vbjTYQi8RS1qmZYVB0SWIvn0KNdnOMu3AvT4Q8aYZKw=; b=A1HmH+mJb8r+MwEdroeB2/P6/3Ng55pxCS75iG1uB+zMejtjqTok8fGtCRFDJQIVLX880v lbIJPphKq4hr0ECitm6mfcwFFICYXZolD8lzCQ1n+qdMpARzLTXh+iUuKwFnJOqyYTnOyI Lf8nNKOWqASVLMvwGQbuLdL24UTlMzGxVM8rMb8xLK6u8vkbp6Pp25XTYYTx4B32B72m0/ Dk8KC+pYd1iTECeP+YPU31I8UT6LeZ+SVhPwTjQ2iAcNG4dd+/AizKAmUwcH4pQJdUk1Wt fQevwQJR9xGvo/kuc0PfpslcuZ1aqUMLGUaQtG/MjvvLrLJZjzWlfuDBwlvL7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gsP224WZsz11cC for ; Fri, 03 Jul 2026 19:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 03 Jul 2026 19:28:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 81cf9a0ca765 - main - tests/aslr: Fix spurious test failures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81cf9a0ca765b48a430da61c221be17c4d0f753a Auto-Submitted: auto-generated Date: Fri, 03 Jul 2026 19:28:58 +0000 Message-Id: <6a480d7a.365d9.7d118348@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=81cf9a0ca765b48a430da61c221be17c4d0f753a commit 81cf9a0ca765b48a430da61c221be17c4d0f753a Author: Mark Johnston AuthorDate: 2026-07-03 19:28:22 +0000 Commit: Mark Johnston CommitDate: 2026-07-03 19:28:30 +0000 tests/aslr: Fix spurious test failures /sbin/ping and /sbin/ping6 are hard-linked, and the vmmap sysctl handler doesn't know which name was used to launch the process. PR: 296116 MFC after: 3 days Fixes: 080a4087014e ("tests: Fix race condition in aslr_setuid") --- tests/sys/kern/aslr.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/sys/kern/aslr.c b/tests/sys/kern/aslr.c index 966ea5c3b83a..e0b696c5130a 100644 --- a/tests/sys/kern/aslr.c +++ b/tests/sys/kern/aslr.c @@ -88,6 +88,18 @@ text_base(pid_t pid, const char *path) return (base); } +static uint64_t +ping_text_base(pid_t pid) +{ + uint64_t base; + + base = text_base(pid, "/sbin/ping"); + if (base == 0) + /* Work around name cache inconsistency. */ + base = text_base(pid, "/sbin/ping6"); + return (base); +} + /* * Make sure that ASLR can't be disabled for a setuid executable by an * unprivileged user. @@ -115,9 +127,9 @@ ATF_TC_BODY(aslr_setuid, tc) "/sbin/ping is not setuid root"); child = spawn_ping(tc); - bases[0] = text_base(child, "/sbin/ping"); + bases[0] = ping_text_base(child); ATF_REQUIRE_MSG(bases[0] != 0, - "failed to find /sbin/ping text segment"); + "failed to find ping text segment"); arg = 0; error = procctl(P_PID, child, PROC_ASLR_STATUS, &arg); @@ -137,9 +149,9 @@ ATF_TC_BODY(aslr_setuid, tc) for (size_t i = 1; i < nitems(bases); i++) { child = spawn_ping(tc); - bases[i] = text_base(child, "/sbin/ping"); + bases[i] = ping_text_base(child); ATF_REQUIRE_MSG(bases[i] != 0, - "failed to find /sbin/ping text segment"); + "failed to find ping text segment"); error = kill(child, SIGTERM); ATF_REQUIRE(error == 0); pid = waitpid(child, &st, 0);