From owner-dev-commits-src-all@freebsd.org Thu Dec 31 23:19:02 2020 Return-Path: Delivered-To: dev-commits-src-all@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 595DF4D44DD; Thu, 31 Dec 2020 23:19: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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6PHB23glz4Wvy; Thu, 31 Dec 2020 23:19:02 +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 39C3818CCF; Thu, 31 Dec 2020 23:19:02 +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 0BVNJ2vY032963; Thu, 31 Dec 2020 23:19:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BVNJ2rI032962; Thu, 31 Dec 2020 23:19:02 GMT (envelope-from git) Date: Thu, 31 Dec 2020 23:19:02 GMT Message-Id: <202012312319.0BVNJ2rI032962@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: b4e87a632955 - main - jail: Clean up allprison_lock handing in kern_jail_set 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: b4e87a632955a3a10ef6031c3d3e51c64e410749 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2020 23:19:02 -0000 The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=b4e87a632955a3a10ef6031c3d3e51c64e410749 commit b4e87a632955a3a10ef6031c3d3e51c64e410749 Author: Jamie Gritton AuthorDate: 2020-12-31 23:18:43 +0000 Commit: Jamie Gritton CommitDate: 2020-12-31 23:18:43 +0000 jail: Clean up allprison_lock handing in kern_jail_set Keep explicit track of the allprison_lock state during the final part of kern_jail_set, instead of deducing it from the JAIL_ATTACH flag. Also properly clean up when the attachment fails, fixing a long- standing (though minor) memory leak. --- sys/kern/kern_jail.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index fb77cf87126d..1ecb023717bd 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -526,7 +526,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) #endif unsigned long hid; size_t namelen, onamelen, pnamelen; - int born, created, cuflags, descend, enforce; + int born, created, cuflags, descend, enforce, slocked; int error, errmsg_len, errmsg_pos; int gotchildmax, gotenforce, gothid, gotrsnum, gotslevel; int jid, jsys, len, level; @@ -1828,24 +1828,32 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) } /* Attach this process to the prison if requested. */ + slocked = PD_LIST_SLOCKED; if (flags & JAIL_ATTACH) { mtx_lock(&pr->pr_mtx); error = do_jail_attach(td, pr); + slocked = 0; if (error) { vfs_opterror(opts, "attach failed"); - if (!created) - prison_deref(pr, PD_DEREF); + if (born) { + sx_slock(&allprison_lock); + slocked = PD_LIST_SLOCKED; + (void)osd_jail_call(pr, PR_METHOD_REMOVE, NULL); + } + prison_deref(pr, created + ? slocked + : PD_DEREF | slocked); goto done_errmsg; } } #ifdef RACCT if (racct_enable && !created) { - if (!(flags & JAIL_ATTACH)) + if (slocked) { sx_sunlock(&allprison_lock); + slocked = 0; + } prison_racct_modify(pr); - if (!(flags & JAIL_ATTACH)) - sx_slock(&allprison_lock); } #endif @@ -1857,18 +1865,16 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * (which was not done earlier so that the prison would not be publicly * visible). */ - if (!created) { - prison_deref(pr, (flags & JAIL_ATTACH) - ? PD_DEREF - : PD_DEREF | PD_LIST_SLOCKED); - } else { + if (!created) + prison_deref(pr, PD_DEREF | slocked); + else { if (pr_flags & PR_PERSIST) { mtx_lock(&pr->pr_mtx); pr->pr_ref++; pr->pr_uref++; mtx_unlock(&pr->pr_mtx); } - if (!(flags & JAIL_ATTACH)) + if (slocked) sx_sunlock(&allprison_lock); }