From nobody Tue Oct 21 00:10:25 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 4crCNy1Vbsz6DNv6; Tue, 21 Oct 2025 00:10:26 +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 4crCNy0s9Dz3wZR; Tue, 21 Oct 2025 00:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761005426; 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=XoGiXVhi2PNvAtblmrp/Dz3SRMGrOugK4U0QH1qZ0oE=; b=eyEnYRXNIfeaw1EoU3Ahk/w+aZGlh5XPpdG4bimtVwk2GMQ9ywu9IGSjfqjNJ0KAsu5hT8 YiJxcnf9JHzDr+N8rPKJFBms3Au6Pa3SDYvP+cdC5TZamqRhuuDyb740g2Il+Jb4mhop+E 6wqL4rCuYQKMnJCPP828wttwhbtuALeh0FCWpCwx46ziCawM8Kfw5Cj8oNva6n4V93L/hB EMBrKMXywNLGyVgYQK3mV3lI7EQXIqq5OgqAAnd/KeSRMqF/L3MPDBpNiV6ol5/eYJmu1i M2i2ojyK6ej5ltT5sLuClJRjNs0NQ2toBumk6cAaZqGCe4qMLTAPYse9Buhiqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761005426; 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=XoGiXVhi2PNvAtblmrp/Dz3SRMGrOugK4U0QH1qZ0oE=; b=QdwWOMczR5yPPbb95JC4zL5XlY2JmKKBF3z1sLdmWbvlZ2aBuKCDVcNsjro3JVZYQsh5CH u7X0ad6o0745jOhXyHfZVLN007pMtoM95GmZUWD9ABNelWsaxfeHq1yVOg1FMSDu4KpoSu 1wXuUOFRzhdn2fjr4TZ0KrZTo0QyZKCbIVt63afJpeEuZRvvtO7TtxgZiBthUVy8r2efOG yyFPgDxqsz8DxtE1sYkNWuN/IMW33MRMd8wUOpTRn7egwSXR7TtgdnkuSnwnfH1ZTkBSR4 x9N/HgoPar08XyG2lYSGN6kXLPCcHTEw5bSQCcxURNiGczJjxzH23IhcHEDlVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761005426; a=rsa-sha256; cv=none; b=OeSvllCiPDfRrTjvKOtii4dmCgqgf2xBzEHhTToTNC74UImYMcH64/LZ2GDWHNVZX10Ba8 udEKfpjro+QvnG2w3CaiPQMBQOTVyuiJ8UOuSxkNWhG6rSiepeJlfAqB2l03EZOU7tey6h NYnlA6co2svlw0Szqp1c1Wub8vkWmsLp4zNfgTXHLagM658+BnYPI2Qq0jyDpB1Wk5pZ6b kj2c5dyovB6015mB75zBpA7cMf+UxQfwnTg6aBfEaD/Rsvgc0mh/ncXD6mYiUvTp3lEmi/ UYYdbfBgWIldj+zPvTfXmcXGbQsWOLFJz4VKppfK7RRphaZv4pQ9Lqp8wG9gpg== 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 4crCNy0S41zc1n; Tue, 21 Oct 2025 00:10:26 +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 59L0APnc041387; Tue, 21 Oct 2025 00:10:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L0APTK041384; Tue, 21 Oct 2025 00:10:25 GMT (envelope-from git) Date: Tue, 21 Oct 2025 00:10:25 GMT Message-Id: <202510210010.59L0APTK041384@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: 5f7d5709e0c2 - main - jail: fix an error condition that was returned without setting errno. 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: 5f7d5709e0c242d5a5fa5516d6079433ee06c347 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7d5709e0c242d5a5fa5516d6079433ee06c347 commit 5f7d5709e0c242d5a5fa5516d6079433ee06c347 Author: Jamie Gritton AuthorDate: 2025-10-21 00:09:39 +0000 Commit: Jamie Gritton CommitDate: 2025-10-21 00:09:39 +0000 jail: fix an error condition that was returned without setting errno. MFC after: 3 days --- 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 00732d55cd46..267b60ffb5bc 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; }