From nobody Fri Sep 5 04:50:35 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 4cJ3nR63X4z674PY; Fri, 05 Sep 2025 04:50:35 +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 4cJ3nR577dz3dkj; Fri, 05 Sep 2025 04:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757047835; 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=Axwh3XH9d/UwVVyyIAkygnfKLqR/nSnvV8SczUfrniI=; b=YbMMT3oiGrRq0BYTDAjCAqCQGi9nspHItMMhOIus2kJFklEAIp4XEfZt1/sDtHn9f4fe34 PeAsEsNilIXIdDr3Jf9CkYabdJXP0JuIDu0oI9JPmUMQvNvdw7wEopjAdSgoo3FUQErlSK bK1ihtiJptrOLBTXHvuKPDceyNPsphwd3FWeIAJH35DlqoFEIN5l4lbgNetv+fp3ZbfQGH EnTPoEtPJ2C+4OmAqzpS2KMXAwBmf0PD201X/iqMK3UBRz+9yCqRByOUhr0zzzz+T/1i/v ePBzRnu1DvFdAtDG3QZs/0L5YBnnYyWI0o3JBx0/n9YDcNc2KpzelpAW+qpgpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757047835; 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=Axwh3XH9d/UwVVyyIAkygnfKLqR/nSnvV8SczUfrniI=; b=Y52A+F1EQzSpFnrulTpq41iYmLXUpxRXILTEAz3iNuC9vL6zwiYLw6JDwgf+EUhqh4v9mC N+ZtNKvAom6/XmX05pk834oBih7Xj9z0R83Qnkj+Y+PdLC1z2ailr2U4mGXAJTxNOi0TLl LX+6sqR34ZWTtA4+jy62rrR0C5vFbtduPJljbB3C9ChI/2A90Y0aPQfraQ01Uzz/p1Ex2O M9tOBG0VXbDcsnxFeWul8xbPkmR7p8nwc371Qm9+edDiFdfBqPvFMgOYnlz1ZI3SWP08fi 8T45TJj0ITo1OqDJGjfz/SBjmpcCX+2P7OA8lE1xuTaYev+QakenWl/UsJjU4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757047835; a=rsa-sha256; cv=none; b=YRc8xJEkHGO04HxJufcOH83qPxY5UsKqoBkIJCCVXNhjaSgkzmYCKMLrCKS89OK8htajar ORFrpKPNOZkZSyC72+NYEqCx3lI5VNk0cdGeIJ7w4EDhw+OV0DPiz5PJ4ToLL/NRvB6IR4 5sTEDkvKIdLbo1xxCxSRi622RiAZX7cheTgT/+iGrBZMo/G2MOSHyFHDRdO8p3tcCoogw9 78Pw4kTkjl8pt7p3/Sr4Uxl5K1rIIPLL3X5ZD9EAE9KPo2XYhI3hfj/UoN9R5IwqfHBfWe s71E3GihWiybzoyV5GqGV1dDMQK15P3GXIdb+ar4SfkpDEqYmvAGydcNgyi33w== 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 4cJ3nR4dSnzZwy; Fri, 05 Sep 2025 04:50:35 +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 5854oZnT029694; Fri, 5 Sep 2025 04:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5854oZZ5029691; Fri, 5 Sep 2025 04:50:35 GMT (envelope-from git) Date: Fri, 5 Sep 2025 04:50:35 GMT Message-Id: <202509050450.5854oZZ5029691@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: 8ec7a830f10b - main - jaildesc: fix a misplaced error check and a spurious finit call Reported by: kib 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: 8ec7a830f10bc0f3b421dfaf6967a1bc996d34fd Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=8ec7a830f10bc0f3b421dfaf6967a1bc996d34fd commit 8ec7a830f10bc0f3b421dfaf6967a1bc996d34fd Author: Jamie Gritton AuthorDate: 2025-09-05 04:48:49 +0000 Commit: Jamie Gritton CommitDate: 2025-09-05 04:48:49 +0000 jaildesc: fix a misplaced error check and a spurious finit call Reported by: kib --- 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); }