From nobody Sat Sep 13 23:44:55 2025 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 4cPSZc1YF1z67hxx; Sat, 13 Sep 2025 23:44:56 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cPSZc0hpGz3sRx; Sat, 13 Sep 2025 23:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757807096; 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=QgjPskdVhc2ngJ3kgH18aMFDzZWDPrWbAODg/C3hFJ8=; b=uBCAqorMLFRADpG4bXrRkrQX0SV3OdR9wQ1pqEZ2Xj0zngkyi8YPENszONTox6oyHl/zTr cJaRfo+KaUlnZg67bOxjAlfla4FkFCgUUKefe/u+NMD3YSrlNE5xlgoLHeBn48AxshWRva 9Cw2Nz3a8z1Qvs/UUUDtkwkiqFUXy4QdHGAsCqjFjUEeI9SMlNmU7/dPK1UUHJtKhGhzql OPPKbvGh3LZugT7GjPxBnr7hb/9kjGXENayE8ZQYguiQ4QgsJYGtl7AJ7lljS1Q54o6QmA Y2RttoNxDhgrGdPKM14ECy18xV/U0td+1tdnUJiwWYAnw3bLXr94g2omkppKFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757807096; 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=QgjPskdVhc2ngJ3kgH18aMFDzZWDPrWbAODg/C3hFJ8=; b=sYWn9iHAFeQW1L7hHKrbbCN2OfyM5qgByK40HOkyUv+lSbCJOlukADBWrvmxTlKTg9E6kM R4/M62IiGjtuDpgPAbt48kU9i1oJvt5b6FMbwLEe5JY0rlGeYw243k9LMI1+JcGVs2bOTY g5NCcOJhSi5XqI6818Qhn92W37NB41GJ13BVBMY6KqsEjUUK3xyhVF/qpI8cpIhhf1dJHd mxOQd4KugpGRR+36UmOttegPlIRg/g/SlpLE0Y4aALou9spI4i1LGKCAdN+OhKp59Qx40K yIpqiYdMErt5m1md4w7sr6DuB6RQffyp84B3Byy90bPYzuxc+MuKxmB5T+lQvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757807096; a=rsa-sha256; cv=none; b=nFOF1J8pFOPzY4Z1PFxSV0S/5f3+F1fkUzNycTXJvZe+MTcwqbj6oUA4gKYIhVnzCcflQn qvhQo42CpEPbpVml3sNTZ/pAJXF41Adt/lwDG2FLZQTC4+lIY9XZJxqXSZkKpxdCpUyfEF b5vT2pLqDQ0XMK1x5Ds4nv9B1ZcRv1hO+CjTtcJpojwsqNg+FYG/6cnbtvOIRDLYVpdPtJ RdClSixYbear1jpcRrJ6FMuSH+ruerFbEZVQlyzqnsYiQ9JadN0Lx83h5O7xliszEeIc9Y +1G/qYiZOvgHXH9Qhwo1SqtrzSi179BsHLwtVLjFqq1NbFauhpy/mrX5n1te/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cPSZc0G8pz10Zh; Sat, 13 Sep 2025 23:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58DNitxP054571; Sat, 13 Sep 2025 23:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58DNitQ8054568; Sat, 13 Sep 2025 23:44:55 GMT (envelope-from git) Date: Sat, 13 Sep 2025 23:44:55 GMT Message-Id: <202509132344.58DNitQ8054568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 595a705062de - stable/15 - MFC jaildesc: replace EBADF with EINVAL 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: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 595a705062dee0fd6ae804efe685defdeaba7cbb Auto-Submitted: auto-generated The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=595a705062dee0fd6ae804efe685defdeaba7cbb commit 595a705062dee0fd6ae804efe685defdeaba7cbb Author: Jamie Gritton AuthorDate: 2025-09-09 18:13:11 +0000 Commit: Jamie Gritton CommitDate: 2025-09-13 22:37:38 +0000 MFC jaildesc: replace EBADF with EINVAL Following fd9e09cb, EBADF is not the suitable error code for a non- jail descriptor passed to jail_set, jail_get, jail_attach_fd, and jail_remove_fd. Reported by: kib (cherry picked from commit 16f600dc30b7bb82429660e540da802a1e3f7449) --- lib/libsys/jail.2 | 26 ++++++-------------------- sys/kern/kern_jaildesc.c | 2 +- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/lib/libsys/jail.2 b/lib/libsys/jail.2 index a0f47cc61cb3..a2640071d1f0 100644 --- a/lib/libsys/jail.2 +++ b/lib/libsys/jail.2 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 4, 2025 +.Dd September 9, 2025 .Dt JAIL 2 .Os .Sh NAME @@ -402,15 +402,6 @@ The system call will fail if: .Bl -tag -width Er -.It Bq Er EBADF -The -.Va desc -parameter does not refer to a valid jail descriptor, -and either the -.Dv JAIL_USE_DESC -or -.Dv JAIL_AT_DESC -flag was set. .It Bq Er EACCES Write permission is denied on the jail descriptor in the .Va desc @@ -514,15 +505,6 @@ The system call will fail if: .Bl -tag -width Er -.It Bq Er EBADF -The -.Va desc -parameter does not refer to a valid jail descriptor, -and either the -.Dv JAIL_USE_DESC -or -.Dv JAIL_AT_DESC -flag was set. .It Bq Er EACCES Read permission is denied on the jail descriptor in the .Va desc @@ -564,6 +546,10 @@ parameter has been removed .It Bq Er EINVAL A supplied parameter is the wrong size. .It Bq Er EINVAL +A supplied parameter is out of range. +.It Bq Er EINVAL +A supplied string parameter is not null-terminated. +.It Bq Er EINVAL A supplied parameter name does not match any known parameters. .It Bq Er EMFILE A jail descriptor could not be created for the @@ -607,7 +593,7 @@ and system calls will fail if: .Bl -tag -width Er -.It Bq Er EBADF +.It Bq Er EINVAL The .Fa fd argument is not a valid jail descriptor. diff --git a/sys/kern/kern_jaildesc.c b/sys/kern/kern_jaildesc.c index fec9b5719b2e..b4ffad4c88e8 100644 --- a/sys/kern/kern_jaildesc.c +++ b/sys/kern/kern_jaildesc.c @@ -87,7 +87,7 @@ jaildesc_find(struct thread *td, int fd, struct jaildesc **jdp, if (error != 0) return (error); if (fp->f_type != DTYPE_JAILDESC) { - error = EBADF; + error = EINVAL; goto out; } jd = fp->f_data;