From nobody Tue Sep 9 18:18:02 2025 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 4cLsWH1NHNz67GRw; Tue, 09 Sep 2025 18:18:03 +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 4cLsWG6Z2fz3k1h; Tue, 09 Sep 2025 18:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757441882; 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=Cnpb1sURnShx2DS/jF74nxRQAofMfG/eb4L0ccWZKD0=; b=YV1TXrR+y5Bb5A5ayrKgXD32KWr/gliH22rN7c3Js9nH9GsYG/8h0ByHywnA9cHlB1UF4f lauqgImk060iC+hKqtXjdNdiLtMrQZIL+pOc2E0bihK2yS3dtIJ9p/SQtRU00IuwZEJ48v LgNfF6YeWsUnMm7YSV2IXafO1mnYlpEF6WZb1+ZTPHEr7SwdLbjpweyxu3lR3igMnvLMlj R7rSkn1QhuZnxgZ6SJJ4C/0xd+dd1QF5D55+qCPzI5N+vevN2WggohRAFjnr7y2DfjEZ4D 6UM57/dMV7FxVnEM9Etswus12itY63rK4l84EwIBTdEnfTEvNu8Z1+Lx6CBHbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757441882; 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=Cnpb1sURnShx2DS/jF74nxRQAofMfG/eb4L0ccWZKD0=; b=v7/0Ppt+o26K1aHO+HsVPRHz6k6VIjuuTXlu5g5ZcI3vshXwySBTuzN2qJopKao5ZBAPq2 W4UWZpPj3QRgUIBC/ttSlJ1Q3tBPcgdvrd+7t5oYYMw+SEHVSAwRuFPtvZry2IjZR11CCH tiqEN5qG91uWmAH9doiNu3UZpd/wIdwGcBVec9wDZ9CRbpm74cF8+VPtM8rEHj3CuQdcXT UR0IJA/pyLod+ZsbF+tm95RuvnnsteUridHYMNG72fgFtldUgZZa7DTkFMuBESW8Boyq+U cqzQ1jD5O4hQVux1CMAZBH5TQlMXtJxxhpjuS437FEJ1tXlzCH59010Et/KYYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757441882; a=rsa-sha256; cv=none; b=NayBZZVHYr0elGFnolWLPkGdWrkSLyHPGPGdavWe/P2UWQqsNmjol91G1FtpbRnYZ6L8g5 RN/H/KbvxlSk75zgaCbEOqZF3KpxV7UROMRj4nHiqjWcbRaMpbLcUFxytzL1gRTkAh3Si7 9XkbgmRV37PK1I9z/Jewi+oDzr91MaJOpBIr4j0fRESpItIHxS0Qr35ywC8gRQXHky74Pu VI41Ty1cl+TZ+lki+F8PsY52b7BbsMDLQe3wSPQqbupyM8joDHwida6bad32IF2nCru4M1 sUtnEgt4PMrH7/i7K5XeB9OvfkGdnZaIMNWH0e+q78sH4d8IuEOY9kFGhDqQ/g== 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 4cLsWG5zQyznQp; Tue, 09 Sep 2025 18:18:02 +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 589II23h005928; Tue, 9 Sep 2025 18:18:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 589II2D2005924; Tue, 9 Sep 2025 18:18:02 GMT (envelope-from git) Date: Tue, 9 Sep 2025 18:18:02 GMT Message-Id: <202509091818.589II2D2005924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 16f600dc30b7 - main - jaildesc: replace EBADF with EINVAL 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 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/main X-Git-Reftype: branch X-Git-Commit: 16f600dc30b7bb82429660e540da802a1e3f7449 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=16f600dc30b7bb82429660e540da802a1e3f7449 commit 16f600dc30b7bb82429660e540da802a1e3f7449 Author: Jamie Gritton AuthorDate: 2025-09-09 18:13:11 +0000 Commit: Jamie Gritton CommitDate: 2025-09-09 18:13:11 +0000 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 --- 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;