From nobody Fri Oct 24 01:12:01 2025 X-Original-To: dev-commits-src-branches@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 4ct4cf11Jgz6F4Nt; Fri, 24 Oct 2025 01:12:02 +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 4ct4cf0Rc0z3hNl; Fri, 24 Oct 2025 01:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761268322; 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=Ojsy9WqxOhK73d914rt/kTvxOQwqQAwXdtLenyPdBPY=; b=BEr/KweR1UmKEPbNDVbWo6kHe86PgrgwRQ8mdVLMwy+4PJH7x4cG2MxjcHo509g94Yh+tF C0ZgXbXBVSdbkxTflTjxKfHkogA10ZlBI0q5D4AGmxEtTIJW5TBcGduOcJCeHnYutBPMbW x4P9yBKhLeUa37b8ILf4SWLlwCnDBEQSJv4PHVgw2CBdUBwliSiLQ/PXa/9jUpFtPlUTsL tbY2dhB8c7nlgRV/B5FrJDTBAmBe1QxilkZ7FM0w5uA5V0tXiuaDI7rVxE8QISzLZnst7q ZDlLyar5Eoy9XqsFQcUsaFJz1HOD3XIJO2Z1Wlixpp8WeyG5W84eLV9GsyKTYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761268322; 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=Ojsy9WqxOhK73d914rt/kTvxOQwqQAwXdtLenyPdBPY=; b=BrU6FSz1nPX/t7NgQ1gsNKymBq/F9HHIIxoabLNhj8zbeAR5A1pTVTu+vzreLurGFvrqoi 4YAgW6doTZqrg4KaE9y4I04cXbK/RvJM1f8kQ/GBxoGThRr+48SnYaFzaFivRbGB5LuR2Z /9akTsvasVz0nzxkrlV9tPDP3TBPnDytahIqaNzNGTaJE65QF6/+8brGd3mHYryyc9HPrm Wa1DbqaBVySm0CJIphgaIgc17Ym1ebTKHVf1K7jmJkfCvi+SfHasKFUjJ/Wt0RNWtf+2Tp wv1RaO/OcaBEUk6J5vMFTiiY2LszD7s9+xWANtp8FX1bUdwDswvsXlthdjriSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761268322; a=rsa-sha256; cv=none; b=liulJZxIcaZJpaHJA/+RmCcgoOeWn058KC+sFDcZLPX2l/FNNBTjvn0XcLCK1jmyy9crCc Cu1t967b1nhTYZteB45OCda7dmJUXrTdWywmU6wWgs+PNgT3JeyHD7Kk+g8biKWq6tdnWh 6U1gFBWyOoQeTLgFblcpnVHyg+T09citKRZ6YSeRQL3B96ftdqPW7EH3qRPU30jOFFmwke jsJ6MiPbFc0SpPEW5C/vQDFmzCiVEtE82FMgJatMIcAPHAL7Pp2eH+YIYReCb2fLZqbVxZ wIoGaTXxYkbQmp0AtgPYJmIztArvAjXey5oLdiSYXxoH8tPs5RTDN06Vh1V5Wg== 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 4ct4cd74Tkzg3L; Fri, 24 Oct 2025 01:12:01 +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 59O1C12F014675; Fri, 24 Oct 2025 01:12:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59O1C1Kj014672; Fri, 24 Oct 2025 01:12:01 GMT (envelope-from git) Date: Fri, 24 Oct 2025 01:12:01 GMT Message-Id: <202510240112.59O1C1Kj014672@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: c6bf733736b5 - stable/15 - jail: fix an error condition that was returned without setting errno. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: c6bf733736b505da1c353759a76d17a2ac54475a Auto-Submitted: auto-generated The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=c6bf733736b505da1c353759a76d17a2ac54475a commit c6bf733736b505da1c353759a76d17a2ac54475a Author: Jamie Gritton AuthorDate: 2025-10-21 00:09:39 +0000 Commit: Jamie Gritton CommitDate: 2025-10-24 01:11:50 +0000 jail: fix an error condition that was returned without setting errno. MFC after: 3 days (cherry picked from commit 5f7d5709e0c242d5a5fa5516d6079433ee06c347) --- 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; }