From nobody Wed Aug 5 20:53:37 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 4hFjLV0RL0z6n9VS for ; Wed, 05 Aug 2026 20:53:38 +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 4hFjLT6zpwz4Dlb for ; Wed, 05 Aug 2026 20:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785963218; 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=oqRdsNE1mJ4NsUpux3MgLvZCyYZFFNWxHi8DqSqxTj4=; b=LbXEKrviyqXPD0EauzbRnaadlxLslvDxcYgjVXywAL1j85Hg/R/bgXidqm5I8JBp+Zn6w1 UkjPSVxHpxFQt7gJgahly9TqvNgyWB4m3fVdKfTzu98LMZPRDS5Rxc/seeLd9LITdfiQVt CCvVO2EomZT8ISkWkopkYzX7hfpNtxbaQvSI7AjboYeVpEsj5H/mcivrIm8UYpA+PNOonA Kk+aaiF4HucvY+PbM47VrOKFdNU8CiAdBIDgNjORn5lDm15R4xD+CvgUVZx/UqCf6ZFv2f vWg+x1DHjeM5F7mdyY87i/8xUL/WVT/XljSFk592/Mmu0NbDY1MV9OrmpdM3HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785963218; a=rsa-sha256; cv=none; b=CcNm5BVzRYceMEX1dHOgVzXWdf7AIja/KM8bM1Rf1/O42jCdeyrVdU8yjoCxLaZuS2t5HQ PL0xqgy2NMfGyq+2zWz6MgL4iJ8lv7DHfy4P2VviUdr9Jr25QOIEWn8IB9eJ4k+zoBOP9l ruq85kwcDejXS5uXxnOTBNAiEInUA+9odOeHEvgfDGrJNyF2BjWpKR8XGf0LAN3g893vzc SQdpMoSyFI4u68I793VDwZu/H/qZXLsiY1Z3i2/DqBmg5pgUkqpOjpuj8Mcqz94OG81Smb cUKaHXntZOY75K8bGbSTXdnNRUicFyE36HhQU240dvVo+g+IdcGQEx507OUQ/Q== 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=1785963218; 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=oqRdsNE1mJ4NsUpux3MgLvZCyYZFFNWxHi8DqSqxTj4=; b=YtY+tNbbhXs4mQYTCs7nvV8J2/qazIzwZkSNZZIX5BWQRVprQBDcDxYY5W8UWW+N5vTWra INAYhCWC3Sjym49GUMrKXUWSCkrnxzpXmjbzASB34xBOzKO2YRKVzdHSbY0OF61A9rulSB kn888BUIErUJ4J2i/eUWsjTeOwbk8a5AaLg+8ZkOLpsmmK3M3cIMjG1ath2IMxy+7q1EQl 8KCOXm8KChsAFYHLtcvyjxZb43X7125Pk9H9kJ/crh5dEJOnycgM5Dyuu8dwL41LD6GKDL UEwt1v7ZbUi9HBFsYlc27RRDP76+adGdc1I6iYkS1IoR4L4EEbHCp+w6IzJVHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFjLT5lCPzqjL for ; Wed, 05 Aug 2026 20:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 426b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 20:53:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 3c5c55beee5e - main - tests/sys/kern: Skip capsicum procdesc tests when capability mode is unavailable 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c5c55beee5ef80d8a9526480682cee86cbac584 Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 20:53:37 +0000 Message-Id: <6a73a2d1.426b2.1a45be92@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=3c5c55beee5ef80d8a9526480682cee86cbac584 commit 3c5c55beee5ef80d8a9526480682cee86cbac584 Author: Olivier Cochard AuthorDate: 2026-08-05 20:46:10 +0000 Commit: Olivier Cochard CommitDate: 2026-08-05 20:51:02 +0000 tests/sys/kern: Skip capsicum procdesc tests when capability mode is unavailable pdwait's capsicum/enotcap and procdesc's pdopenpid_capmode enter capability mode. Require security_capability_mode (and security_capabilities for enotcap) so the cases skip cleanly on kernels built without CAPABILITIES instead of failing. Approved by: asomers, gallatin Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D58545 --- tests/sys/kern/Makefile | 2 ++ tests/sys/kern/pdwait.c | 7 +++++++ tests/sys/kern/procdesc.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index f025172c8388..96f1f70a5b08 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -154,6 +154,8 @@ CFLAGS.subr_unit.c+= -Wno-missing-prototypes SRCS.subr_unit_test+= subr_unit.c CFLAGS.exterr_test+= -I${SRCTOP}/tests +CFLAGS.pdwait+= -I${SRCTOP}/tests +CFLAGS.procdesc+= -I${SRCTOP}/tests WARNS?= 3 diff --git a/tests/sys/kern/pdwait.c b/tests/sys/kern/pdwait.c index 92c8c1b2b3ca..8489dd4ef894 100644 --- a/tests/sys/kern/pdwait.c +++ b/tests/sys/kern/pdwait.c @@ -38,6 +38,8 @@ #include #include +#include "freebsd_test_suite/macros.h" + static void* unmapped(void) { void *unmapped; @@ -85,6 +87,8 @@ ATF_TC_BODY(capsicum, tc) pid_t pid; int status, r; + ATF_REQUIRE_FEATURE("security_capability_mode"); + pid = pdfork(&fdp, 0); if (pid == 0) _exit(42); @@ -195,6 +199,9 @@ ATF_TC_BODY(enotcap, tc) pid_t pid; int status; + ATF_REQUIRE_FEATURE("security_capability_mode"); + ATF_REQUIRE_FEATURE("security_capabilities"); + /*cap_rights_init(&rights, CAP_RIGHTS_ALL);*/ CAP_ALL(&rights); cap_rights_clear(&rights, CAP_PDWAIT); diff --git a/tests/sys/kern/procdesc.c b/tests/sys/kern/procdesc.c index b78e903adb7c..ef5746d544aa 100644 --- a/tests/sys/kern/procdesc.c +++ b/tests/sys/kern/procdesc.c @@ -49,6 +49,8 @@ #include #include +#include "freebsd_test_suite/macros.h" + /* Tests for procdesc(4) that aren't specific to any one syscall */ /* @@ -348,6 +350,8 @@ ATF_TC_BODY(pdopenpid_capmode, tc) { pid_t child, parent; + ATF_REQUIRE_FEATURE("security_capability_mode"); + parent = getpid(); child = fork(); ATF_REQUIRE_MSG(child >= 0, "fork: %s", strerror(errno));