From nobody Sun Jan 25 15:56:47 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 4dzbrc0Zfyz6Pj0M for ; Sun, 25 Jan 2026 15:56:48 +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 4dzbrb4pZmz47vw for ; Sun, 25 Jan 2026 15:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769356607; 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=neDC4qDHI/5RevVyB0go0n8Noo1p1JSQ07CMkzfUFl8=; b=TRsBBF9VXRcZ6g/y9hA2nCiRjSzzqbdr/+2otI1vxjHvfAOgvMTnhJ9HzS+3VtAlrHrWkx svUai7b/GAcaDrB/COnxy4/8+SEV8XgukJceWF2Sd9rcTfPNRN1Kh4FbeqO1dIyI5a98cB f63Or6ps64sqCulF4F3bnnfKYFSt6ewdpJXeHAZG36IEaSxQuQEMy5D148jMk86X5YNE79 TTJrfmwqLNINCpayAgVAqb/ANkr+jrSYXyvu9GVkK38l+oum7FwxtfzMonyuSJQODgv+bw 3scaW10W52sngjPcf3QPcDSGvdm05BWG3hnnXRb/5shJfA70XdWoRj9bbbwShA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769356607; 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=neDC4qDHI/5RevVyB0go0n8Noo1p1JSQ07CMkzfUFl8=; b=Mzr3k7Kbp0TXNKOPd5/N0JFfZp1WoiimNDCCccdYRvHzhy0n6rCudYc4rwLchqHMgvdiUr p5FLc4ydZoZoSLXq3IHeOYTgrltxbjZ+eMcrqEO2oBjEdcvlwQ9UQq0SziLE8k3/XoRAyd FZQ2bmCPEbiblp/NN6Lwjx2nHuv2HlB/k/84oWEEIh70qD5MCMnciTMPm0ESjMjp58kt1W oAeyWia+09mf9q9O4Rx4KXySNmFEMqBrIZYzDDJsKA32DKi5Po52DYSo0U/Pd7zhNtM8oZ 7GVioK5YZMZdep4tGKjvT/nGucu2EPvHiu36UidX5LVcTMQxbR10CWtaqtFPsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769356607; a=rsa-sha256; cv=none; b=ojkEx3aJ7uE1MDl2ynqxT24b9q4CT+sHSXnidlNsFo5wZzYy9/pw7KOMjfz3pWP1U1S/Gr 4be0Jujynz8LgHsllPhDCrxKsA4tht+NHDqD4GeyNep5U7pnnGme6a3xQr3i0LkVynpWoD 1icneVaMBIgzrc6yl3JMEtYr7azuAkghu8Onzij0IlA/AGU24Lz0mEARUUzde31Kmtdx2p Inu5UA88Kx0b1kUsudun26ufnicS/hvaLnzWpbGt/Mm6j6gHpUGVOgnqJgU9MMXESB5oTl ZTWtuzgA8RGEZgsvrB7vVNY+0EbgkXVE7PsPlqulLNoXrRV2uxi4wyI3eZrLyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzbrb4Bm5zhjT for ; Sun, 25 Jan 2026 15:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33cc8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 15:56:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7211cd2cce74 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7211cd2cce746972af2d60d4b5bf0c087f016731 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 15:56:47 +0000 Message-Id: <69763d3f.33cc8.5e52a32@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7211cd2cce746972af2d60d4b5bf0c087f016731 commit 7211cd2cce746972af2d60d4b5bf0c087f016731 Author: Konstantin Belousov AuthorDate: 2026-01-08 00:31:22 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 15:52:55 +0000 kern/kern_fork.c: define the exterror category for fork Convert EINVALs in kern_fork.c into EXTERRORs. Reviewed by: asomers, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54592 --- 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 c559de34c60c..746aaf20ce03 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)); @@ -869,34 +872,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