From nobody Thu Oct 30 04:23:52 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 4cxrbF1m7Dz6Dk3f; Thu, 30 Oct 2025 04:23:53 +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 4cxrbD5kK4z3GQ6; Thu, 30 Oct 2025 04:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798232; 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=e33Vbrbqk22IOSZ/Vc2kuzZc2EqIxG6GtWjvJIe+g2Y=; b=cw5ylcOxY+HGPL7FAFYnBxEtXIFcZx4xEpBbib/Mi8pfKmaQ2Cl+GfFTUU0PnpwVzApFTb T/U4sQ2Xz4Ht70fwjqIBvqgeMTwQwrpDvOF5SBR3Y6EJoXIUUINJv6UAe/ueTtMA9N+1JU 2RI3tndZg1daIUB317YmhyJKh+yn4YlRCzDotHZVO2aWXiZ3Wd9/63UnXvz732TeO2sCjw 9QM2FR9j4LhnAOU+lAzJk2V+bVkxYDWp/qWye80G30qMfJ39QabqEbse+f/3WnfZtS/DOh u1CQ/bnmn8OGP0GL05B1K+Rb7Amo6i2PpubI7NK9XyMfLE+QPvOiqa2p3KF66w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798232; 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=e33Vbrbqk22IOSZ/Vc2kuzZc2EqIxG6GtWjvJIe+g2Y=; b=j/sGYDxyby2bZ30axBNfiTaN1pWuFlPHghnq8ce7O68r0I5lO5OeQ2wYCS0VL09HRPnNhr nJWTSHPJXx6S7TAlD1ae71Zhfx07SDIDsfH6NM4thiR8/w1bGkSJHMo4LyqCUNsLOHjvj5 K11dOnBL4jUNF11PiiuJ2QS+M4SdBIQ8y2ixduTxT7xuvDrDzu3Z4St9nYKNprAgVzfa1u vQXxa9ZU07bAsCydxB2wTk1oH/7+uXyJ0LMfKDFWdYE4S9WpBm43RE5TCkUQx2vFvW6pT5 tFvOO/BDh4LxPSSMnoOQHGWWQ5oOTx40rJKQZvrm+aF4zh1wyrON25s3Q6EM1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761798232; a=rsa-sha256; cv=none; b=mMvvINgyuR661PVEbzAZbLOsZFAJLr/SuOZDyoa2CoaPn7fLHIygrw6UMGx29yTbLlKHtB WAXsGEESuw0yEAMleaImvXO9nTNVmo/WLl7ioj/hN/MGvB6/nWSpIWcruOG08yYr3twYvv GIAY6uofakmXByzaUNnHmHnlrfmCRR+Nfddjsd29dHY4OQ9I2giqIHS0AA4CsrhzDx7WgK tBR+g2jcO6yNHwyGpZJ80ILB5HjkIqUsZaLsTHWx2RGCc1ozvhe9XqA8IGI5gWOnnXyEWu +3dvo5Yr9knpN+azgUXZ3tVPnJFblWyM9Xyk6anR/zkkgwSDSfacn/0iVaPtaQ== 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 4cxrbD5D65z16c7; Thu, 30 Oct 2025 04:23:52 +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 59U4NqvL084713; Thu, 30 Oct 2025 04:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4Nq93084710; Thu, 30 Oct 2025 04:23:52 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:23:52 GMT Message-Id: <202510300423.59U4Nq93084710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9620ee881691 - releng/15.0 - jail: fix an error condition that was returned without setting errno. 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 9620ee88169129729ae3fb3870dc47a7145a1ce2 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9620ee88169129729ae3fb3870dc47a7145a1ce2 commit 9620ee88169129729ae3fb3870dc47a7145a1ce2 Author: Jamie Gritton AuthorDate: 2025-10-21 00:09:39 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:23:15 +0000 jail: fix an error condition that was returned without setting errno. Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 5f7d5709e0c242d5a5fa5516d6079433ee06c347) (cherry picked from commit c6bf733736b505da1c353759a76d17a2ac54475a) --- sys/kern/kern_jail.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 3697d95fe0e5..a0a200caefc6 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -1088,6 +1088,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) else { if (!(flags & (JAIL_USE_DESC | JAIL_AT_DESC | JAIL_GET_DESC | JAIL_OWN_DESC))) { + error = EINVAL; vfs_opterror(opts, "unexpected desc"); goto done_errmsg; } @@ -2518,6 +2519,7 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) } else if (error == 0) { if (!(flags & (JAIL_USE_DESC | JAIL_AT_DESC | JAIL_GET_DESC | JAIL_OWN_DESC))) { + error = EINVAL; vfs_opterror(opts, "unexpected desc"); goto done; }