From nobody Sat Sep 13 23:44:54 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 4cPSZb0fRnz67jHd; Sat, 13 Sep 2025 23:44:55 +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 4cPSZZ70d8z3sbK; Sat, 13 Sep 2025 23:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757807095; 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=BywoKvC4TKtuexK1Ujq+L8u+EoO3NkByE7cCq8/14G0=; b=mVUQBM4Jpzaj5+VBaSIP9NVNr97AXq2OFawCAsYv91uZJTsTZz5Cqpa/xGVphDBldT7EC5 RUQo9hmLWirQZT2FfWojlJMlndJ+RF0SGsiVx+NO2xaFBAaPUBShrmKUK0aD9tFBQu2EBp Z9gJvvD071dHGHmdOz+OcHTf3eNKG0g+AsCvMYL5BUZfwNKUVCDuMVcmBcEIEEIkrADJ2T vXYHT+r0Mrp9sifpArbST1vFOly61RU4UW/mNXyjEObDKn/D7hRJUkClJi2KdEF5ZxLrqA FNjxmnpN2rGy4sEXToRjVvPMmTEQpq/VQYNlLM3/MsrSRd+PLgw51Rqsu9DHqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757807095; 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=BywoKvC4TKtuexK1Ujq+L8u+EoO3NkByE7cCq8/14G0=; b=yDSDhUP6KafRCgUAxaWHq57B+sUSbjnSOIsaNs+Cgj6CsrS6snSWyDgP+IqMY6PYzqVl8c cGy2Kk4WDIWT/Aw9UQbnfy3jzexMk2/zGLmgEYUsabPp2/DjWqb9GVy3GzLZHtVzgG/sCS lDl96sL30rKx3xhvmTNuer5wZjMk8nQgH9VaALwP5xA37CGSb77lDz6CJyo9tSC287gbbK 2NgRGGxfQl/FsqR0a9Q1y9VxTqoVpldoCE7/KAigw+go3D8Em8u0+pBKG4rkivLOlgGJTR JsWcJ+ypPCVNfPDi4cy7oEFhTrzGao8wz6SSA55iDsmAYp80IBOd8+4o+GdWzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757807095; a=rsa-sha256; cv=none; b=TysIo5ZUtXws8lhKUKdvXx+M3pP27BzZYQVU6tOJzMuoDDq2Vp+Q2uhovianaaGQvtD+2D k+8KEvTgWY14h8/A7SfCJrdHm4VWSXgxXXYxKt8sWMvgdM4DOvkCpaNMEgqCHGoWPX4rLN oYCNfKujfbk+DZiTKQ0CmZWlord7OZ2AkW4wKqtBiUwlfYOzheDUSP28CijS4VInVBlViy Rm6P/Vop2IsId03UZbYmxtLOY8hbCU9d3jVMwqooccIDBo502bbMyZIdFKPNG9FOvCtxPD UyXirDEYUTg+7BTLXPkjETZnFpa5TZk0oPfj+Dx3gIrJB6i2eK/dhDuVDE/VdA== 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 4cPSZZ6ZQZz114K; Sat, 13 Sep 2025 23:44:54 +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 58DNisiB054534; Sat, 13 Sep 2025 23:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58DNisid054531; Sat, 13 Sep 2025 23:44:54 GMT (envelope-from git) Date: Sat, 13 Sep 2025 23:44:54 GMT Message-Id: <202509132344.58DNisid054531@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: 4ecbb3f19b44 - stable/15 - MFC jaildesc: fix a misplaced error check and a spurious finit call 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: 4ecbb3f19b4461b06e408bec4d077774672f3d7b Auto-Submitted: auto-generated The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=4ecbb3f19b4461b06e408bec4d077774672f3d7b commit 4ecbb3f19b4461b06e408bec4d077774672f3d7b Author: Jamie Gritton AuthorDate: 2025-09-05 04:48:49 +0000 Commit: Jamie Gritton CommitDate: 2025-09-13 22:37:07 +0000 MFC jaildesc: fix a misplaced error check and a spurious finit call Reported by: kib (cherry picked from commit 8ec7a830f10bc0f3b421dfaf6967a1bc996d34fd) --- sys/kern/kern_jaildesc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_jaildesc.c b/sys/kern/kern_jaildesc.c index e00ec9a4bfff..fec9b5719b2e 100644 --- a/sys/kern/kern_jaildesc.c +++ b/sys/kern/kern_jaildesc.c @@ -133,12 +133,12 @@ jaildesc_alloc(struct thread *td, struct file **fpp, int *fdp, int owning) mode = 0; jd = malloc(sizeof(*jd), M_JAILDESC, M_WAITOK | M_ZERO); error = falloc_caps(td, &fp, fdp, 0, NULL); - finit(fp, priv_check_cred(fp->f_cred, PRIV_JAIL_SET) == 0 - ? FREAD | FWRITE : FREAD, DTYPE_JAILDESC, jd, &jaildesc_ops); if (error != 0) { free(jd, M_JAILDESC); return (error); } + finit(fp, priv_check_cred(fp->f_cred, PRIV_JAIL_SET) == 0 + ? FREAD | FWRITE : FREAD, DTYPE_JAILDESC, jd, &jaildesc_ops); JAILDESC_LOCK_INIT(jd); jd->jd_uid = fp->f_cred->cr_uid; jd->jd_gid = fp->f_cred->cr_gid; @@ -234,7 +234,6 @@ jaildesc_close(struct file *fp, struct thread *td) JAILDESC_LOCK_DESTROY(jd); free(jd, M_JAILDESC); } - finit(fp, 0, DTYPE_NONE, NULL, &badfileops); return (0); }