From nobody Sun Feb 1 21:40:49 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 4f438L2WjQz6QjGf for ; Sun, 01 Feb 2026 21:40:50 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f438L0t0Lz3FP7 for ; Sun, 01 Feb 2026 21:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769982050; 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=75HYVNYwJqbRLg7b7BdYMsU6rGiWtQvG1BYuhG0WTis=; b=QF6y4cK9Jc7e4w0L1SmFOeZ/ES1PNu2x8EXq848yThaWfLiub9QJevmQ2WwVCayCcs8bNj v9HACu8+TJzu+tFTOs6ZzylhPRmXDIJPDKy5GY13pp+WXsf2yfEdKIFaZSPW1kDDUk09Mn MFswsCbu510066qm6E06xhNdIatsCOkyzphMLQCpKDhxAVEl/uAkoWihIxiuuNBZonk0pM Oh9rL2eQ4MLAn/O7oLguwxA8FmJYtOmNvVUFIsfXnCx0fmlBtNJyvTu9q2pyHioP2oWN39 A0dA3vMJBFwlgcC1+JEEDl8ocPCAtS2exyzYMeRm9TyrZvhF5xg5uoKNtqfrYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769982050; a=rsa-sha256; cv=none; b=tQSlWrldQJpHMZWNid4QX155Iw6T3b8ARzRLqCg9cD3Lhx+hUpVahwrHrZ8lycrRpmn3R/ Rb6WFbNDKsGyLlKtvFpbYr6RC306daLez6sARWaRFtLDkii9/RC8MJXC3vu79mwDj/w/G5 Ki4Lwq1pVOeG5UW2Enh7T03PTvgspbp/383hMFLhPnKOkkfztdX6+NEOO9YFJP97ufrhLX D+zVcU9x/Pt1a+1HiLIaRgOyEMfzRsunGDXWFplQolsPB//UmYI5K2NeyaRv/XN6XaaeBt 8LOnIWurIkeQIDP4t8a7hIQ0pJvAfFcVJTruacSYmZK6GtOxGrNdU9H2nG6WLQ== 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=1769982050; 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=75HYVNYwJqbRLg7b7BdYMsU6rGiWtQvG1BYuhG0WTis=; b=bGiu8Zo9rBjpzK98aeeXlIapsrcY4PbU8vAT/bpsB6Mhx4NwXlusiUtj6OtR0XWGxhJp4x PhkpLdYXuokVDV+vBTXrlx1CMz0bMy6Ida1M2KME2IpRrv4PR/vv26nkuzw5s9GW7v70p/ pCph3myyeFz/URPff4MQWur8PATJpPJgrcmrtSwTiKEX8c2/xYV8V+olHx1hPJXon5QPrv 0ZmEZAwkyzykPCtTTE7c+S1nTdRpSV/QIKXxTa0Z1nTBfda4zzH0W+gwWMZWW64v2S14yH 7rpS6Ut6RsP95gu81aOIUsSv4WyicaffxU15CedapRu7rSUF+5IWdYypV8Iq8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f438K6Ng2zy5W for ; Sun, 01 Feb 2026 21:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c4ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Feb 2026 21:40:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 304d02fc2e43 - stable/15 - kern/kern_fork.c: define the exterror category for fork 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 304d02fc2e43ed8ae1661a83641f92882741ff6c Auto-Submitted: auto-generated Date: Sun, 01 Feb 2026 21:40:49 +0000 Message-Id: <697fc861.3c4ff.5b7f4c01@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=304d02fc2e43ed8ae1661a83641f92882741ff6c commit 304d02fc2e43ed8ae1661a83641f92882741ff6c Author: Konstantin Belousov AuthorDate: 2026-01-08 00:31:22 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-01 21:38:48 +0000 kern/kern_fork.c: define the exterror category for fork (cherry picked from commit 7211cd2cce746972af2d60d4b5bf0c087f016731) --- sys/kern/kern_fork.c | 35 ++++++++++++++++++----------------- sys/sys/exterr_cat.h | 1 + 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 0a5f6d20dad1..d5f446ff59b0 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -37,10 +37,12 @@ #include "opt_ktrace.h" #include "opt_kstack_pages.h" +#define EXTERR_CATEGORY EXTERR_CAT_FORK #include #include #include #include +#include #include #include #include @@ -164,10 +166,11 @@ sys_rfork(struct thread *td, struct rfork_args *uap) /* Don't allow kernel-only flags. */ if ((uap->flags & RFKERNELONLY) != 0) - return (EINVAL); + return (EXTERROR(EINVAL, "Kernel-only flags %#jx", uap->flags)); /* RFSPAWN must not appear with others */ if ((uap->flags & RFSPAWN) != 0 && uap->flags != RFSPAWN) - return (EINVAL); + return (EXTERROR(EINVAL, "RFSPAWN must be the only flag %#jx", + uap->flags)); AUDIT_ARG_FFLAGS(uap->flags); bzero(&fr, sizeof(fr)); @@ -867,34 +870,32 @@ fork1(struct thread *td, struct fork_req *fr) else MPASS(fr->fr_procp == NULL); - /* Check for the undefined or unimplemented flags. */ if ((flags & ~(RFFLAGS | RFTSIGFLAGS(RFTSIGMASK))) != 0) - return (EINVAL); + return (EXTERROR(EINVAL, + "Undef or unimplemented flags %#jx", flags)); - /* Signal value requires RFTSIGZMB. */ if ((flags & RFTSIGFLAGS(RFTSIGMASK)) != 0 && (flags & RFTSIGZMB) == 0) - return (EINVAL); + return (EXTERROR(EINVAL, + "Signal value requires RFTSIGZMB", flags)); - /* Can't copy and clear. */ - if ((flags & (RFFDG|RFCFDG)) == (RFFDG|RFCFDG)) - return (EINVAL); + if ((flags & (RFFDG | RFCFDG)) == (RFFDG | RFCFDG)) + return (EXTERROR(EINVAL, "Can not copy and clear")); - /* Check the validity of the signal number. */ if ((flags & RFTSIGZMB) != 0 && (u_int)RFTSIGNUM(flags) > _SIG_MAXSIG) - return (EINVAL); + return (EXTERROR(EINVAL, "Invalid signal", RFTSIGNUM(flags))); if ((flags & RFPROCDESC) != 0) { - /* Can't not create a process yet get a process descriptor. */ if ((flags & RFPROC) == 0) - return (EINVAL); + return (EXTERROR(EINVAL, + "Can not not create a process yet get a process descriptor")); - /* Must provide a place to put a procdesc if creating one. */ if (fr->fr_pd_fd == NULL) - return (EINVAL); + return (EXTERROR(EINVAL, + "Must provide a place to put a procdesc if creating one")); - /* Check if we are using supported flags. */ if ((fr->fr_pd_flags & ~PD_ALLOWED_AT_FORK) != 0) - return (EINVAL); + return (EXTERROR(EINVAL, + "Invallid pdflags at fork %#jx", fr->fr_pd_flags)); } p1 = td->td_proc; diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h index 24f07539fe35..daf0419754b7 100644 --- a/sys/sys/exterr_cat.h +++ b/sys/sys/exterr_cat.h @@ -37,6 +37,7 @@ #define EXTERR_CAT_GEOM 12 #define EXTERR_CAT_FUSE_VFS 13 #define EXTERR_CAT_FUSE_DEVICE 14 +#define EXTERR_CAT_FORK 15 #endif