From owner-dev-commits-src-main@freebsd.org Mon Jan 18 23:47:52 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E1F1B4D87F8; Mon, 18 Jan 2021 23:47:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DKT48672jz3QmP; Mon, 18 Jan 2021 23:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C06EA1C269; Mon, 18 Jan 2021 23:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10INlq6M068559; Mon, 18 Jan 2021 23:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10INlqFl068558; Mon, 18 Jan 2021 23:47:52 GMT (envelope-from git) Date: Mon, 18 Jan 2021 23:47:52 GMT Message-Id: <202101182347.10INlqFl068558@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: 83bc72a04e0d - main - jail: Fix a stray mutex from 76ad42abf9d4. 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: 83bc72a04e0d1b6dab453707290e3eb36ef69d95 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2021 23:47:52 -0000 The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=83bc72a04e0d1b6dab453707290e3eb36ef69d95 commit 83bc72a04e0d1b6dab453707290e3eb36ef69d95 Author: Jamie Gritton AuthorDate: 2021-01-18 23:47:09 +0000 Commit: Jamie Gritton CommitDate: 2021-01-18 23:47:09 +0000 jail: Fix a stray mutex from 76ad42abf9d4. --- sys/kern/kern_jail.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index ba4c1aab0d85..4893e4df2781 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -1119,7 +1119,6 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) if (tpr != pr && tpr->pr_ref > 0 && !strcmp(tpr->pr_name + pnamelen, namelc)) { mtx_lock(&tpr->pr_mtx); - drflags |= PD_LOCKED; if (prison_isalive(tpr)) { if (pr == NULL && cuflags != JAIL_CREATE) { @@ -1128,6 +1127,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * for updates. */ pr = tpr; + drflags |= PD_LOCKED; break; } /* @@ -1136,6 +1136,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * active sibling jail. */ error = EEXIST; + mtx_unlock(&tpr->pr_mtx); vfs_opterror(opts, "jail \"%s\" already exists", name); @@ -1146,7 +1147,6 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) prison_isvalid(tpr)) deadpr = tpr; mtx_unlock(&tpr->pr_mtx); - drflags &= ~PD_LOCKED; } } /* If no active jail is found, use a dying one. */