 @@ -1,14 +1,14 @@
-/*	$NetBSD: init_main.c,v 1.528 2020/08/26 22:56:55 christos Exp $	*/
+/*	$NetBSD: init_main.c,v 1.529 2020/08/27 14:01:36 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -87,27 +87,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.
+ *
  *	@(#)init_main.c	8.16 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.528 2020/08/26 22:56:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.529 2020/08/27 14:01:36 riastradh Exp $");
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_modular.h"
 #include "opt_ntp.h"
 #include "opt_pipe.h"
 #include "opt_syscall_debug.h"
 #include "opt_sysv.h"
 #include "opt_fileassoc.h"
 #include "opt_ktrace.h"
 #include "opt_pax.h"
 #include "opt_compat_netbsd.h"
 @@ -218,28 +218,26 @@ extern void *_binary_splash_image_end;
 #include <uvm/uvm.h>	/* extern struct uvm uvm */
 #include <dev/cons.h>
 #include <dev/splash/splash.h>
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/pfil.h>
 #include <net/raw_cb.h>
 #include <net/if_llatbl.h>
 #include <prop/proplib.h>
 #include <crypto/blake2/blake2s.h>
 #include <sys/userconf.h>
 extern struct lwp lwp0;
 extern time_t rootfstime;
 #ifndef curlwp
 struct	lwp *curlwp = &lwp0;
 #endif
 struct	proc *initproc;
 struct	vnode *rootvp, *swapdev_vp;
 int	boothowto;
 int	cold __read_mostly = 1;		/* still working on startup */
 @@ -722,44 +720,26 @@ main(void)
 	/*
 	 * Okay, now we can let init(8) exec!  It's off to userland!
 	 */
 	mutex_enter(&proc_lock);
 	start_init_exec = 1;
 	cv_broadcast(&lbolt);
 	mutex_exit(&proc_lock);
 	/* The scheduler is an infinite loop. */
 	uvm_scheduler();
 	/* NOTREACHED */
+}
 static uint8_t address_key[32];	/* key used in address hashing */
 static ONCE_DECL(random_inithook);
 static int
 random_address_init(void)
 	cprng_strong(kern_cprng, address_key, sizeof(address_key), 0);
 	return 0;
 void
 hash_value(void *d, size_t ds, const void *s, size_t ss)
 	RUN_ONCE(&random_inithook, random_address_init);
 	blake2s(d, ds, address_key, sizeof(address_key), s, ss);
 /*
  * Configure the system's hardware.
  */
 static void
 configure(void)
