 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_proc.c,v 1.258 2020/08/28 21:39:56 riastradh Exp $	*/
+/*	$NetBSD: kern_proc.c,v 1.259 2020/08/28 22:27:51 riastradh Exp $	*/
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -52,27 +52,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_proc.c	8.7 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.258 2020/08/28 21:39:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.259 2020/08/28 22:27:51 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
 #include "opt_maxuprc.h"
 #include "opt_dtrace.h"
 #include "opt_compat_netbsd32.h"
 #include "opt_kaslr.h"
 #endif
 #if defined(__HAVE_COMPAT_NETBSD32) && !defined(COMPAT_NETBSD32) \
     && !defined(_RUMPKERNEL)
 #define COMPAT_NETBSD32
 #endif
 @@ -2566,42 +2566,42 @@ done:
 	kmem_free(argv, PAGE_SIZE);
 	kmem_free(arg, PAGE_SIZE);
 	uvmspace_free(vmspace);
 	return error;
+}
 /*
  * Fill in a proc structure for the specified process.
  */
 static void
 fill_proc(const struct proc *psrc, struct proc *p, bool allowaddr)
+{
 	COND_SET_STRUCT(p->p_list, psrc->p_list, allowaddr);
-	memset(&p->p_auxlock, 0, allowaddr);
+	memset(&p->p_auxlock, 0, sizeof(p->p_auxlock));
 	COND_SET_STRUCT(p->p_lock, psrc->p_lock, allowaddr);
-	memset(&p->p_stmutex, 0, allowaddr);
+	memset(&p->p_stmutex, 0, sizeof(p->p_stmutex));
-	memset(&p->p_reflock, 0, allowaddr);
+	memset(&p->p_reflock, 0, sizeof(p->p_reflock));
 	COND_SET_STRUCT(p->p_waitcv, psrc->p_waitcv, allowaddr);
 	COND_SET_STRUCT(p->p_lwpcv, psrc->p_lwpcv, allowaddr);
 	COND_SET_PTR(p->p_cred, psrc->p_cred, allowaddr);
 	COND_SET_PTR(p->p_fd, psrc->p_fd, allowaddr);
 	COND_SET_PTR(p->p_cwdi, psrc->p_cwdi, allowaddr);
 	COND_SET_PTR(p->p_stats, psrc->p_stats, allowaddr);
 	COND_SET_PTR(p->p_limit, psrc->p_limit, allowaddr);
 	COND_SET_PTR(p->p_vmspace, psrc->p_vmspace, allowaddr);
 	COND_SET_PTR(p->p_sigacts, psrc->p_sigacts, allowaddr);
 	COND_SET_PTR(p->p_aio, psrc->p_aio, allowaddr);
 	p->p_mqueue_cnt = psrc->p_mqueue_cnt;
-	memset(&p->p_specdataref, 0, allowaddr);
+	memset(&p->p_specdataref, 0, sizeof(p->p_specdataref));
 	p->p_exitsig = psrc->p_exitsig;
 	p->p_flag = psrc->p_flag;
 	p->p_sflag = psrc->p_sflag;
 	p->p_slflag = psrc->p_slflag;
 	p->p_lflag = psrc->p_lflag;
 	p->p_stflag = psrc->p_stflag;
 	p->p_stat = psrc->p_stat;
 	p->p_trace_enabled = psrc->p_trace_enabled;
 	p->p_pid = psrc->p_pid;
 	COND_SET_STRUCT(p->p_pglist, psrc->p_pglist, allowaddr);
 	COND_SET_PTR(p->p_pptr, psrc->p_pptr, allowaddr);
 	COND_SET_STRUCT(p->p_sibling, psrc->p_sibling, allowaddr);
 	COND_SET_STRUCT(p->p_children, psrc->p_children, allowaddr);