From owner-svn-src-head@freebsd.org Sat Feb 17 00:23:57 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77112F20DCC; Sat, 17 Feb 2018 00:23:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2652E7AD19; Sat, 17 Feb 2018 00:23:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2134E14FFD; Sat, 17 Feb 2018 00:23:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1H0NvxE030440; Sat, 17 Feb 2018 00:23:57 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1H0Nvqi030439; Sat, 17 Feb 2018 00:23:57 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201802170023.w1H0Nvqi030439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 17 Feb 2018 00:23:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329421 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 329421 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Feb 2018 00:23:57 -0000 Author: mjg Date: Sat Feb 17 00:23:56 2018 New Revision: 329421 URL: https://svnweb.freebsd.org/changeset/base/329421 Log: Unref the prison after proctree is dropped. Modified: head/sys/kern/kern_exit.c Modified: head/sys/kern/kern_exit.c ============================================================================== --- head/sys/kern/kern_exit.c Sat Feb 17 00:23:28 2018 (r329420) +++ head/sys/kern/kern_exit.c Sat Feb 17 00:23:56 2018 (r329421) @@ -530,9 +530,6 @@ exit1(struct thread *td, int rval, int signo) PROC_LOCK(p); p->p_xthread = td; - /* Tell the prison that we are gone. */ - prison_proc_free(p->p_ucred->cr_prison); - #ifdef KDTRACE_HOOKS /* * Tell the DTrace fasttrap provider about the exit if it @@ -602,6 +599,9 @@ exit1(struct thread *td, int rval, int signo) } else PROC_LOCK(p->p_pptr); sx_xunlock(&proctree_lock); + + /* Tell the prison that we are gone. */ + prison_proc_free(p->p_ucred->cr_prison); /* * The state PRS_ZOMBIE prevents other proesses from sending