From owner-svn-src-head@freebsd.org Mon May 25 12:41:45 2020 Return-Path: Delivered-To: svn-src-head@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 F2FE92FE9AD; Mon, 25 May 2020 12:41:45 +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.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 49VxYP6Dv8z3ShF; Mon, 25 May 2020 12:41:45 +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 CFA2211EEB; Mon, 25 May 2020 12:41:45 +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 04PCfjxg038549; Mon, 25 May 2020 12:41:45 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04PCfji8038546; Mon, 25 May 2020 12:41:45 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202005251241.04PCfji8038546@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Mon, 25 May 2020 12:41:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361448 - in head/sys: kern sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: kern sys X-SVN-Commit-Revision: 361448 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.33 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: Mon, 25 May 2020 12:41:46 -0000 Author: mjg Date: Mon May 25 12:41:44 2020 New Revision: 361448 URL: https://svnweb.freebsd.org/changeset/base/361448 Log: proc: refactor clearing credentials into proc_unset_cred Modified: head/sys/kern/kern_exit.c head/sys/kern/kern_prot.c head/sys/sys/ucred.h Modified: head/sys/kern/kern_exit.c ============================================================================== --- head/sys/kern/kern_exit.c Mon May 25 12:37:45 2020 (r361447) +++ head/sys/kern/kern_exit.c Mon May 25 12:41:44 2020 (r361448) @@ -928,8 +928,7 @@ proc_reap(struct thread *td, struct proc *p, int *stat /* * Free credentials, arguments, and sigacts. */ - crfree(p->p_ucred); - proc_set_cred(p, NULL); + proc_unset_cred(p); pargs_drop(p->p_args); p->p_args = NULL; sigacts_free(p->p_sigacts); Modified: head/sys/kern/kern_prot.c ============================================================================== --- head/sys/kern/kern_prot.c Mon May 25 12:37:45 2020 (r361447) +++ head/sys/kern/kern_prot.c Mon May 25 12:41:44 2020 (r361448) @@ -2000,14 +2000,20 @@ proc_set_cred(struct proc *p, struct ucred *newcred) { MPASS(p->p_ucred != NULL); - if (newcred == NULL) - MPASS(p->p_state == PRS_ZOMBIE); - else - PROC_LOCK_ASSERT(p, MA_OWNED); - + PROC_LOCK_ASSERT(p, MA_OWNED); p->p_ucred = newcred; - if (newcred != NULL) - PROC_UPDATE_COW(p); + PROC_UPDATE_COW(p); +} + +void +proc_unset_cred(struct proc *p) +{ + struct ucred *cr; + + MPASS(p->p_state == PRS_ZOMBIE); + cr = p->p_ucred; + p->p_ucred = NULL; + crfree(cr); } struct ucred * Modified: head/sys/sys/ucred.h ============================================================================== --- head/sys/sys/ucred.h Mon May 25 12:37:45 2020 (r361447) +++ head/sys/sys/ucred.h Mon May 25 12:41:44 2020 (r361448) @@ -113,6 +113,7 @@ struct ucred *crdup(struct ucred *cr); void crextend(struct ucred *cr, int n); void proc_set_cred_init(struct proc *p, struct ucred *cr); void proc_set_cred(struct proc *p, struct ucred *cr); +void proc_unset_cred(struct proc *p); void crfree(struct ucred *cr); struct ucred *crget(void); struct ucred *crhold(struct ucred *cr);