 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_core.c,v 1.24 2016/07/07 06:55:43 msaitoh Exp $	*/
+/*	$NetBSD: kern_core.c,v 1.24.10.1 2022/09/09 18:24:20 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_sig.c	8.14 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_core.c,v 1.24 2016/07/07 06:55:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_core.c,v 1.24.10.1 2022/09/09 18:24:20 martin Exp $");
 #include <sys/param.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
 #include <sys/acct.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
 #include <sys/filedesc.h>
 #include <sys/kauth.h>
 #include <sys/module.h>
 @@ -85,104 +85,98 @@ coredump_modcmd(modcmd_t cmd, void *arg)
+	}
+}
 /*
  * Dump core, into a file named "progname.core" or "core" (depending on the
  * value of shortcorename), unless the process was setuid/setgid.
  */
 static int
 coredump(struct lwp *l, const char *pattern)
+{
 	struct vnode		*vp;
 	struct proc		*p;
 	struct vmspace		*vm;
-	kauth_cred_t		cred;
+	kauth_cred_t		cred = NULL;
 	struct pathbuf		*pb;
 	struct nameidata	nd;
 	struct vattr		vattr;
 	struct coredump_iostate	io;
 	struct plimit		*lim;
 	int			error, error1;
 	char			*name, *lastslash;
 	name = PNBUF_GET();
 	p = l->l_proc;
 	vm = p->p_vmspace;
 	mutex_enter(proc_lock);		/* p_session */
 	mutex_enter(p->p_lock);
 	/*
 	 * Refuse to core if the data + stack + user size is larger than
 	 * the core dump limit.  XXX THIS IS WRONG, because of mapped
 	 * data.
 	 */
 	if (USPACE + ctob(vm->vm_dsize + vm->vm_ssize) >=
 	    p->p_rlimit[RLIMIT_CORE].rlim_cur) {
 		error = EFBIG;		/* better error code? */
-		mutex_exit(p->p_lock);
+		goto release;
 		mutex_exit(proc_lock);
 		goto done;
+	}
 	/*
 	 * It may well not be curproc, so grab a reference to its current
 	 * credentials.
 	 */
 	kauth_cred_hold(p->p_cred);
 	cred = p->p_cred;
 	/*
 	 * Make sure the process has not set-id, to prevent data leaks,
 	 * unless it was specifically requested to allow set-id coredumps.
 	 */
 	if (p->p_flag & PK_SUGID) {
 		if (!security_setidcore_dump) {
 			error = EPERM;
-			mutex_exit(p->p_lock);
+			goto release;
 			mutex_exit(proc_lock);
 			goto done;
+		}
 		pattern = security_setidcore_path;
+	}
 	/* Lock, as p_limit and pl_corename might change. */
 	lim = p->p_limit;
 	mutex_enter(&lim->pl_lock);
 	if (pattern == NULL) {
 		pattern = lim->pl_corename;
+	}
 	error = coredump_buildname(p, name, pattern, MAXPATHLEN);
 	mutex_exit(&lim->pl_lock);
-	if (error) {
+	if (error)
-		mutex_exit(p->p_lock);
+		goto release;
 		mutex_exit(proc_lock);
 		goto done;
 	/*
 	 * On a simple filename, see if the filesystem allow us to write
 	 * core dumps there.
 	 */
 	lastslash = strrchr(name, '/');
 	if (!lastslash) {
 		vp = p->p_cwdi->cwdi_cdir;
 		if (vp->v_mount == NULL ||
 		    (vp->v_mount->mnt_flag & MNT_NOCOREDUMP) != 0)
 			error = EPERM;
+	}
 release:
 	mutex_exit(p->p_lock);
 	mutex_exit(proc_lock);
 	if (error)
 		goto done;
 	/*
 	 * On a complex filename, see if the filesystem allow us to write
 	 * core dumps there.
+	 *
 	 * XXX: We should have an API that avoids double lookups
 	 */
 	if (lastslash) {
 		char c[2];
 @@ -250,26 +244,28 @@ coredump(struct lwp *l, const char *patt
 	io.io_lwp = l;
 	io.io_vp = vp;
 	io.io_cred = cred;
 	io.io_offset = 0;
 	/* Now dump the actual core file. */
 	error = (*p->p_execsw->es_coredump)(l, &io);
  out:
 	VOP_UNLOCK(vp);
 	error1 = vn_close(vp, FWRITE, cred);
 	if (error == 0)
 		error = error1;
 done:
 	if (cred != NULL)
 		kauth_cred_free(cred);
 	if (name != NULL)
 		PNBUF_PUT(name);
 	return error;
+}
 static int
 coredump_buildname(struct proc *p, char *dst, const char *src, size_t len)
+{
 	const char	*s;
 	char		*d, *end;
 	int		i;
 	KASSERT(mutex_owned(proc_lock));