+{
 	/*
 	 * XXX
 	 * callout_setfunc() requires mutex(9) so it can't be in config_init()
 	 * on amiga and atari which use config_init() and autoconf(9) fucntions
 	 * to initialize console devices.
 	 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_sysctl.c,v 1.264 2019/07/03 17:31:32 maxv Exp $	*/
+/*	$NetBSD: kern_sysctl.c,v 1.265 2020/08/27 14:01:36 riastradh Exp $	*/
 /*-
  * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -58,47 +58,51 @@
  * 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_sysctl.c	8.9 (Berkeley) 5/20/95
  */
 /*
  * sysctl system call.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.264 2019/07/03 17:31:32 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.265 2020/08/27 14:01:36 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_defcorename.h"
 #endif
 #include "ksyms.h"
 #include <sys/param.h>
 #define __COMPAT_SYSCTL
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/ksyms.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/cprng.h>
 #include <sys/once.h>
 #include <sys/syscallargs.h>
 #include <sys/kauth.h>
 #include <sys/ktrace.h>
 #include <sys/rndsource.h>
 #include <crypto/blake2/blake2s.h>
 #define	MAXDESCLEN	1024
 MALLOC_DEFINE(M_SYSCTLNODE, "sysctlnode", "sysctl node structures");
 MALLOC_DEFINE(M_SYSCTLDATA, "sysctldata", "misc sysctl data");
 static int sysctl_mmap(SYSCTLFN_PROTO);
 static int sysctl_alloc(struct sysctlnode *, int);
 static int sysctl_realloc(struct sysctlnode *);
 static int sysctl_cvt_in(struct lwp *, int *, const void *, size_t,
 			 struct sysctlnode *);
 static int sysctl_cvt_out(struct lwp *, int, const struct sysctlnode *,
 			  void *, size_t, size_t *);
 @@ -2806,13 +2810,31 @@ sysctl_cvt_out(struct lwp *l, int v, con
+	}
 	if (ovp != NULL && left >= sz) {
 		error = sysctl_copyout(l, src, ovp, sz);
 		if (error)
 			return (error);
+	}
 	if (szp != NULL)
 		*szp = sz;
 	return (0);
+}
 static uint8_t address_key[32];	/* key used in address hashing */
 static ONCE_DECL(random_inithook);
 static int
 random_address_init(void)
+{
 	cprng_strong(kern_cprng, address_key, sizeof(address_key), 0);
 	return 0;
+}
 void
 hash_value(void *d, size_t ds, const void *s, size_t ss)
+{
 	RUN_ONCE(&random_inithook, random_address_init);
 	blake2s(d, ds, address_key, sizeof(address_key), s, ss);
+}

 @@ -1,22 +1,21 @@
-#	$NetBSD: Makefile,v 1.20 2020/08/26 15:49:56 riastradh Exp $
+#	$NetBSD: Makefile,v 1.21 2020/08/27 14:01:36 riastradh Exp $
+#
 SODIUM_IMPORTDIR=${.CURDIR}/../../../../external/isc/libsodium
 SODIUM_DIR=${.CURDIR}/../../../../external/isc/libsodium/dist/src/libsodium
 .PATH:	${.CURDIR}/../../../../crypto/adiantum				\
 	${.CURDIR}/../../../../crypto/aes				\
 	${.CURDIR}/../../../../crypto/blake2				\
 	${.CURDIR}/../../../../crypto/blowfish				\
 	${.CURDIR}/../../../../crypto/camellia				\
 	${.CURDIR}/../../../../crypto/cast128				\
 	${.CURDIR}/../../../../crypto/des				\
 	${.CURDIR}/../../../../crypto/skipjack				\
 	${SODIUM_DIR}/crypto_scalarmult/curve25519/ref10		\
 	${SODIUM_DIR}/crypto_scalarmult/curve25519			\
 	${SODIUM_DIR}/crypto_scalarmult					\
 	${SODIUM_DIR}/crypto_onetimeauth/poly1305/donna			\
 	${SODIUM_DIR}/crypto_onetimeauth/poly1305			\
 	${SODIUM_DIR}/crypto_onetimeauth				\
 	${SODIUM_DIR}/crypto_stream/chacha20/ref			\
 	${SODIUM_DIR}/crypto_stream/chacha20				\
 @@ -47,29 +46,26 @@ SRCS+=	bf_ecb.c bf_enc.c bf_cbc.c bf_ske
 # camellia
 SRCS+=  camellia.c camellia-api.c
 # cast128
 SRCS+=	cast128.c
 # DES
 SRCS+=	des_ecb.c des_setkey.c des_enc.c des_cbc.c des_module.c
 # skipjack
 SRCS+=	skipjack.c
 # BLAKE2
 SRCS+=	blake2s.c
 # libsodium
 SODIUM_CPPFLAGS+=	-I${SODIUM_IMPORTDIR}/include
 SODIUM_CPPFLAGS+=	-I${SODIUM_IMPORTDIR}/dist/src/libsodium/include/sodium
 #SODIUM_CPPFLAGS+=	-DHAVE_TI_MODE
 SODIUM_CWARNFLAGS+=	-Wno-shadow
 SODIUM_CWARNFLAGS+=	-Wno-unused-function
 SODIUM_CWARNFLAGS+=	-Wno-unused-variable
 SODIUM_SRCS+=	x25519_ref10.c
 SODIUM_SRCS+=	scalarmult_curve25519.c
 SODIUM_SRCS+=	crypto_scalarmult.c

 @@ -1,31 +1,32 @@
-#	$NetBSD: Makefile.rumpkern,v 1.185 2020/08/14 00:53:16 riastradh Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.186 2020/08/27 14:01:36 riastradh Exp $
+#
 IOCONFDIR:=	${.PARSEDIR}
 IOCONF=		MAINBUS.ioconf
 LIB=		rump
 COMMENT=	Rump kernel base
 MAN=		rump.3 rump_lwproc.3
 .PATH:	${RUMPTOP}/librump/rumpkern				\
 	${RUMPTOP}/librump/rumpkern/arch/generic		\
 	${RUMPTOP}/../kern					\
 	${RUMPTOP}/../uvm					\
 	${RUMPTOP}/../conf					\
 	${RUMPTOP}/../dev					\
 	${RUMPTOP}/../crypto/nist_hash_drbg			\
 	${RUMPTOP}/../crypto/blake2				\
 	${RUMPTOP}/../crypto/cprng_fast				\
 	${RUMPTOP}/../crypto/chacha				\
 	${RUMPTOP}/../secmodel					\
 	${RUMPTOP}/../secmodel/suser				\
 	${RUMPTOP}/../compat/common
+#
 # Source modules, first the ones specifically implemented for librump.
+#
 SRCS+=	rump.c rumpcopy.c cons.c emul.c etfs_wrap.c intr.c	\
 	lwproc.c klock.c kobj_rename.c ltsleep.c scheduler.c	\
 	signals.c sleepq.c threads.c vm.c hyperentropy.c	\
 	accessors.c
 @@ -152,26 +153,30 @@ SRCS+=	vnode_if.c
 # sys/dev
 SRCS+=	clock_subr.c
 # sys/dev/crypto
 # Note: these are here only for cprng.  More crypto algos for drivers
 # are available from the rumpkern_crypto component
 SRCS+=	nist_hash_drbg.c
 SRCS+=	cprng_fast.c
 SRCS+=	chacha_impl.c
 SRCS+=	chacha_ref.c
 SRCS+=	chacha_selftest.c
 # BLAKE2
 # for hash_address
 SRCS+=	blake2s.c
 .include "${RUMPTOP}/Makefile.rump"
 .include <bsd.own.mk>
 # compat
 .if !empty(RUMP_NBCOMPAT:M50)
 SRCS+=	kern_select_50.c
 SRCS+=	kern_time_50.c
 SRCS+=	rndpseudo_50.c
 .endif
 .ifdef RUMP_LOCKDEBUG
 SRCS+=		subr_lockdebug.c