 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmc.c,v 1.7 2017/05/23 08:54:39 nonaka Exp $	*/
+/*	$NetBSD: pmc.c,v 1.8 2017/06/14 17:48:40 maxv Exp $	*/
 /*
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * 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.
 @@ -57,33 +57,34 @@
  * 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.
  */
 /*
  * Interface to x86 CPU Performance Counters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.7 2017/05/23 08:54:39 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.8 2017/06/14 17:48:40 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
 #include <sys/xcall.h>
 #include <sys/kauth.h>
 #include <machine/cpufunc.h>
 #include <machine/cpuvar.h>
 #include <machine/specialreg.h>
 #include <machine/sysarch.h>
 #include <machine/pmc.h>
 #include <machine/cpu_counter.h>
 #include <machine/cputypes.h>
 #include <machine/i82489reg.h>
 #include <machine/i82489var.h>
 #include <x86/nmi.h>
 @@ -315,45 +316,56 @@ pmc_init(void)
 				pmc_state[i].ctrmask = 0xFFFFFFFFFFFFULL;
+			}
+		}
+	}
 	pmc_nmi_handle = nmi_establish(pmc_nmi, NULL);
 	mutex_init(&pmc_lock, MUTEX_DEFAULT, IPL_NONE);
+}
 int
 sys_pmc_info(struct lwp *l, struct x86_pmc_info_args *uargs, register_t *retval)
+{
 	struct x86_pmc_info_args rv;
 	int error;
 	error = kauth_authorize_machdep(l->l_cred, KAUTH_MACHDEP_X86PMC,
 	    NULL, NULL, NULL, NULL);
 	if (error)
 		return error;
 	memset(&rv, 0, sizeof(rv));
 	rv.vers = PMC_VERSION;
 	rv.type = pmc_type;
 	rv.nctrs = pmc_ncounters;
 	return copyout(&rv, uargs, sizeof(rv));
+}
 int
 sys_pmc_startstop(struct lwp *l, struct x86_pmc_startstop_args *uargs,
     register_t *retval)
+{
 	struct x86_pmc_startstop_args args;
 	pmc_state_t *pmc;
 	bool start;
 	int error;
 	error = kauth_authorize_machdep(l->l_cred, KAUTH_MACHDEP_X86PMC,
 	    NULL, NULL, NULL, NULL);
 	if (error)
 		return error;
 	if (pmc_type == PMC_TYPE_NONE)
 		return ENODEV;
 	error = copyin(uargs, &args, sizeof(args));
 	if (error)
 		return error;
 	if (args.counter >= pmc_ncounters)
 		return EINVAL;
 	start = (args.flags & (PMC_SETUP_KERNEL|PMC_SETUP_USER)) != 0;
 	pmc = &pmc_state[args.counter];
 @@ -376,26 +388,31 @@ sys_pmc_startstop(struct lwp *l, struct
 	mutex_exit(&pmc_lock);
 	return 0;
+}
 int
 sys_pmc_read(struct lwp *l, struct x86_pmc_read_args *uargs, register_t *retval)
+{
 	struct x86_pmc_read_args args;
 	pmc_state_t *pmc;
 	size_t nval;
 	int error;
 	error = kauth_authorize_machdep(l->l_cred, KAUTH_MACHDEP_X86PMC,
 	    NULL, NULL, NULL, NULL);
 	if (error)
 		return error;
 	if (pmc_type == PMC_TYPE_NONE)
 		return ENODEV;
 	error = copyin(uargs, &args, sizeof(args));
 	if (error)
 		return error;
 	if (args.counter >= pmc_ncounters)
 		return EINVAL;
 	if (args.values == NULL)
 		return EINVAL;
 	nval = MIN(ncpu, args.nval);

 @@ -1,14 +1,14 @@
-/* $NetBSD: secmodel_suser.c,v 1.42 2015/08/17 06:16:03 knakahara Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.43 2017/06/14 17:48:41 maxv Exp $ */
 /*-
  * Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
  * 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.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -28,27 +28,27 @@
 /*
  * This file contains kauth(9) listeners needed to implement the traditional
  * NetBSD superuser access restrictions.
+ *
  * There are two main resources a request can be issued to: user-owned and
  * system owned. For the first, traditional Unix access checks are done, as
  * well as superuser checks. If needed, the request context is examined before
  * a decision is made. For the latter, usually only superuser checks are done
  * as normal users are not allowed to access system resources.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.42 2015/08/17 06:16:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.43 2017/06/14 17:48:41 maxv Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kauth.h>
 #include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/module.h>
 @@ -824,72 +824,73 @@ secmodel_suser_network_cb(kauth_cred_t c
+}
 /*
  * kauth(9) listener
+ *
  * Security model: Traditional NetBSD
  * Scope: Machdep
  * Responsibility: Superuser access
  */
 int
 secmodel_suser_machdep_cb(kauth_cred_t cred, kauth_action_t action,
     void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
+{
-        bool isroot;
+	bool isroot;
-        int result;
+	int result;
-        isroot = suser_isroot(cred);
+	isroot = suser_isroot(cred);
-        result = KAUTH_RESULT_DEFER;
+	result = KAUTH_RESULT_DEFER;
-        switch (action) {
+	switch (action) {
 	case KAUTH_MACHDEP_CPU_UCODE_APPLY:
 	case KAUTH_MACHDEP_IOPERM_GET:
 	case KAUTH_MACHDEP_LDT_GET:
 	case KAUTH_MACHDEP_LDT_SET:
 	case KAUTH_MACHDEP_MTRR_GET:
 	case KAUTH_MACHDEP_CACHEFLUSH:
 	case KAUTH_MACHDEP_IOPERM_SET:
 	case KAUTH_MACHDEP_IOPL:
 	case KAUTH_MACHDEP_MTRR_SET:
 	case KAUTH_MACHDEP_NVRAM:
 	case KAUTH_MACHDEP_UNMANAGEDMEM:
 	case KAUTH_MACHDEP_PXG:
 	case KAUTH_MACHDEP_X86PMC:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	default:
 		break;
+	}
 	return (result);
+}
 /*
  * kauth(9) listener
+ *
  * Security model: Traditional NetBSD
  * Scope: Device
  * Responsibility: Superuser access
  */
 int
 secmodel_suser_device_cb(kauth_cred_t cred, kauth_action_t action,
     void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
+{
-        bool isroot;
+	bool isroot;
-        int result;
+	int result;
-        isroot = suser_isroot(cred);
+	isroot = suser_isroot(cred);
-        result = KAUTH_RESULT_DEFER;
+	result = KAUTH_RESULT_DEFER;
 	switch (action) {
 	case KAUTH_DEVICE_BLUETOOTH_SETPRIV:
 	case KAUTH_DEVICE_BLUETOOTH_SEND:
 	case KAUTH_DEVICE_BLUETOOTH_RECV:
 	case KAUTH_DEVICE_TTY_OPEN:
 	case KAUTH_DEVICE_TTY_PRIVSET:
 	case KAUTH_DEVICE_TTY_STI:
 	case KAUTH_DEVICE_TTY_VIRTUAL:
 	case KAUTH_DEVICE_RND_ADDDATA:
 	case KAUTH_DEVICE_RND_ADDDATA_ESTIMATE:
 	case KAUTH_DEVICE_RND_GETPRIV:
 	case KAUTH_DEVICE_RND_SETPRIV:

 @@ -1,14 +1,14 @@
-/* $NetBSD: kauth.h,v 1.73 2015/10/06 22:13:39 christos Exp $ */
+/* $NetBSD: kauth.h,v 1.74 2017/06/14 17:48:41 maxv Exp $ */
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat <elad@NetBSD.org>
  * 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.
 @@ -311,26 +311,27 @@ enum kauth_network_req {
 enum {
 	KAUTH_MACHDEP_CACHEFLUSH=1,
 	KAUTH_MACHDEP_CPU_UCODE_APPLY,
 	KAUTH_MACHDEP_IOPERM_GET,
 	KAUTH_MACHDEP_IOPERM_SET,
 	KAUTH_MACHDEP_IOPL,
 	KAUTH_MACHDEP_LDT_GET,
 	KAUTH_MACHDEP_LDT_SET,
 	KAUTH_MACHDEP_MTRR_GET,
 	KAUTH_MACHDEP_MTRR_SET,
 	KAUTH_MACHDEP_NVRAM,
 	KAUTH_MACHDEP_UNMANAGEDMEM,
 	KAUTH_MACHDEP_PXG,
 	KAUTH_MACHDEP_X86PMC
 };
 /*
  * Device scope - actions.
  */
 enum {
 	KAUTH_DEVICE_TTY_OPEN=1,
 	KAUTH_DEVICE_TTY_PRIVSET,
 	KAUTH_DEVICE_TTY_STI,
 	KAUTH_DEVICE_RAWIO_SPEC,
 	KAUTH_DEVICE_RAWIO_PASSTHRU,
 	KAUTH_DEVICE_BLUETOOTH_SETPRIV,
 	KAUTH_DEVICE_RND_ADDDATA,