From nobody Thu Mar 26 14:43:30 2026 X-Original-To: dev-commits-src-branches@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 4fhRNS1kJ8z6RcCs for ; Thu, 26 Mar 2026 14:43:36 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhRNR6hc9z3hj6 for ; Thu, 26 Mar 2026 14:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774536216; 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=xrlpxGZY7Ru1VjpeEpCjz9ncqCiy8lNQl6J0L+pqK/E=; b=yWsskKBiJ49ZRUcyAI6Ub7F+1EblAkcoiB6hcc475DwcAMHEf9P1BnKGEaKmAVXO1LACCN ZcgajnbMAmq1lFB13E3lQDSyMH3tRd1UmSfq7WRn9xuoaVdgQ4rCT7XXBFoH3AqlbG1ouD JlYTtlfZ6flWwxZRg+rZUivlhCRwSyJTRgtToprCT2cMb1+kxRP2UjKluuvke12fG/3j7I dMCAe/jyBbroP2Tym1HtsD5wRd3eEdtxK9wPVxzMJhsed3HhWrMby8aHgDDV0Klu3LvDpc CQJNeJICT4RT49keBGSqlFPrHqX+mpT+0Xkv4/uh3dO2dGEUA/T3PP+HDvl8nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774536216; a=rsa-sha256; cv=none; b=m9tKdzp7PrL5FZh924Z8xaWMaH0sqofsyx83ofjmbtUIrKjIxc1Dx/2rBANz9Ywpoh83BD d7iqA5YheD9nYmjX6s58sdq3+EE2C1ac+DAozaWn7XDq1fUPqpbXiqSaZo+88ZKg/jcZg1 L+YzRc2CVna+bXaPar5Y81FRGYXTWn0wgA4x3xWljuzPmQX1ETuaC+lzFDm2iPN2Re9OE8 aE4rw0Iz583PW/FTzAfScA4wYAOzqj+WMvjGPy9kd0wpkwdqvLpboC4afBv9pMUhFPthea iZOxf/7lqN7oxG/HtIMYz1v0KTMVqJCzlnL87xPWgmRKYHvhS7JyW31ZeJDb+A== 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=1774536216; 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=xrlpxGZY7Ru1VjpeEpCjz9ncqCiy8lNQl6J0L+pqK/E=; b=ZtdAKT+sXgHDVu8dmKNBLXbqowXfn5Ron3qIdhzOSgM31KWZlInr/0bVYMqSOTqxfyoDtv yaiFOOkN0yZfQN9CW+euStSL+rW4m239/YIwo1fOhCM+ZcD3HCeTrjMdWiXdcn4Mmmggj+ vF36VhOtAHWSrsAgtfLPjtyogIughr/S3mN4yn1FCcGsS89Dp6ABOElmn1OcRurqabPw23 JP538sobWDlR3kX4UltrD6lcUbm3B7Xg2kpi5s/5TblhuK6EQ3flgkaboknEZfjKL6i/9+ bB8QwXfyRHrHn7A7k1wApNcbBUdpPiqAQ29YgT0zWaZ5RZGarYFiHkQUQtgLvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhRNR67yrzxJG for ; Thu, 26 Mar 2026 14:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d7da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 14:43:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: c595e21c989f - stable/15 - procdesc: Add a test for pid recycling behavior List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c595e21c989fba006d1b3717d8d2a09b8c27dbb4 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 14:43:30 +0000 Message-Id: <69c54612.1d7da.7ad5cc4@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=c595e21c989fba006d1b3717d8d2a09b8c27dbb4 commit c595e21c989fba006d1b3717d8d2a09b8c27dbb4 Author: Alan Somers AuthorDate: 2026-01-13 00:45:23 +0000 Commit: Alan Somers CommitDate: 2026-03-26 14:42:10 +0000 procdesc: Add a test for pid recycling behavior Sponsored by: ConnectWise (cherry picked from commit e35df41f68916cc23893a29e0284f386ec727462) --- tests/sys/kern/Makefile | 1 + tests/sys/kern/procdesc.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 946a1c2b9b8d..950893a81b18 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -32,6 +32,7 @@ ATF_TESTS_C+= listener_wakeup ATF_TESTS_C+= module_test ATF_TESTS_C+= pdrfork ATF_TESTS_C+= prace +ATF_TESTS_C+= procdesc ATF_TESTS_C+= ptrace_test TEST_METADATA.ptrace_test+= timeout="15" ATF_TESTS_C+= reaper diff --git a/tests/sys/kern/procdesc.c b/tests/sys/kern/procdesc.c new file mode 100644 index 000000000000..3334ee404518 --- /dev/null +++ b/tests/sys/kern/procdesc.c @@ -0,0 +1,98 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 ConnectWise + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +/* Tests for procdesc(4) that aren't specific to any one syscall */ + +/* + * Even after waiting on a process descriptor with waitpid(2), the kernel will + * not recycle the pid until after the process descriptor is closed. That is + * important to prevent users from trying to wait() twice, the second time + * using a dangling pid. + * + * Whether this same anti-recycling behavior is used with pdwait() is + * unimportant, because pdwait _always_ uses a process descriptor. + */ +ATF_TC_WITHOUT_HEAD(pid_recycle); +ATF_TC_BODY(pid_recycle, tc) +{ + size_t len; + int i, pd, pid_max; + pid_t dangle_pid; + + len = sizeof(pid_max); + ATF_REQUIRE_EQ_MSG(0, + sysctlbyname("kern.pid_max", &pid_max, &len, NULL, 0), + "sysctlbyname: %s", strerror(errno)); + + /* Create a process descriptor */ + dangle_pid = pdfork(&pd, PD_CLOEXEC | PD_DAEMON); + ATF_REQUIRE_MSG(dangle_pid >= 0, "pdfork: %s", strerror(errno)); + if (dangle_pid == 0) { + // In child + _exit(0); + } + /* + * Reap the child, but don't close the pd, creating a dangling pid. + * Notably, it isn't a Zombie, because the process is reaped. + */ + ATF_REQUIRE_EQ(dangle_pid, waitpid(dangle_pid, NULL, WEXITED)); + + /* + * Now create and kill pid_max additional children. Test to see if pid + * gets reused. If not, that means the kernel is correctly reserving + * the dangling pid from reuse. + */ + for (i = 0; i < pid_max; i++) { + pid_t pid; + + pid = vfork(); + ATF_REQUIRE_MSG(pid >= 0, "vfork: %s", strerror(errno)); + if (pid == 0) + _exit(0); + ATF_REQUIRE_MSG(pid != dangle_pid, + "pid got recycled after %d forks", i); + ATF_REQUIRE_EQ(pid, waitpid(pid, NULL, WEXITED)); + } + close(pd); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, pid_recycle); + + return (atf_no_error()); +}