CVS commit: src/sys/dev/usb

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Sep  5 05:03:02 UTC 2017

Modified Files:
src/sys/dev/usb: ugen.c

Log Message:
remove redundant checks against sc and sc->sc_dying.
check sc_dying in more places.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/dev/usb/ugen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.134 src/sys/dev/usb/ugen.c:1.135
--- src/sys/dev/usb/ugen.c:1.134	Thu Jul  7 06:55:42 2016
+++ src/sys/dev/usb/ugen.c	Tue Sep  5 05:03:02 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ugen.c,v 1.134 2016/07/07 06:55:42 msaitoh Exp $	*/
+/*	$NetBSD: ugen.c,v 1.135 2017/09/05 05:03:02 mrg Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.134 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.135 2017/09/05 05:03:02 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -366,15 +366,12 @@ ugenopen(dev_t dev, int flag, int mode, 
 	int i, j;
 
 	sc = device_lookup_private(_cd, unit);
-	if (sc == NULL)
+	if (sc == NULL || sc->sc_dying)
 		return ENXIO;
 
 	DPRINTFN(5, ("ugenopen: flag=%d, mode=%d, unit=%d endpt=%d\n",
 		 flag, mode, unit, endpt));
 
-	if (sc == NULL || sc->sc_dying)
-		return ENXIO;
-
 	/* The control endpoint allows multiple opens. */
 	if (endpt == USB_CONTROL_ENDPOINT) {
 		sc->sc_is_open[USB_CONTROL_ENDPOINT] = 1;
@@ -513,7 +510,7 @@ ugenclose(dev_t dev, int flag, int mode,
 	int i;
 
 	sc = device_lookup_private(& ugen_cd, UGENUNIT(dev));
-	if (sc == NULL)
+	if (sc == NULL || sc->sc_dying)
 		return ENXIO;
 
 	DPRINTFN(5, ("ugenclose: flag=%d, mode=%d, unit=%d, endpt=%d\n",
@@ -589,9 +586,6 @@ ugen_do_read(struct ugen_softc *sc, int 
 
 	DPRINTFN(5, ("%s: ugenread: %d\n", device_xname(sc->sc_dev), endpt));
 
-	if (sc->sc_dying)
-		return EIO;
-
 	if (endpt == USB_CONTROL_ENDPOINT)
 		return ENODEV;
 
@@ -801,7 +795,7 @@ ugenread(dev_t dev, struct uio *uio, int
 	int error;
 
 	sc = device_lookup_private(& ugen_cd, UGENUNIT(dev));
-	if (sc == NULL)
+	if (sc == NULL || sc->sc_dying)
 		return ENXIO;
 
 	mutex_enter(>sc_lock);
@@ -832,9 +826,6 @@ ugen_do_write(struct ugen_softc *sc, int
 
 	DPRINTFN(5, ("%s: ugenwrite: %d\n", device_xname(sc->sc_dev), endpt));
 
-	if (sc->sc_dying)
-		return EIO;
-
 	if (endpt == USB_CONTROL_ENDPOINT)
 		return ENODEV;
 
@@ -995,7 +986,7 @@ ugenwrite(dev_t dev, struct uio *uio, in
 	int error;
 
 	sc = device_lookup_private(& ugen_cd, UGENUNIT(dev));
-	if (sc == NULL)
+	if (sc == NULL || sc->sc_dying)
 		return ENXIO;
 
 	mutex_enter(>sc_lock);
@@ -1830,7 +1821,7 @@ ugenioctl(dev_t dev, u_long cmd, void *a
 	int error;
 
 	sc = device_lookup_private(& ugen_cd, UGENUNIT(dev));
-	if (sc == NULL)
+	if (sc == NULL || sc->sc_dying)
 		return ENXIO;
 
 	sc->sc_refcnt++;
@@ -1954,6 +1945,10 @@ static int
 filt_ugenread_intr(struct knote *kn, long hint)
 {
 	struct ugen_endpoint *sce = kn->kn_hook;
+	struct ugen_softc *sc = sce->sc;
+
+	if (sc->sc_dying)
+		return 0;
 
 	kn->kn_data = sce->q.c_cc;
 	return kn->kn_data > 0;
@@ -1963,6 +1958,10 @@ static int
 filt_ugenread_isoc(struct knote *kn, long hint)
 {
 	struct ugen_endpoint *sce = kn->kn_hook;
+	struct ugen_softc *sc = sce->sc;
+
+	if (sc->sc_dying)
+		return 0;
 
 	if (sce->cur == sce->fill)
 		return 0;
@@ -1980,6 +1979,10 @@ static int
 filt_ugenread_bulk(struct knote *kn, long hint)
 {
 	struct ugen_endpoint *sce = kn->kn_hook;
+	struct ugen_softc *sc = sce->sc;
+
+	if (sc->sc_dying)
+		return 0;
 
 	if (!(sce->state & UGEN_BULK_RA))
 		/*
@@ -2001,6 +2004,10 @@ static int
 filt_ugenwrite_bulk(struct knote *kn, long hint)
 {
 	struct ugen_endpoint *sce = kn->kn_hook;
+	struct ugen_softc *sc = sce->sc;
+
+	if (sc->sc_dying)
+		return 0;
 
 	if (!(sce->state & UGEN_BULK_WB))
 		/*
@@ -2038,10 +2045,7 @@ ugenkqfilter(dev_t dev, struct knote *kn
 	struct klist *klist;
 
 	sc = device_lookup_private(_cd, UGENUNIT(dev));
-	if (sc == NULL)
-		return ENXIO;
-
-	if (sc->sc_dying)
+	if (sc == NULL || sc->sc_dying)
 		return ENXIO;
 
 	if (UGENENDPOINT(dev) == USB_CONTROL_ENDPOINT)

CVS commit: src/sys/dev/usb

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Sep  5 05:03:02 UTC 2017

Modified Files:
src/sys/dev/usb: ugen.c

Log Message:
remove redundant checks against sc and sc->sc_dying.
check sc_dying in more places.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/dev/usb/ugen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 20:47:59 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
257


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.55 src/doc/CHANGES-8.0:1.1.2.56
--- src/doc/CHANGES-8.0:1.1.2.55	Mon Sep  4 16:11:37 2017
+++ src/doc/CHANGES-8.0	Mon Sep  4 20:47:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.55 2017/09/04 16:11:37 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.56 2017/09/04 20:47:59 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -5777,3 +5777,13 @@ sys/arch/sparc64/sparc64/compat_13_machd
 	in %pstate and get kernel privileges on the hardware.
 	[maxv, ticket #264]
 
+sys/arch/amd64/amd64/copy.S			1.21-1.24
+sys/arch/amd64/amd64/locore.S			1.125
+sys/arch/amd64/amd64/machdep.c			1.256
+sys/compat/linux/arch/amd64/linux_machdep.c	1.52
+
+	Properly clear l_md.md_flags when launching a binary, fix the
+	return value of ucas_32 and ucas_64, and reorder some code to
+	reduce the diff with SMAP.
+	[maxv, ticket #257]
+

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 20:47:59 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
257


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-8] src/sys

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 20:41:28 UTC 2017

Modified Files:
src/sys/arch/amd64/amd64 [netbsd-8]: copy.S locore.S machdep.c
src/sys/compat/linux/arch/amd64 [netbsd-8]: linux_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #257):
sys/compat/linux/arch/amd64/linux_machdep.c: 1.52
sys/arch/amd64/amd64/copy.S: 1.21-1.24
sys/arch/amd64/amd64/locore.S: 1.125
sys/arch/amd64/amd64/machdep.c: 1.256
Fix a bug in ucas_32 and ucas_64. There is a branch where they don't
initialize %rax.
--
style, reduces an incoming diff
00
Split comment, otherwise it is misleading. kcopy operates on kernel
memory, and must *not* be used with userland pages.
--
Move incq outside of the copy section. No functional change, reduces
my smap diff.
--
Remove dumb debug code and outdated comment.
--
Don't forget to clean l_md.md_flags, otherwise there may be MDL_COMPAT32,
in which case the kernel would always use iret (slower).


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.10.1 src/sys/arch/amd64/amd64/copy.S
cvs rdiff -u -r1.123.6.1 -r1.123.6.2 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.255 -r1.255.6.1 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.51 -r1.51.6.1 \
src/sys/compat/linux/arch/amd64/linux_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/amd64/copy.S
diff -u src/sys/arch/amd64/amd64/copy.S:1.20 src/sys/arch/amd64/amd64/copy.S:1.20.10.1
--- src/sys/arch/amd64/amd64/copy.S:1.20	Wed Dec  9 16:55:18 2015
+++ src/sys/arch/amd64/amd64/copy.S	Mon Sep  4 20:41:28 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: copy.S,v 1.20 2015/12/09 16:55:18 maxv Exp $	*/
+/*	$NetBSD: copy.S,v 1.20.10.1 2017/09/04 20:41:28 snj Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -44,8 +44,8 @@
 #include 
 
 #define GET_CURPCB(reg)	\
-	movq	CPUVAR(CURLWP), reg; \
-	movq	L_PCB(reg), reg
+	movq	CPUVAR(CURLWP),reg; \
+	movq	L_PCB(reg),reg
 
 /*
  * These are arranged so that the abnormal case is a forwards
@@ -55,10 +55,10 @@
 #define DEFERRED_SWITCH_CHECK \
 	CHECK_DEFERRED_SWITCH			; \
 	jnz	99f; \
-98:
+98:
 
 #define DEFERRED_SWITCH_CALL \
-99:		; \
+99:		; \
 	call	_C_LABEL(do_pmap_load)		; \
 	jmp	98b
 
@@ -85,18 +85,18 @@ ENTRY(do_pmap_load)
 	pushq	%rdx
 	pushq	%rcx
 	pushq	%rbx
-	movq	CPUVAR(CURLWP), %rbx
+	movq	CPUVAR(CURLWP),%rbx
 1:
 	incl	L_NOPREEMPT(%rbx)
 	call	_C_LABEL(pmap_load)
 	decl	L_NOPREEMPT(%rbx)
 	jnz	2f
-	cmpl	$0, L_DOPREEMPT(%rbx)
+	cmpl	$0,L_DOPREEMPT(%rbx)
 	jz	2f
-	xorq	%rdi, %rdi
+	xorq	%rdi,%rdi
 	call	_C_LABEL(kpreempt)
 2:
-	cmpl	$0, CPUVAR(WANT_PMAPLOAD)
+	cmpl	$0,CPUVAR(WANT_PMAPLOAD)
 	jnz	1b
 	popq	%rbx
 	popq	%rcx
@@ -107,9 +107,6 @@ ENTRY(do_pmap_load)
 	ret
 
 /*
- * int kcopy(const void *from, void *to, size_t len);
- * Copy len bytes, abort on fault.
- *
  * Copy routines from and to userland, plus a few more. See the
  * section 9 manpages for info. Some cases can be optimized more.
  *
@@ -125,6 +122,10 @@ ENTRY(do_pmap_load)
  * be ably to do cache-line size copies
  */
 
+/*
+ * int kcopy(const void *from, void *to, size_t len);
+ * Copy len bytes from and to kernel memory, and abort on fault.
+ */
 ENTRY(kcopy)
 	xchgq	%rdi,%rsi
 	movq	%rdx,%rcx
@@ -194,6 +195,7 @@ ENTRY(copyout)
 	rep
 	movsb/* copy remaining bytes */
 .Lcopyout_end:
+
 	xorl	%eax,%eax
 	ret
 	DEFERRED_SWITCH_CALL
@@ -221,6 +223,7 @@ ENTRY(copyin)
 	rep
 	movsb
 .Lcopyin_end:
+
 	xorl	%eax,%eax
 	ret
 	DEFERRED_SWITCH_CALL
@@ -256,9 +259,9 @@ ENTRY(copyoutstr)
 	jae	1f
 	movq	%rax,%rdx
 	movq	%rax,%r8
-.Lcopyoutstr_start:
 1:	incq	%rdx
 
+.Lcopyoutstr_start:
 1:	decq	%rdx
 	jz	2f
 	lodsb
@@ -266,6 +269,7 @@ ENTRY(copyoutstr)
 	testb	%al,%al
 	jnz	1b
 .Lcopyoutstr_end:
+
 	/* Success -- 0 byte reached. */
 	decq	%rdx
 	xorq	%rax,%rax
@@ -295,9 +299,9 @@ ENTRY(copyinstr)
 	jae	1f
 	movq	%rax,%rdx
 	movq	%rax,%r8
-.Lcopyinstr_start:
 1:	incq	%rdx
 
+.Lcopyinstr_start:
 1:	decq	%rdx
 	jz	2f
 	lodsb
@@ -363,7 +367,7 @@ ENTRY(copystr)
 
 
 ENTRY(fuswintr)
-	cmpl	$TLBSTATE_VALID, CPUVAR(TLBSTATE)
+	cmpl	$TLBSTATE_VALID,CPUVAR(TLBSTATE)
 	jnz	_C_LABEL(fusuaddrfault)
 	movq	$VM_MAXUSER_ADDRESS-2,%r11
 	cmpq	%r11,%rdi
@@ -371,7 +375,9 @@ ENTRY(fuswintr)
 	GET_CURPCB(%rcx)
 	leaq	_C_LABEL(fusuintrfailure)(%rip),%r11
 	movq	%r11,PCB_ONFAULT(%rcx)
+
 	movzwl	(%rdi),%eax
+
 	movq	$0,PCB_ONFAULT(%rcx)
 	ret
 
@@ -383,13 +389,15 @@ ENTRY(fubyte)
 	GET_CURPCB(%rcx)
 	leaq	_C_LABEL(fusufailure)(%rip),%r11
 	movq	%r11,PCB_ONFAULT(%rcx)
+
 	movzbl	(%rdi),%eax
+
 	movq	$0,PCB_ONFAULT(%rcx)
 	ret
 	DEFERRED_SWITCH_CALL
 
 ENTRY(suswintr)
-	cmpl	$TLBSTATE_VALID, CPUVAR(TLBSTATE)
+	cmpl	$TLBSTATE_VALID,CPUVAR(TLBSTATE)
 	jnz	_C_LABEL(fusuaddrfault)
 	movq	$VM_MAXUSER_ADDRESS-2,%r11
 	cmpq	%r11,%rdi
@@ -397,7 +405,9 @@ ENTRY(suswintr)
 	GET_CURPCB(%rcx)
 	leaq	

CVS commit: [netbsd-8] src/sys

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 20:41:28 UTC 2017

Modified Files:
src/sys/arch/amd64/amd64 [netbsd-8]: copy.S locore.S machdep.c
src/sys/compat/linux/arch/amd64 [netbsd-8]: linux_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #257):
sys/compat/linux/arch/amd64/linux_machdep.c: 1.52
sys/arch/amd64/amd64/copy.S: 1.21-1.24
sys/arch/amd64/amd64/locore.S: 1.125
sys/arch/amd64/amd64/machdep.c: 1.256
Fix a bug in ucas_32 and ucas_64. There is a branch where they don't
initialize %rax.
--
style, reduces an incoming diff
00
Split comment, otherwise it is misleading. kcopy operates on kernel
memory, and must *not* be used with userland pages.
--
Move incq outside of the copy section. No functional change, reduces
my smap diff.
--
Remove dumb debug code and outdated comment.
--
Don't forget to clean l_md.md_flags, otherwise there may be MDL_COMPAT32,
in which case the kernel would always use iret (slower).


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.10.1 src/sys/arch/amd64/amd64/copy.S
cvs rdiff -u -r1.123.6.1 -r1.123.6.2 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.255 -r1.255.6.1 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.51 -r1.51.6.1 \
src/sys/compat/linux/arch/amd64/linux_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/bind

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 19:57:53 UTC 2017

Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/bind/include/isc: platform.h

Log Message:
disable SIT, as we've been doing in -7 since this experimental feature
popped up. it was problematic and has been obsoleted in BIND 9.11.
ok christos@ reed@


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/include/isc/platform.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.26 src/external/bsd/bind/Makefile.inc:1.27
--- src/external/bsd/bind/Makefile.inc:1.26	Sun May 21 15:28:38 2017
+++ src/external/bsd/bind/Makefile.inc	Mon Sep  4 19:57:53 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.26 2017/05/21 15:28:38 riastradh Exp $
+#	$NetBSD: Makefile.inc,v 1.27 2017/09/04 19:57:53 snj Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -87,7 +87,7 @@ LIBDPLIBS+=  pthread  ${NETBSDSRCDIR
 .endif
 
 .if ${NAMED_USE_OPENSSL} == "yes"
-CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO -DHAVE_OPENSSL_GOST -DAES_SIT
+CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO -DHAVE_OPENSSL_GOST
 .if ${MKKERBEROS} != "no"
 CPPFLAGS+=-DGSSAPI
 .endif

Index: src/external/bsd/bind/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.23 src/external/bsd/bind/include/isc/platform.h:1.24
--- src/external/bsd/bind/include/isc/platform.h:1.23	Thu Jun 15 15:59:43 2017
+++ src/external/bsd/bind/include/isc/platform.h	Mon Sep  4 19:57:53 2017
@@ -359,7 +359,7 @@
 /*
  * Defined if we are enabling SIT (Source Identity Token).
  */
-#define ISC_PLATFORM_USESIT 1
+#undef ISC_PLATFORM_USESIT
 
 /***
  ***	Windows dll support.

CVS commit: src/external/bsd/bind

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 19:57:53 UTC 2017

Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/bind/include/isc: platform.h

Log Message:
disable SIT, as we've been doing in -7 since this experimental feature
popped up. it was problematic and has been obsoleted in BIND 9.11.
ok christos@ reed@


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/include/isc/platform.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/fdt

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Sep  4 18:01:28 UTC 2017

Modified Files:
src/sys/dev/fdt: simplefb.c

Log Message:
Add console support.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/simplefb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/fdt

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Sep  4 18:01:28 UTC 2017

Modified Files:
src/sys/dev/fdt: simplefb.c

Log Message:
Add console support.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/simplefb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/fdt/simplefb.c
diff -u src/sys/dev/fdt/simplefb.c:1.1 src/sys/dev/fdt/simplefb.c:1.2
--- src/sys/dev/fdt/simplefb.c:1.1	Sun Aug 27 19:14:32 2017
+++ src/sys/dev/fdt/simplefb.c	Mon Sep  4 18:01:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: simplefb.c,v 1.1 2017/08/27 19:14:32 jmcneill Exp $ */
+/* $NetBSD: simplefb.c,v 1.2 2017/09/04 18:01:28 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: simplefb.c,v 1.1 2017/08/27 19:14:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: simplefb.c,v 1.2 2017/09/04 18:01:28 jmcneill Exp $");
 
 #include 
 #include 
@@ -52,6 +52,8 @@ struct simplefb_softc {
 	bus_addr_t sc_paddr;
 };
 
+static int simplefb_console_phandle = -1;
+
 static bool
 simplefb_shutdown(device_t self, int flags)
 {
@@ -118,6 +120,12 @@ simplefb_attach_genfb(struct simplefb_so
 		return ENXIO;
 	}
 
+	if (size == 0) {
+		aprint_naive("\n");
+		aprint_normal(": disabled\n");
+		return ENXIO;
+	}
+
 	if (of_getprop_uint32(phandle, "width", ) != 0 ||
 	of_getprop_uint32(phandle, "height", ) != 0 ||
 	of_getprop_uint32(phandle, "stride", ) != 0 ||
@@ -169,8 +177,8 @@ simplefb_attach_genfb(struct simplefb_so
 	ops.genfb_ioctl = simplefb_ioctl;
 	ops.genfb_mmap = simplefb_mmap;
 
-	bool is_console = false;
-	prop_dictionary_get_bool(dict, "is_console", _console);
+	const bool is_console = phandle == simplefb_console_phandle;
+
 	prop_dictionary_set_bool(dict, "is_console", is_console);
 
 	if (is_console)
@@ -207,3 +215,23 @@ simplefb_attach(device_t parent, device_
 
 CFATTACH_DECL_NEW(simplefb, sizeof(struct simplefb_softc),
 	simplefb_match, simplefb_attach, NULL, NULL);
+
+static int
+simplefb_console_match(int phandle)
+{
+	return of_match_compatible(phandle, compatible);
+}
+
+static void
+simplefb_console_consinit(struct fdt_attach_args *faa, u_int uart_freq)
+{
+	simplefb_console_phandle = faa->faa_phandle;
+	genfb_cnattach();
+}
+
+static const struct fdt_console simplefb_fdt_console = {
+	.match = simplefb_console_match,
+	.consinit = simplefb_console_consinit
+};
+
+FDT_CONSOLE(simplefb, _fdt_console);

CVS commit: src/sys/arch/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Sep  4 17:26:06 UTC 2017

Modified Files:
src/sys/arch/amiga/dev: efa.c efavar.h wdc_acafh.c wdc_xsurf.c

Log Message:
Remove double device pointers. The pointer is already part of sc_wdcdev.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amiga/dev/efa.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/efavar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amiga/dev/wdc_acafh.c \
src/sys/arch/amiga/dev/wdc_xsurf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/efa.c
diff -u src/sys/arch/amiga/dev/efa.c:1.12 src/sys/arch/amiga/dev/efa.c:1.13
--- src/sys/arch/amiga/dev/efa.c:1.12	Fri Jan  3 00:33:06 2014
+++ src/sys/arch/amiga/dev/efa.c	Mon Sep  4 17:26:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: efa.c,v 1.12 2014/01/03 00:33:06 rkujawa Exp $ */
+/*	$NetBSD: efa.c,v 1.13 2017/09/04 17:26:06 phx Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -136,8 +136,6 @@ efa_attach(device_t parent, device_t sel
 
 	gayle_init();
 
-	sc->sc_dev = self;
-
 	efa_set_opts(sc);
 
 	if (!efa_mapbase(sc)) {
@@ -200,6 +198,12 @@ efa_attach(device_t parent, device_t sel
 static void
 efa_attach_channel(struct efa_softc *sc, int chnum) 
 {
+#ifdef EFA_DEBUG
+	device_t self;
+
+	self = sc->sc_wdcdev.sc_atac.atac_dev;
+#endif /* EFA_DEBUG */
+
 	sc->sc_chanlist[chnum] = >sc_ports[chnum].chan;
 
 	sc->sc_ports[chnum].chan.ch_channel = chnum;
@@ -216,7 +220,7 @@ efa_attach_channel(struct efa_softc *sc,
 	wdcattach(>sc_ports[chnum].chan);	
 
 #ifdef EFA_DEBUG
-	aprint_normal_dev(sc->sc_dev, "done init for channel %d\n", chnum);
+	aprint_normal_dev(self, "done init for channel %d\n", chnum);
 #endif
 
 }
@@ -238,6 +242,10 @@ efa_poll_kthread(void *arg)
 static void
 efa_set_opts(struct efa_softc *sc)
 {
+	device_t self;
+
+	self = sc->sc_wdcdev.sc_atac.atac_dev;
+
 #ifdef EFA_32BIT_IO 
 	sc->sc_32bit_io = true;	
 #else
@@ -251,10 +259,10 @@ efa_set_opts(struct efa_softc *sc)
 #endif /* EFA_NO_INTR */
 
 	if (sc->sc_no_intr)
-		aprint_verbose_dev(sc->sc_dev, "hardware interrupt disabled\n");
+		aprint_verbose_dev(self, "hardware interrupt disabled\n");
 
 	if (sc->sc_32bit_io)
-		aprint_verbose_dev(sc->sc_dev, "32-bit I/O enabled\n");
+		aprint_verbose_dev(self, "32-bit I/O enabled\n");
 }
 
 int
@@ -301,9 +309,14 @@ efa_intr(void *arg)
 static bool
 efa_mapbase(struct efa_softc *sc) 
 {
-	int i, j;
 	static struct bus_space_tag fata_cmd_iot;
 	static struct bus_space_tag gayle_cmd_iot;
+	int i, j;
+#ifdef EFA_DEBUG
+	device_t self;
+
+	self = sc->sc_wdcdev.sc_atac.atac_dev;
+#endif /* EFA_DEBUG */
 	
 	gayle_cmd_iot.base = (bus_addr_t) ztwomap(GAYLE_IDE_BASE + 2);
 	gayle_cmd_iot.absm = _bus_stride_4swap;
@@ -311,7 +324,7 @@ efa_mapbase(struct efa_softc *sc) 
 	fata_cmd_iot.absm = _bus_stride_4swap;
 
 #ifdef EFA_DEBUG
-	aprint_normal_dev(sc->sc_dev, "Gayle %x -> %x, FastATA %x -> %x\n",
+	aprint_normal_dev(self, "Gayle %x -> %x, FastATA %x -> %x\n",
 	GAYLE_IDE_BASE, gayle_cmd_iot.base, FATA1_BASE, fata_cmd_iot.base);
 #endif
 
@@ -370,9 +383,14 @@ efa_mapreg_gayle(struct efa_softc *sc)
 static bool
 efa_mapreg_native(struct efa_softc *sc) 
 {
-	int i,j;
 	struct wdc_regs *wdr_gayle = >sc_gayle_wdc_regs;
 	struct wdc_regs *wdr_fata;
+	int i,j;
+#ifdef EFA_DEBUG
+	device_t self;
+
+	self = sc->sc_wdcdev.sc_atac.atac_dev;
+#endif /* EFA_DEBUG */
 
 	for (i = 0; i < FATA1_CHANNELS; i++) {
 
@@ -383,7 +401,7 @@ efa_mapreg_native(struct efa_softc *sc) 
 
 			if (pio_offsets[j] == PIO_NSUPP) {
 #ifdef EFA_DEBUG
-aprint_normal_dev(sc->sc_dev, 
+aprint_normal_dev(self, 
 "Skipping mapping for PIO mode %x\n", j);
 #endif
 continue;
@@ -395,7 +413,7 @@ efa_mapreg_native(struct efa_softc *sc) 
 			return false;
 			}
 #ifdef EFA_DEBUG
-			aprint_normal_dev(sc->sc_dev, 
+			aprint_normal_dev(self, 
 			"Chan %x PIO mode %x mapped %x -> %x\n",
 			i, j, (bus_addr_t) kvtop((void*) 
 			wdr_fata->cmd_baseioh), (unsigned int) 
@@ -465,15 +483,20 @@ efa_setup_channel(struct ata_channel *ch
 	struct ata_drive_datas *drvp;
 	struct efa_softc *sc;
 	int ipl;
+#ifdef EFA_DEBUG
+	device_t self;
+#endif /* EFA_DEBUG */
 
 	chnum = chp->ch_channel;
 	atac = chp->ch_atac;
+
 	sc = device_private(atac->atac_dev);
 
 	mode = 5; /* start with fastest possible setting */
 
 #ifdef EFA_DEBUG
-	aprint_normal_dev(sc->sc_dev, "efa_setup_channel for ch %d\n",
+	self = sc->sc_wdcdev.sc_atac.atac_dev;
+	aprint_normal_dev(self, "efa_setup_channel for ch %d\n",
 	chnum);
 #endif /* EFA_DEBUG */
 
@@ -492,7 +515,7 @@ efa_setup_channel(struct ata_channel *ch
 		/* TODO: check if sc_ports->mode_ok */
 
 #ifdef EFA_DEBUG
-		aprint_normal_dev(sc->sc_dev, "drive %d supports %d\n",
+		aprint_normal_dev(self, "drive %d supports %d\n",
 		drive, drvp->PIO_cap);
 #endif /* EFA_DEBUG */
 
@@ -511,12 +534,17 @@ static 

CVS commit: src/sys/arch/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Sep  4 17:26:06 UTC 2017

Modified Files:
src/sys/arch/amiga/dev: efa.c efavar.h wdc_acafh.c wdc_xsurf.c

Log Message:
Remove double device pointers. The pointer is already part of sc_wdcdev.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amiga/dev/efa.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/efavar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amiga/dev/wdc_acafh.c \
src/sys/arch/amiga/dev/wdc_xsurf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/mit/xorg/lib/xkeyboard-config

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:51:11 UTC 2017

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man

Log Message:
regen for xkeyboard-config 2.21


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/mit/xorg/lib/xkeyboard-config

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:51:11 UTC 2017

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man

Log Message:
regen for xkeyboard-config 2.21


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.2 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.3
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.2	Mon Feb 13 02:34:11 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man	Mon Sep  4 16:51:11 2017
@@ -1,5 +1,5 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.20" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.21" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -14,25 +14,25 @@ ___
 lB l.
 Model	Description
 pc101	Generic 101-key PC
-pc102	Generic 102-key (Intl) PC
+pc102	Generic 101-key PC (intl.)
 pc104	Generic 104-key PC
-pc105	Generic 105-key (Intl) PC
+pc105	Generic 105-key PC (intl.)
 dell101	Dell 101-key PC
-latitude	Dell Latitude series laptop
-dellm65	Dell Precision M65
+latitude	Dell Latutude laptop
+dellm65	Dell Precision M65 laptop
 everex	Everex STEPnote
 flexpro	Keytronic FlexPro
 microsoft	Microsoft Natural
 omnikey101	Northgate OmniKey 101
 winbook	Winbook Model XP5
-pc98	PC-98xx Series
+pc98	PC-98
 a4techKB21	A4Tech KB-21
 a4techKBS8	A4Tech KBS-8
 a4_rfkb23	A4Tech Wireless Desktop RFKB-23
 airkey	Acer AirKey V
-azonaRF2300	Azona RF2300 wireless Internet Keyboard
+azonaRF2300	Azona RF2300 wireless Internet
 scorpius	Advance Scorpius KI
-brother	Brother Internet Keyboard
+brother	Brother Internet
 btc5113rf	BTC 5113RF Multimedia
 btc5126t	BTC 5126T
 btc6301urf	BTC 6301URF
@@ -44,34 +44,34 @@ btc9019u	BTC 9019U
 btc9116u	BTC 9116U Mini Wireless Internet and Gaming
 cherryblue	Cherry Blue Line CyBo@rd
 cherryblueb	Cherry CyMotion Master XPress
-cherrybluea	Cherry Blue Line CyBo@rd (alternate option)
+cherrybluea	Cherry Blue Line CyBo@rd (alt.)
 cherrycyboard	Cherry CyBo@rd USB-Hub
 cherrycmexpert	Cherry CyMotion Expert
 cherrybunlim	Cherry B.UNLIMITED
-chicony	Chicony Internet Keyboard
+chicony	Chicony Internet
 chicony0108	Chicony KU-0108
 chicony0420	Chicony KU-0420
 chicony9885	Chicony KB-9885
-compaqeak8	Compaq Easy Access Keyboard
-compaqik7	Compaq Internet Keyboard (7 keys)
-compaqik13	Compaq Internet Keyboard (13 keys)
-compaqik18	Compaq Internet Keyboard (18 keys)
+compaqeak8	Compaq Easy Access
+compaqik7	Compaq Internet (7 keys)
+compaqik13	Compaq Internet (13 keys)
+compaqik18	Compaq Internet (18 keys)
 cymotionlinux	Cherry CyMotion Master Linux
-armada	Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
-presario	Laptop/notebook Compaq (eg. Presario) Internet Keyboard
-ipaq	Compaq iPaq Keyboard
+armada	Compaq Armada laptop
+presario	Compaq Presario laptop
+ipaq	Compaq iPaq
 dell	Dell
 dellsk8125	Dell SK-8125
 dellsk8135	Dell SK-8135
-dellusbmm	Dell USB Multimedia Keyboard
-inspiron	Dell Laptop/notebook Inspiron 6xxx/8xxx
-precision_m	Dell Laptop/notebook Precision M series
-dexxa	Dexxa Wireless Desktop Keyboard
-diamond	Diamond 9801 / 9802 series
+dellusbmm	Dell USB Multimedia
+inspiron	Dell Inspiron 6000/8000 laptop
+precision_m	Dell Precision M laptop
+dexxa	Dexxa Wireless Desktop
+diamond	Diamond 9801/9802
 dtk2000	DTK2000
 ennyah_dkb1008	Ennyah DKB-1008
-fscaa1667g	Fujitsu-Siemens Computers AMILO laptop
-genius	Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+fscaa1667g	Fujitsu-Siemens Amilo laptop
+genius	Genius Comfy KB-16M/Multimedia KWD-910
 geniuscomfy	Genius Comfy KB-12e
 geniuscomfy2	Genius Comfy KB-21e-Scroll
 geniuskb19e	Genius KB-19e NB
@@ -79,127 +79,128 @@ geniuskkb2050hs	Genius KKB-2050HS
 gyration	Gyration
 htcdream	HTC Dream
 kinesis	Kinesis
-logitech_base	Logitech Generic Keyboard
+logitech_base	Logitech
 logitech_g15	Logitech G15 extra keys via G15daemon
-hpi6	Hewlett-Packard Internet Keyboard
-hp250x	Hewlett-Packard SK-250x Multimedia Keyboard
+hpi6	Hewlett-Packard Internet
+hp250x	Hewlett-Packard NEC SK-2500 Multimedia
 hpxe3gc	Hewlett-Packard Omnibook XE3 GC
 hpxe3gf	Hewlett-Packard Omnibook XE3 GF
 hpxt1000	Hewlett-Packard Omnibook XT1000
 hpdv5	Hewlett-Packard Pavilion dv5
-hpzt11xx	Hewlett-Packard Pavilion ZT11xx
+hpzt11xx	Hewlett-Packard Pavilion ZT1100
 hp500fa	Hewlett-Packard Omnibook 500 FA
-hp5xx	Hewlett-Packard Omnibook 5xx
+hp5xx	Hewlett-Packard Omnibook 500
 hpnx9020	Hewlett-Packard nx9020
 hp6000	Hewlett-Packard Omnibook 6000/6100
 honeywell_euroboard	Honeywell Euroboard
-hpmini110	Hewlett-Packard Mini 110 Notebook

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:11:37 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
264


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:11:37 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
264


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.54 src/doc/CHANGES-8.0:1.1.2.55
--- src/doc/CHANGES-8.0:1.1.2.54	Mon Sep  4 06:52:11 2017
+++ src/doc/CHANGES-8.0	Mon Sep  4 16:11:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.54 2017/09/04 06:52:11 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.55 2017/09/04 16:11:37 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -5771,3 +5771,9 @@ sys/dev/usb/ukbd.c1.137-1.138
 	Always try to set USB HID devices into Report Protocol.
 	[jakllsch, ticket #263]
 
+sys/arch/sparc64/sparc64/compat_13_machdep.c	1.24
+
+	Apply only CCR. Otherwise userland could set PSTATE_PRIV
+	in %pstate and get kernel privileges on the hardware.
+	[maxv, ticket #264]
+

CVS commit: [netbsd-8] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:10:55 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-8]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1504):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.56.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/sparc64/compat_13_machdep.c
diff -u src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23 src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23.56.1
--- src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23	Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/compat_13_machdep.c	Mon Sep  4 16:10:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.23.56.1 2017/09/04 16:10:54 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23.56.1 2017/09/04 16:10:54 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -129,7 +129,7 @@ compat_13_sys_sigreturn(struct lwp *l, c
 		return (EINVAL);
 	/* take only psr ICC field */
 #ifdef __arch64__
-	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | scp->sc_tstate;
+	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | (scp->sc_tstate & TSTATE_CCR);
 #else
 	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(scp->sc_psr);
 #endif

CVS commit: [netbsd-8] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:10:55 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-8]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1504):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.56.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:09:12 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1504):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.38.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/sparc64/compat_13_machdep.c
diff -u src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23 src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23.38.1
--- src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23	Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/compat_13_machdep.c	Mon Sep  4 16:09:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.23.38.1 2017/09/04 16:09:12 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23.38.1 2017/09/04 16:09:12 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -129,7 +129,7 @@ compat_13_sys_sigreturn(struct lwp *l, c
 		return (EINVAL);
 	/* take only psr ICC field */
 #ifdef __arch64__
-	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | scp->sc_tstate;
+	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | (scp->sc_tstate & TSTATE_CCR);
 #else
 	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(scp->sc_psr);
 #endif

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:09:34 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
1504


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-7.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.43 src/doc/CHANGES-7.2:1.1.2.44
--- src/doc/CHANGES-7.2:1.1.2.43	Mon Sep  4 06:39:31 2017
+++ src/doc/CHANGES-7.2	Mon Sep  4 16:09:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.43 2017/09/04 06:39:31 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.44 2017/09/04 16:09:34 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -4624,3 +4624,9 @@ usr.sbin/syslogd/syslogd.c			1.123
 	result in incorrect timestamp values being logged.  PR/51234.
 	[ginsbach, ticket #1496]
 
+sys/arch/sparc64/sparc64/compat_13_machdep.c	1.24
+
+	Apply only CCR. Otherwise userland could set PSTATE_PRIV
+	in %pstate and get kernel privileges on the hardware.
+	[maxv, ticket #1504]
+

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:09:34 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
1504


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-7.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:09:12 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1504):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.38.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7-1] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:08:52 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: CHANGES-7.1.1

Log Message:
1504


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-7.1.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.1.1
diff -u src/doc/CHANGES-7.1.1:1.1.2.29 src/doc/CHANGES-7.1.1:1.1.2.30
--- src/doc/CHANGES-7.1.1:1.1.2.29	Sun Aug 27 05:46:11 2017
+++ src/doc/CHANGES-7.1.1	Mon Sep  4 16:08:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.1,v 1.1.2.29 2017/08/27 05:46:11 snj Exp $
+# $NetBSD: CHANGES-7.1.1,v 1.1.2.30 2017/09/04 16:08:52 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1
 release:
@@ -3633,3 +3633,9 @@ sys/arch/i386/conf/GENERIC			patch
 	i386 GENERIC: disable VM86 by default.
 	[maxv, ticket #1463]
 
+sys/arch/sparc64/sparc64/compat_13_machdep.c	1.24
+
+	Apply only CCR. Otherwise userland could set PSTATE_PRIV
+	in %pstate and get kernel privileges on the hardware.
+	[maxv, ticket #1504]
+

CVS commit: [netbsd-7-1] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:08:52 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: CHANGES-7.1.1

Log Message:
1504


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-7.1.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7-1] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:08:30 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7-1]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1504):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.50.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7-1] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:08:30 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7-1]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1504):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.50.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/sparc64/compat_13_machdep.c
diff -u src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23 src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23.50.1
--- src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23	Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/compat_13_machdep.c	Mon Sep  4 16:08:30 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.23.50.1 2017/09/04 16:08:30 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23.50.1 2017/09/04 16:08:30 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -129,7 +129,7 @@ compat_13_sys_sigreturn(struct lwp *l, c
 		return (EINVAL);
 	/* take only psr ICC field */
 #ifdef __arch64__
-	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | scp->sc_tstate;
+	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | (scp->sc_tstate & TSTATE_CCR);
 #else
 	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(scp->sc_psr);
 #endif

CVS commit: [netbsd-7-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:07:50 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
1504


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.61 -r1.1.2.62 src/doc/CHANGES-7.0.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.61 src/doc/CHANGES-7.0.3:1.1.2.62
--- src/doc/CHANGES-7.0.3:1.1.2.61	Sun Aug 27 05:45:27 2017
+++ src/doc/CHANGES-7.0.3	Mon Sep  4 16:07:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.61 2017/08/27 05:45:27 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.62 2017/09/04 16:07:50 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -4935,3 +4935,9 @@ sys/external/bsd/ipf/netinet/ip_state.c	
 	cause use after free issues and eventually panic.
 	[mrg, ticket #1412]
 
+sys/arch/sparc64/sparc64/compat_13_machdep.c	1.24
+
+	Apply only CCR. Otherwise userland could set PSTATE_PRIV
+	in %pstate and get kernel privileges on the hardware.
+	[maxv, ticket #1504]
+

CVS commit: [netbsd-7-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:07:50 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
1504


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.61 -r1.1.2.62 src/doc/CHANGES-7.0.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7-0] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:07:14 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7-0]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1504):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.42.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/sparc64/compat_13_machdep.c
diff -u src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23 src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23.42.1
--- src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23	Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/compat_13_machdep.c	Mon Sep  4 16:07:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.23.42.1 2017/09/04 16:07:14 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23.42.1 2017/09/04 16:07:14 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -129,7 +129,7 @@ compat_13_sys_sigreturn(struct lwp *l, c
 		return (EINVAL);
 	/* take only psr ICC field */
 #ifdef __arch64__
-	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | scp->sc_tstate;
+	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | (scp->sc_tstate & TSTATE_CCR);
 #else
 	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(scp->sc_psr);
 #endif

CVS commit: [netbsd-7-0] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:07:14 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7-0]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1504):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.42.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-6] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:05:39 UTC 2017

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1501):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.307 -r1.1.2.308 src/doc/CHANGES-6.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-6] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:05:13 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-6]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1501):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.18.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/sparc64/compat_13_machdep.c
diff -u src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23 src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23.18.1
--- src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23	Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/compat_13_machdep.c	Mon Sep  4 16:05:13 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.23.18.1 2017/09/04 16:05:13 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23.18.1 2017/09/04 16:05:13 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -129,7 +129,7 @@ compat_13_sys_sigreturn(struct lwp *l, c
 		return (EINVAL);
 	/* take only psr ICC field */
 #ifdef __arch64__
-	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | scp->sc_tstate;
+	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | (scp->sc_tstate & TSTATE_CCR);
 #else
 	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(scp->sc_psr);
 #endif

CVS commit: [netbsd-6] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:05:39 UTC 2017

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1501):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.307 -r1.1.2.308 src/doc/CHANGES-6.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.307 src/doc/CHANGES-6.2:1.1.2.308
--- src/doc/CHANGES-6.2:1.1.2.307	Thu Aug 31 15:20:47 2017
+++ src/doc/CHANGES-6.2	Mon Sep  4 16:05:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.307 2017/08/31 15:20:47 martin Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.308 2017/09/04 16:05:39 snj Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -20894,3 +20894,9 @@ sys/arch/mips/mips/bds_emul.S			1.9
 	Fix FPU emulation.
 	[mrg, ticket #1499]
 
+sys/arch/sparc64/sparc64/compat_13_machdep.c	1.24
+
+	Apply only CCR. Otherwise userland could set PSTATE_PRIV
+	in %pstate and get kernel privileges on the hardware.
+	[maxv, ticket #1501]
+

CVS commit: [netbsd-6] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:05:13 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-6]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1501):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.18.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-6-1] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:04:59 UTC 2017

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.6

Log Message:
1501


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.111 -r1.1.2.112 src/doc/CHANGES-6.1.6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.1.6
diff -u src/doc/CHANGES-6.1.6:1.1.2.111 src/doc/CHANGES-6.1.6:1.1.2.112
--- src/doc/CHANGES-6.1.6:1.1.2.111	Wed Aug 30 07:05:24 2017
+++ src/doc/CHANGES-6.1.6	Mon Sep  4 16:04:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.111 2017/08/30 07:05:24 snj Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.112 2017/09/04 16:04:59 snj Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -14799,3 +14799,9 @@ usr.sbin/racoon/Makefile			1.28
 	Update Heimdal to 7.1.
 	[mrg, ticket #1493]
 
+sys/arch/sparc64/sparc64/compat_13_machdep.c	1.24
+
+	Apply only CCR. Otherwise userland could set PSTATE_PRIV
+	in %pstate and get kernel privileges on the hardware.
+	[maxv, ticket #1501]
+

CVS commit: [netbsd-6-1] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:04:59 UTC 2017

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.6

Log Message:
1501


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.111 -r1.1.2.112 src/doc/CHANGES-6.1.6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-6-1] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:04:23 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-6-1]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1501):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.32.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/sparc64/compat_13_machdep.c
diff -u src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23 src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23.32.1
--- src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23	Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/compat_13_machdep.c	Mon Sep  4 16:04:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.23.32.1 2017/09/04 16:04:23 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23.32.1 2017/09/04 16:04:23 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -129,7 +129,7 @@ compat_13_sys_sigreturn(struct lwp *l, c
 		return (EINVAL);
 	/* take only psr ICC field */
 #ifdef __arch64__
-	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | scp->sc_tstate;
+	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | (scp->sc_tstate & TSTATE_CCR);
 #else
 	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(scp->sc_psr);
 #endif

CVS commit: [netbsd-6-1] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:04:23 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-6-1]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1501):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.32.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-6-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:04:07 UTC 2017

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.7

Log Message:
1501


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-6.0.7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0.7
diff -u src/doc/CHANGES-6.0.7:1.1.2.114 src/doc/CHANGES-6.0.7:1.1.2.115
--- src/doc/CHANGES-6.0.7:1.1.2.114	Wed Aug 30 06:55:28 2017
+++ src/doc/CHANGES-6.0.7	Mon Sep  4 16:04:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.7,v 1.1.2.114 2017/08/30 06:55:28 snj Exp $
+# $NetBSD: CHANGES-6.0.7,v 1.1.2.115 2017/09/04 16:04:06 snj Exp $
 
 A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7
 release:
@@ -15126,3 +15126,9 @@ usr.sbin/racoon/Makefile			1.28
 	Update Heimdal to 7.1.
 	[mrg, ticket #1493]
 
+sys/arch/sparc64/sparc64/compat_13_machdep.c	1.24
+
+	Apply only CCR. Otherwise userland could set PSTATE_PRIV
+	in %pstate and get kernel privileges on the hardware.
+	[maxv, ticket #1501]
+

CVS commit: [netbsd-6-0] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:03:21 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-6-0]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1501):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.24.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-6-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:04:07 UTC 2017

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.7

Log Message:
1501


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-6.0.7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-6-0] src/sys/arch/sparc64/sparc64

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 16:03:21 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-6-0]: compat_13_machdep.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1501):
sys/arch/sparc64/sparc64/compat_13_machdep.c: revision 1.24
Apply only CCR. Otherwise userland could set PSTATE_PRIV in %pstate and get
kernel privileges on the hardware.
ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.24.1 \
src/sys/arch/sparc64/sparc64/compat_13_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/sparc64/compat_13_machdep.c
diff -u src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23 src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23.24.1
--- src/sys/arch/sparc64/sparc64/compat_13_machdep.c:1.23	Sat Nov 21 04:16:52 2009
+++ src/sys/arch/sparc64/sparc64/compat_13_machdep.c	Mon Sep  4 16:03:21 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $	*/
+/*	$NetBSD: compat_13_machdep.c,v 1.23.24.1 2017/09/04 16:03:21 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.23.24.1 2017/09/04 16:03:21 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -129,7 +129,7 @@ compat_13_sys_sigreturn(struct lwp *l, c
 		return (EINVAL);
 	/* take only psr ICC field */
 #ifdef __arch64__
-	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | scp->sc_tstate;
+	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | (scp->sc_tstate & TSTATE_CCR);
 #else
 	tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(scp->sc_psr);
 #endif

CVS commit: src/distrib/notes/common

[Jason Bacon]

Module Name:src
Committed By:   bacon
Date:   Mon Sep  4 14:48:09 UTC 2017

Modified Files:
src/distrib/notes/common: main

Log Message:
Add Jason Bacon to developers list


To generate a diff of this commit:
cvs rdiff -u -r1.535 -r1.536 src/distrib/notes/common/main

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/notes/common

[Jason Bacon]

Module Name:src
Committed By:   bacon
Date:   Mon Sep  4 14:48:09 UTC 2017

Modified Files:
src/distrib/notes/common: main

Log Message:
Add Jason Bacon to developers list


To generate a diff of this commit:
cvs rdiff -u -r1.535 -r1.536 src/distrib/notes/common/main

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.535 src/distrib/notes/common/main:1.536
--- src/distrib/notes/common/main:1.535	Tue May 16 17:40:01 2017
+++ src/distrib/notes/common/main	Mon Sep  4 14:48:09 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.535 2017/05/16 17:40:01 snj Exp $
+.\"	$NetBSD: main,v 1.536 2017/09/04 14:48:09 bacon Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -1113,6 +1113,7 @@ If you're one of them, and would like to
 .It Ta Julian Assange Ta Mt pr...@netbsd.org
 .It Ta Lennart Augustsson Ta Mt augus...@netbsd.org
 .It Ta Zafer Aydogan Ta Mt za...@netbsd.org
+.It Ta Jason Bacon Ta Mt ba...@netbsd.org
 .It Ta Christoph Badura Ta Mt b...@netbsd.org
 .It Ta Marc Balmer Ta Mt mbal...@netbsd.org
 .It Ta Bang Jun-Young Ta Mt junyo...@netbsd.org

CVS commit: src/sys/arch/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Sep  4 14:39:00 UTC 2017

Modified Files:
src/sys/arch/amiga/dev: wdc_xsurf.c

Log Message:
Set the correct device data size wdc_xsurf_softc instead of wdc_softc.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/dev/wdc_xsurf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/wdc_xsurf.c
diff -u src/sys/arch/amiga/dev/wdc_xsurf.c:1.2 src/sys/arch/amiga/dev/wdc_xsurf.c:1.3
--- src/sys/arch/amiga/dev/wdc_xsurf.c:1.2	Wed Nov 21 22:37:03 2012
+++ src/sys/arch/amiga/dev/wdc_xsurf.c	Mon Sep  4 14:39:00 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: wdc_xsurf.c,v 1.2 2012/11/21 22:37:03 rkujawa Exp $ */
+/*  $NetBSD: wdc_xsurf.c,v 1.3 2017/09/04 14:39:00 phx Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@ void		wdc_xsurf_attach_channel(struct wd
 void		wdc_xsurf_map_channel(struct wdc_xsurf_softc *, int);
 int		wdc_xsurf_intr(void *arg);
 
-CFATTACH_DECL_NEW(wdc_xsurf, sizeof(struct wdc_softc),
+CFATTACH_DECL_NEW(wdc_xsurf, sizeof(struct wdc_xsurf_softc),
 wdc_xsurf_match, wdc_xsurf_attach, NULL, NULL);
 
 static const unsigned int wdc_xsurf_wdr_offsets[] = {

CVS commit: src/sys/arch/amiga/dev

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Sep  4 14:39:00 UTC 2017

Modified Files:
src/sys/arch/amiga/dev: wdc_xsurf.c

Log Message:
Set the correct device data size wdc_xsurf_softc instead of wdc_softc.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/dev/wdc_xsurf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/acpitools/acpidump

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Sep  4 08:12:29 UTC 2017

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
- Space, tab and newline change for consistency output.
- Print a type number for unknown HEST sub entry ID.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/acpitools/acpidump/acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.24 src/usr.sbin/acpitools/acpidump/acpi.c:1.25
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.24	Mon Sep  4 08:08:41 2017
+++ src/usr.sbin/acpitools/acpidump/acpi.c	Mon Sep  4 08:12:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.24 2017/09/04 08:08:41 msaitoh Exp $ */
+/* $NetBSD: acpi.c,v 1.25 2017/09/04 08:12:29 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: acpi.c,v 1.24 2017/09/04 08:08:41 msaitoh Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.25 2017/09/04 08:12:29 msaitoh Exp $");
 
 #include 
 #include 
@@ -317,7 +317,7 @@ acpi_print_hest_errorbank(ACPI_HEST_IA_E
 {
 	printf("\n");
 	printf("\tBank Number=%d\n", bank->BankNumber);
-	printf("\tClear Status On Init={ %s }\n",
+	printf("\tClear Status On Init={%s}\n",
 		bank->ClearStatusOnInit ? "NO" : "YES");
 	printf("\tStatus Data Format={ ");
 	switch (bank->StatusFormat) {
@@ -344,43 +344,43 @@ acpi_print_hest_errorbank(ACPI_HEST_IA_E
 static void
 acpi_print_hest_header(ACPI_HEST_HEADER *hest)
 {
-	printf("\tType={ ");
+	printf("\tType={");
 	switch (hest->Type) {
 	case ACPI_HEST_TYPE_IA32_CHECK:
 		printf("IA32 Machine Check Exception");
 		break;
 	case ACPI_HEST_TYPE_IA32_CORRECTED_CHECK:
-		printf("IA32 Corrected Machine Check\n");
+		printf("IA32 Corrected Machine Check");
 		break;
 	case ACPI_HEST_TYPE_IA32_NMI:
-		printf("IA32 Non-Maskable Interrupt\n");
+		printf("IA32 Non-Maskable Interrupt");
 		break;
 	case ACPI_HEST_TYPE_NOT_USED3:
 	case ACPI_HEST_TYPE_NOT_USED4:
 	case ACPI_HEST_TYPE_NOT_USED5:
-		printf("unused type: %d\n", hest->Type);
+		printf("unused type: %d", hest->Type);
 		break;
 	case ACPI_HEST_TYPE_AER_ROOT_PORT:
-		printf("PCI Express Root Port AER\n");
+		printf("PCI Express Root Port AER");
 		break;
 	case ACPI_HEST_TYPE_AER_ENDPOINT:
-		printf("PCI Express Endpoint AER\n");
+		printf("PCI Express Endpoint AER");
 		break;
 	case ACPI_HEST_TYPE_AER_BRIDGE:
-		printf("PCI Express/PCI-X Bridge AER\n");
+		printf("PCI Express/PCI-X Bridge AER");
 		break;
 	case ACPI_HEST_TYPE_GENERIC_ERROR:
-		printf("Generic Hardware Error Source\n");
+		printf("Generic Hardware Error Source");
 		break;
 	case ACPI_HEST_TYPE_GENERIC_ERROR_V2:
-		printf("Generic Hardware Error Source version 2\n");
+		printf("Generic Hardware Error Source version 2");
 		break;
 	case ACPI_HEST_TYPE_RESERVED:
 	default:
-		printf("Reserved\n");
+		printf("Reserved (%d)", hest->Type);
 		break;
 	}
-	printf(" }\n");
+	printf("}\n");
 	printf("\tSourceId=%d\n", hest->SourceId);
 }
 
@@ -417,7 +417,7 @@ static void
 acpi_print_hest_notify(ACPI_HEST_NOTIFY *notify)
 {
 	printf("\tHW Error Notification={\n");
-	printf("\t\tType={ ");
+	printf("\t\tType={");
 	switch (notify->Type) {
 	case ACPI_HEST_NOTIFY_POLLED:
 		printf("POLLED");
@@ -456,10 +456,10 @@ acpi_print_hest_notify(ACPI_HEST_NOTIFY 
 		printf("RESERVED");
 		break;
 	default:
-		printf(" %d (reserved)", notify->Type);
+		printf("%d (reserved)", notify->Type);
 		break;
 	}
-	printf(" }\n");
+	printf("}\n");
 
 	printf("\t\tLength=%d\n", notify->Length);
 
@@ -674,13 +674,14 @@ acpi_print_hest_generic(ACPI_HEST_GENERI
 	acpi_print_hest_header(>Header);
 	if (data->RelatedSourceId != 0x)
 		printf("\tReleated SourceId=%d\n", data->RelatedSourceId);
-	printf("\tEnabled={ %s }\n", data->Enabled ? "YES" : "NO");
+	printf("\tEnabled={%s}\n", data->Enabled ? "YES" : "NO");
 	printf("\tNumber of Records to pre-allocate=%u\n",
 		data->RecordsToPreallocate);
 	printf("\tMax Sections per Record=%u\n", data->MaxSectionsPerRecord);
 	printf("\tMax Raw Data Length=%u\n", data->MaxRawDataLength);
 	printf("\tError Status Address=");
 	acpi_print_gas(>ErrorStatusAddress);
+	printf("\n");
 	acpi_print_hest_notify(>Notify);
 	printf("\tError Block Length=%u\n", data->ErrorBlockLength);
 }
@@ -1005,7 +1006,7 @@ acpi_print_gicm_flags(ACPI_MADT_GENERIC_
 {
 	uint32_t flags = gicm->Flags;
 
-	printf("\tFLAGS={ ");
+	printf("\tFLAGS={");
 	if (flags & ACPI_MADT_OVERRIDE_SPI_VALUES)
 		printf("SPI Count/Base Select");
 	printf("}\n");
@@ -1446,7 +1447,7 @@ acpi_print_einj_flags(ACPI_WHEA_HEADER *
 {
 	uint32_t flags = whea->Flags;
 
-	printf("\tFLAGS={ ");
+	printf("\tFLAGS={");
 	if (flags & ACPI_EINJ_PRESERVE)
 		printf("PRESERVED");
 	printf("}\n");
@@ -1622,7 +1623,7 @@ acpi_print_erst_flags(ACPI_WHEA_HEADER *
 {
 	uint32_t flags = whea->Flags;
 
-	

CVS commit: src/usr.sbin/acpitools/acpidump

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Sep  4 08:12:29 UTC 2017

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
- Space, tab and newline change for consistency output.
- Print a type number for unknown HEST sub entry ID.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/acpitools/acpidump/acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/acpitools/acpidump

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Sep  4 08:08:41 UTC 2017

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
- Calculate offset of a sub header correctly in acpi_handle_hest() to print
  all of sub entries in HEST correctly.
- Print a SpaceID number for unknown ID in acpi_print_gas().
- Use PRINTFLAG() in acpi_print_hest_notify().
- Use %u instead of %d for unsgined values in acpi_print_hest_generic().


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/acpitools/acpidump/acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.23 src/usr.sbin/acpitools/acpidump/acpi.c:1.24
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.23	Mon Sep  4 07:59:15 2017
+++ src/usr.sbin/acpitools/acpidump/acpi.c	Mon Sep  4 08:08:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.23 2017/09/04 07:59:15 msaitoh Exp $ */
+/* $NetBSD: acpi.c,v 1.24 2017/09/04 08:08:41 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: acpi.c,v 1.23 2017/09/04 07:59:15 msaitoh Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.24 2017/09/04 08:08:41 msaitoh Exp $");
 
 #include 
 #include 
@@ -244,7 +244,8 @@ acpi_print_gas(ACPI_GENERIC_ADDRESS *gas
 	case ACPI_GAS_DATATABLE:
 	case ACPI_GAS_FIXED:
 	default:
-		printf("0x%016jx (?)", (uintmax_t)gas->Address);
+		printf("0x%016jx (SpaceID=%hhu)", (uintmax_t)gas->Address,
+		gas->SpaceId);
 		break;
 	}
 }
@@ -461,20 +462,19 @@ acpi_print_hest_notify(ACPI_HEST_NOTIFY 
 	printf(" }\n");
 
 	printf("\t\tLength=%d\n", notify->Length);
-	printf("\t\tConfig Write Enable={\n");
-	if (notify->ConfigWriteEnable & ACPI_HEST_TYPE)
-		printf("TYPE");
-	if (notify->ConfigWriteEnable & ACPI_HEST_POLL_INTERVAL)
-		printf("POLL INTERVAL");
-	if (notify->ConfigWriteEnable & ACPI_HEST_POLL_THRESHOLD_VALUE)
-		printf("THRESHOLD VALUE");
-	if (notify->ConfigWriteEnable & ACPI_HEST_POLL_THRESHOLD_WINDOW)
-		printf("THRESHOLD WINDOW");
-	if (notify->ConfigWriteEnable & ACPI_HEST_ERR_THRESHOLD_VALUE)
-		printf("THRESHOLD VALUE");
-	if (notify->ConfigWriteEnable & ACPI_HEST_ERR_THRESHOLD_WINDOW)
-		printf("THRESHOLD WINDOW");
-	printf("}\n");
+
+#define PRINTFLAG(var, flag)	printflag((var), ACPI_HEST_## flag, #flag)
+
+	printf("\t\tConfig Write Enable=");
+	PRINTFLAG(notify->ConfigWriteEnable, TYPE);
+	PRINTFLAG(notify->ConfigWriteEnable, POLL_INTERVAL);
+	PRINTFLAG(notify->ConfigWriteEnable, POLL_THRESHOLD_VALUE);
+	PRINTFLAG(notify->ConfigWriteEnable, POLL_THRESHOLD_WINDOW);
+	PRINTFLAG(notify->ConfigWriteEnable, ERR_THRESHOLD_VALUE);
+	PRINTFLAG(notify->ConfigWriteEnable, ERR_THRESHOLD_WINDOW);
+	PRINTFLAG_END();
+
+#undef PRINTFLAG
 
 	printf("\t\tPoll Interval=%d msec\n", notify->PollInterval);
 	printf("\t\tInterrupt Vector=%d\n", notify->Vector);
@@ -675,15 +675,14 @@ acpi_print_hest_generic(ACPI_HEST_GENERI
 	if (data->RelatedSourceId != 0x)
 		printf("\tReleated SourceId=%d\n", data->RelatedSourceId);
 	printf("\tEnabled={ %s }\n", data->Enabled ? "YES" : "NO");
-	printf("\tNumber of Records to pre-allocate=%d\n",
+	printf("\tNumber of Records to pre-allocate=%u\n",
 		data->RecordsToPreallocate);
-	printf("\tMax Sections per Record=%d\n",
-		data->MaxSectionsPerRecord);
-	printf("\tMax Raw Data Length=%d\n", data->MaxRawDataLength);
+	printf("\tMax Sections per Record=%u\n", data->MaxSectionsPerRecord);
+	printf("\tMax Raw Data Length=%u\n", data->MaxRawDataLength);
 	printf("\tError Status Address=");
 	acpi_print_gas(>ErrorStatusAddress);
 	acpi_print_hest_notify(>Notify);
-	printf("\tError Block Length=%d\n", data->ErrorBlockLength);
+	printf("\tError Block Length=%u\n", data->ErrorBlockLength);
 }
 
 static void
@@ -707,7 +706,6 @@ acpi_handle_hest(ACPI_TABLE_HEADER *sdp)
 	ACPI_TABLE_HEST *hest;
 	ACPI_HEST_HEADER *subhest;
 	uint32_t i, pos;
-	void *subtable;
 
 	printf(BEGIN_COMMENT);
 	acpi_print_sdt(sdp);
@@ -717,23 +715,24 @@ acpi_handle_hest(ACPI_TABLE_HEADER *sdp)
 	pos = sizeof(ACPI_TABLE_HEST);
 	for (i = 0; i < hest->ErrorSourceCount; i++) {
 		subhest = (ACPI_HEST_HEADER *)((char *)hest + pos);
-		subtable = (void *)((char *)subhest + sizeof(ACPI_HEST_HEADER));
 		printf("\n");
 
-		printf("\tType={ ");
 		switch (subhest->Type) {
 		case ACPI_HEST_TYPE_IA32_CHECK:
-			acpi_print_hest_ia32_check(subtable);
+			acpi_print_hest_ia32_check(
+(ACPI_HEST_IA_MACHINE_CHECK *)subhest);
 			pos += sizeof(ACPI_HEST_IA_MACHINE_CHECK);
 			break;
 
 		case ACPI_HEST_TYPE_IA32_CORRECTED_CHECK:
-			acpi_print_hest_ia32_correctedcheck(subtable);
+			acpi_print_hest_ia32_correctedcheck(
+(ACPI_HEST_IA_CORRECTED *)subhest);
 			pos += sizeof(ACPI_HEST_IA_CORRECTED);
 			break;
 
 		case ACPI_HEST_TYPE_IA32_NMI:
-			acpi_print_hest_ia32_nmi(subtable);
+			acpi_print_hest_ia32_nmi(
+

CVS commit: src/usr.sbin/acpitools/acpidump

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Sep  4 08:08:41 UTC 2017

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
- Calculate offset of a sub header correctly in acpi_handle_hest() to print
  all of sub entries in HEST correctly.
- Print a SpaceID number for unknown ID in acpi_print_gas().
- Use PRINTFLAG() in acpi_print_hest_notify().
- Use %u instead of %d for unsgined values in acpi_print_hest_generic().


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/acpitools/acpidump/acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/acpitools/acpidump

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Sep  4 07:59:15 UTC 2017

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
 Fix calculation the offset of the Action Table in WDAT to print each
entries correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/acpitools/acpidump/acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/acpitools/acpidump

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Sep  4 07:59:15 UTC 2017

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
 Fix calculation the offset of the Action Table in WDAT to print each
entries correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/acpitools/acpidump/acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.22 src/usr.sbin/acpitools/acpidump/acpi.c:1.23
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.22	Fri Sep  1 18:35:50 2017
+++ src/usr.sbin/acpitools/acpidump/acpi.c	Mon Sep  4 07:59:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.22 2017/09/01 18:35:50 msaitoh Exp $ */
+/* $NetBSD: acpi.c,v 1.23 2017/09/04 07:59:15 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: acpi.c,v 1.22 2017/09/01 18:35:50 msaitoh Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.23 2017/09/04 07:59:15 msaitoh Exp $");
 
 #include 
 #include 
@@ -2785,7 +2785,7 @@ acpi_handle_wdat(ACPI_TABLE_HEADER *sdp)
 {
 	ACPI_TABLE_WDAT *wdat;
 	ACPI_WHEA_HEADER *whea;
-	char *wdat_pos;
+	ACPI_WDAT_ENTRY *wdat_pos;
 	u_int i;
 
 	printf(BEGIN_COMMENT);
@@ -2807,15 +2807,14 @@ acpi_handle_wdat(ACPI_TABLE_HEADER *sdp)
 		printf(", STOPPED");
 	printf("}\n");
 
-	wdat_pos = ((char *)wdat + sizeof(ACPI_TABLE_HEADER)
-	+ wdat->HeaderLength);
+	wdat_pos = (ACPI_WDAT_ENTRY *)((char *)wdat + sizeof(ACPI_TABLE_WDAT));
 
 	for (i = 0; i < wdat->Entries; i++) {
 		whea = (ACPI_WHEA_HEADER *)wdat_pos;
 		acpi_print_whea(whea,
 		acpi_print_wdat_action, acpi_print_wdat_instruction,
 		NULL);
-		wdat_pos += sizeof(ACPI_WDAT_ENTRY);
+		wdat_pos++;
 	}
 	printf(END_COMMENT);
 }

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:52:11 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
262, 263


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:52:11 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
262, 263


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-8.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.53 src/doc/CHANGES-8.0:1.1.2.54
--- src/doc/CHANGES-8.0:1.1.2.53	Fri Sep  1 10:01:09 2017
+++ src/doc/CHANGES-8.0	Mon Sep  4 06:52:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.53 2017/09/01 10:01:09 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.54 2017/09/04 06:52:11 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -5757,3 +5757,17 @@ sys/dev/sdmmc/sdmmcvar.h			1.29
 	Avoid gcc warnings.
 	[mlelstv, ticket #261]
 
+sys/dev/usb/usb.c1.166
+
+	Add a missing break that should have been included in
+	revision 1.163.
+	[skrll, ticket #262]
+
+sys/dev/usb/uhidev.c1.71
+sys/dev/usb/ukbd.c1.137-1.138
+
+	Fix memory leak in report parsing error paths.
+	Support more varieties of USB keyboard reports.
+	Always try to set USB HID devices into Report Protocol.
+	[jakllsch, ticket #263]
+

CVS commit: [netbsd-8] src/sys/dev/usb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:43:15 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-8]: uhidev.c ukbd.c

Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #263):
sys/dev/usb/uhidev.c: revision 1.71
sys/dev/usb/ukbd.c: revision 1.137-1.138
Fix memory leak in report parsing error paths.
--
Support more varieties of USB keyboard reports.
The previous code asssumed reports would closely match the Bootstrap
Keyboard Protocol.  This is no longer always the case, particularly
with higher-end keyboards.
--
Always try to set USB HID devices into Report Protocol.  (Unless the
device is known to be quirky.)
Some of the most-widely-compatible methods of implementing USB Keyboard
NKRO depend on this Request to function as designed.
Issuing this Request is recommended by the HID 1.11 spec (7.2.6):
... "the host should not make any assumptions about the device's state
and should set the desired protocol whenever initializing a device."


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.136 -r1.136.6.1 src/sys/dev/usb/ukbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.70 src/sys/dev/usb/uhidev.c:1.70.2.1
--- src/sys/dev/usb/uhidev.c:1.70	Thu Jun  1 02:45:12 2017
+++ src/sys/dev/usb/uhidev.c	Mon Sep  4 06:43:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhidev.c,v 1.70 2017/06/01 02:45:12 chs Exp $	*/
+/*	$NetBSD: uhidev.c,v 1.70.2.1 2017/09/04 06:43:14 snj Exp $	*/
 
 /*
  * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.70 2017/06/01 02:45:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.70.2.1 2017/09/04 06:43:14 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -153,12 +153,9 @@ uhidev_attach(device_t parent, device_t 
 		aprint_error_dev(self, "couldn't establish power handler\n");
 
 	(void)usbd_set_idle(iface, 0, 0);
-#if 0
 
-	if ((usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_NO_SET_PROTO) == 0 &&
-	id->bInterfaceSubClass != UISUBCLASS_BOOT)
+	if ((usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_NO_SET_PROTO) == 0)
 		(void)usbd_set_protocol(iface, 1);
-#endif
 
 	maxinpktsize = 0;
 	sc->sc_iep_addr = sc->sc_oep_addr = -1;

Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.136 src/sys/dev/usb/ukbd.c:1.136.6.1
--- src/sys/dev/usb/ukbd.c:1.136	Fri Jan 20 02:25:24 2017
+++ src/sys/dev/usb/ukbd.c	Mon Sep  4 06:43:14 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: ukbd.c,v 1.136 2017/01/20 02:25:24 maya Exp $*/
+/*  $NetBSD: ukbd.c,v 1.136.6.1 2017/09/04 06:43:14 snj Exp $*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.136 2017/01/20 02:25:24 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.136.6.1 2017/09/04 06:43:14 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -83,12 +83,11 @@ int	ukbddebug = 0;
 #define DPRINTFN(n,x)
 #endif
 
-#define MAXKEYCODE 6
-#define MAXMOD 8		/* max 32 */
+#define MAXKEYCODE 32
+#define MAXKEYS 256
 
 struct ukbd_data {
-	uint32_t	modifiers;
-	uint8_t		keycode[MAXKEYCODE];
+	uint8_t		keys[MAXKEYS/NBBY];
 };
 
 #define PRESS0x000
@@ -234,19 +233,14 @@ Static const uint8_t ukbd_trtab[256] = {
 
 #define KEY_ERROR 0x01
 
-#define MAXKEYS (MAXMOD+2*MAXKEYCODE)
-
 struct ukbd_softc {
 	struct uhidev sc_hdev;
 
 	struct ukbd_data sc_ndata;
 	struct ukbd_data sc_odata;
-	struct hid_location sc_modloc[MAXMOD];
-	u_int sc_nmod;
-	struct {
-		uint32_t mask;
-		uint8_t key;
-	} sc_mods[MAXMOD];
+	struct hid_location sc_keyloc[MAXKEYS];
+	uint8_t sc_keyuse[MAXKEYS];
+	u_int sc_nkeyloc;
 
 	struct hid_location sc_keycodeloc;
 	u_int sc_nkeycode;
@@ -307,15 +301,17 @@ void ukbdtracedump(void);
 void
 ukbdtracedump(void)
 {
-	int i;
+	size_t i, j;
 	for (i = 0; i < UKBDTRACESIZE; i++) {
 		struct ukbdtraceinfo *p =
 		[(i+ukbdtraceindex)%UKBDTRACESIZE];
-		printf("%"PRIu64".%06"PRIu64": mod=0x%02x key0=0x%02x key1=0x%02x "
-		   "key2=0x%02x key3=0x%02x\n",
-		   p->tv.tv_sec, (uint64_t)p->tv.tv_usec,
-		   p->ud.modifiers, p->ud.keycode[0], p->ud.keycode[1],
-		   p->ud.keycode[2], p->ud.keycode[3]);
+		printf("%"PRIu64".%06"PRIu64":", p->tv.tv_sec,
+		(uint64_t)p->tv.tv_usec);
+		for (j = 0; j < MAXKEYS; j++) {
+			if (isset(p->ud.keys, j))
+printf(" %zu", j);
+		}
+		printf(".\n");
 	}
 }
 #endif
@@ -438,7 +434,7 @@ ukbd_attach(device_t parent, device_t se
 #endif
 
 #ifdef DIAGNOSTIC
-	aprint_normal(": %d modifier keys, %d key codes", sc->sc_nmod,
+	aprint_normal(": %d Variable keys, %d Array codes", sc->sc_nkeyloc,
 	   sc->sc_nkeycode);
 	if (sc->sc_flags & FLAG_APPLE_FN)
 		aprint_normal(", apple fn key");
@@ -595,21 +591,22 @@ 

CVS commit: [netbsd-8] src/sys/dev/usb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:43:15 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-8]: uhidev.c ukbd.c

Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #263):
sys/dev/usb/uhidev.c: revision 1.71
sys/dev/usb/ukbd.c: revision 1.137-1.138
Fix memory leak in report parsing error paths.
--
Support more varieties of USB keyboard reports.
The previous code asssumed reports would closely match the Bootstrap
Keyboard Protocol.  This is no longer always the case, particularly
with higher-end keyboards.
--
Always try to set USB HID devices into Report Protocol.  (Unless the
device is known to be quirky.)
Some of the most-widely-compatible methods of implementing USB Keyboard
NKRO depend on this Request to function as designed.
Issuing this Request is recommended by the HID 1.11 spec (7.2.6):
... "the host should not make any assumptions about the device's state
and should set the desired protocol whenever initializing a device."


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.136 -r1.136.6.1 src/sys/dev/usb/ukbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-8] src/sys/dev/usb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:40:37 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-8]: usb.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #262):
sys/dev/usb/usb.c: revision 1.166
Add a missing break that should have been included in revision 1.163.
Spotted by "sc dying" and reported on current-users


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.165.6.1 src/sys/dev/usb/usb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.165 src/sys/dev/usb/usb.c:1.165.6.1
--- src/sys/dev/usb/usb.c:1.165	Thu Jan 19 16:05:00 2017
+++ src/sys/dev/usb/usb.c	Mon Sep  4 06:40:37 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.c,v 1.165 2017/01/19 16:05:00 skrll Exp $	*/
+/*	$NetBSD: usb.c,v 1.165.6.1 2017/09/04 06:40:37 snj Exp $	*/
 
 /*
  * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.165 2017/01/19 16:05:00 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.165.6.1 2017/09/04 06:40:37 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -775,6 +775,7 @@ usbioctl(dev_t devt, u_long cmd, void *d
 			len = UGETW(ur->ucr_request.wLength);
 			kmem_free(ptr, len);
 		}
+		break;
 	}
 
 	case USB_DEVICEINFO:

CVS commit: [netbsd-8] src/sys/dev/usb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:40:37 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-8]: usb.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #262):
sys/dev/usb/usb.c: revision 1.166
Add a missing break that should have been included in revision 1.163.
Spotted by "sc dying" and reported on current-users


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.165.6.1 src/sys/dev/usb/usb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:39:31 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
149[12456]


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.42 -r1.1.2.43 src/doc/CHANGES-7.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:39:31 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
149[12456]


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.42 -r1.1.2.43 src/doc/CHANGES-7.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.42 src/doc/CHANGES-7.2:1.1.2.43
--- src/doc/CHANGES-7.2:1.1.2.42	Fri Aug 25 03:49:54 2017
+++ src/doc/CHANGES-7.2	Mon Sep  4 06:39:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.42 2017/08/25 03:49:54 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.43 2017/09/04 06:39:31 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -4592,3 +4592,35 @@ sys/arch/i386/conf/GENERIC			patch
 	i386 GENERIC: disable VM86 by default.
 	[maxv, ticket #1463]
 
+usr.bin/systat/main.c1.51
+usr.bin/systat/systat.11.47 via patch
+
+	add a basic "-b" option - that outputs one display and exits.
+	[mrg, ticket #1491]
+
+sys/dev/hdaudio/hdafg.c1.13 (s,hdaudio,pci/hdaudio,)
+sys/dev/hdaudio/hdafg_dd.c			1.2 (s,hdaudio,pci/hdaudio,)
+
+	put all the ELD debugging messages under #ifdef HDAFG_HDMI_DEBUG.
+	[mrg, ticket #1492]
+
+lib/libc/rpc/rpcb_st_xdr.c			1.12
+
+	Fixed NetBSD RPCBPROC_GETSTAT endocde/decode interoperability
+	issues with other operating systems. The get statistics option
+	(-m) of rpcifno now works correctly against other
+	implementations of rpcbind and vice versa.
+	[ginsbach, ticket #1494]
+
+lib/libc/stdlib/merge.c1.15
+
+	Gracefully handle a zero number of members argument in
+	mergesort(3).
+	[ginsbach, ticket #1495]
+
+usr.sbin/syslogd/syslogd.c			1.123
+
+	Fixed incorrect syslogd(8) internal time conversions that could
+	result in incorrect timestamp values being logged.  PR/51234.
+	[ginsbach, ticket #1496]
+

CVS commit: [netbsd-7] src/usr.sbin/syslogd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:30:38 UTC 2017

Modified Files:
src/usr.sbin/syslogd [netbsd-7]: syslogd.c

Log Message:
Pull up following revision(s) (requested by ginsbach in ticket #1496):
usr.sbin/syslogd/syslogd.c: revision 1.123
PR/51234: Onno van der Linden: syslogd sometimes incorrectly handles iso to
bsd time conversion


To generate a diff of this commit:
cvs rdiff -u -r1.119.4.1 -r1.119.4.2 src/usr.sbin/syslogd/syslogd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.119.4.1 src/usr.sbin/syslogd/syslogd.c:1.119.4.2
--- src/usr.sbin/syslogd/syslogd.c:1.119.4.1	Wed May 13 19:19:19 2015
+++ src/usr.sbin/syslogd/syslogd.c	Mon Sep  4 06:30:38 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: syslogd.c,v 1.119.4.1 2015/05/13 19:19:19 snj Exp $	*/
+/*	$NetBSD: syslogd.c,v 1.119.4.2 2017/09/04 06:30:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: syslogd.c,v 1.119.4.1 2015/05/13 19:19:19 snj Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.119.4.2 2017/09/04 06:30:38 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -1746,27 +1746,28 @@ check_timestamp(unsigned char *from_buf,
 		struct tm parsed;
 		time_t timeval;
 		char tsbuf[MAX_TIMESTAMPLEN];
-		int i = 0;
+		int i = 0, j;
 
 		DPRINTF(D_CALL, "check_timestamp(): convert ISO->BSD\n");
 		for(i = 0; i < MAX_TIMESTAMPLEN && from_buf[i] != '\0'
 		&& from_buf[i] != '.' && from_buf[i] != ' '; i++)
 			tsbuf[i] = from_buf[i]; /* copy date & time */
+		j = i;
 		for(; i < MAX_TIMESTAMPLEN && from_buf[i] != '\0'
 		&& from_buf[i] != '+' && from_buf[i] != '-'
 		&& from_buf[i] != 'Z' && from_buf[i] != ' '; i++)
 			;			   /* skip fraction digits */
 		for(; i < MAX_TIMESTAMPLEN && from_buf[i] != '\0'
-		&& from_buf[i] != ':' && from_buf[i] != ' ' ; i++)
-			tsbuf[i] = from_buf[i]; /* copy TZ */
+		&& from_buf[i] != ':' && from_buf[i] != ' ' ; i++, j++)
+			tsbuf[j] = from_buf[i]; /* copy TZ */
 		if (from_buf[i] == ':') i++;	/* skip colon */
 		for(; i < MAX_TIMESTAMPLEN && from_buf[i] != '\0'
-		&& from_buf[i] != ' ' ; i++)
-			tsbuf[i] = from_buf[i]; /* copy TZ */
+		&& from_buf[i] != ' ' ; i++, j++)
+			tsbuf[j] = from_buf[i]; /* copy TZ */
 
 		(void)memset(, 0, sizeof(parsed));
-		parsed.tm_isdst = -1;
 		(void)strptime(tsbuf, "%FT%T%z", );
+		parsed.tm_isdst = -1;
 		timeval = mktime();
 
 		*to_buf = strndup(make_timestamp(, false),

CVS commit: [netbsd-7] src/usr.sbin/syslogd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:30:38 UTC 2017

Modified Files:
src/usr.sbin/syslogd [netbsd-7]: syslogd.c

Log Message:
Pull up following revision(s) (requested by ginsbach in ticket #1496):
usr.sbin/syslogd/syslogd.c: revision 1.123
PR/51234: Onno van der Linden: syslogd sometimes incorrectly handles iso to
bsd time conversion


To generate a diff of this commit:
cvs rdiff -u -r1.119.4.1 -r1.119.4.2 src/usr.sbin/syslogd/syslogd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7] src/lib/libc/stdlib

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:21:45 UTC 2017

Modified Files:
src/lib/libc/stdlib [netbsd-7]: merge.c

Log Message:
Pull up following revision(s) (requested by ginsbach in ticket #1495):
lib/libc/stdlib/merge.c: revision 1.15
PR lib/50316: Gracefully handle a zero number of members argument.
Taken from FreeBSD (which fixed this same issue long ago).


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.10.1 src/lib/libc/stdlib/merge.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/stdlib/merge.c
diff -u src/lib/libc/stdlib/merge.c:1.14 src/lib/libc/stdlib/merge.c:1.14.10.1
--- src/lib/libc/stdlib/merge.c:1.14	Tue Mar 13 21:13:48 2012
+++ src/lib/libc/stdlib/merge.c	Mon Sep  4 06:21:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: merge.c,v 1.14 2012/03/13 21:13:48 christos Exp $	*/
+/*	$NetBSD: merge.c,v 1.14.10.1 2017/09/04 06:21:45 snj Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "from: @(#)merge.c	8.2 (Berkeley) 2/14/94";
 #else
-__RCSID("$NetBSD: merge.c,v 1.14 2012/03/13 21:13:48 christos Exp $");
+__RCSID("$NetBSD: merge.c,v 1.14.10.1 2017/09/04 06:21:45 snj Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -125,6 +125,9 @@ mergesort(void *base, size_t nmemb, size
 		return (-1);
 	}
 
+	if (nmemb == 0)
+		return (0);
+
 	/*
 	 * XXX
 	 * Stupid subtraction for the Cray.

CVS commit: [netbsd-7] src/lib/libc/stdlib

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:21:45 UTC 2017

Modified Files:
src/lib/libc/stdlib [netbsd-7]: merge.c

Log Message:
Pull up following revision(s) (requested by ginsbach in ticket #1495):
lib/libc/stdlib/merge.c: revision 1.15
PR lib/50316: Gracefully handle a zero number of members argument.
Taken from FreeBSD (which fixed this same issue long ago).


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.10.1 src/lib/libc/stdlib/merge.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7] src/lib/libc/rpc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:15:02 UTC 2017

Modified Files:
src/lib/libc/rpc [netbsd-7]: rpcb_st_xdr.c

Log Message:
Pull up following revision(s) (requested by ginsbach in ticket #1494):
lib/libc/rpc/rpcb_st_xdr.c: revision 1.12
PR lib/15802: Shuuichirou Murata: Add missing xdr_rpcbs_rmtcalllist_ptr
There was a missing call to xdr_rpcbs_rmtcalllist_ptr in xdr_rpcb_stat.
This fixes issues with RPCBPROC_GETSTAT not working correctly with
systems that correctly implement the XDR encode/decode routine.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/lib/libc/rpc/rpcb_st_xdr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/rpc/rpcb_st_xdr.c
diff -u src/lib/libc/rpc/rpcb_st_xdr.c:1.10 src/lib/libc/rpc/rpcb_st_xdr.c:1.10.8.1
--- src/lib/libc/rpc/rpcb_st_xdr.c:1.10	Mon Mar 11 20:19:29 2013
+++ src/lib/libc/rpc/rpcb_st_xdr.c	Mon Sep  4 06:15:02 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpcb_st_xdr.c,v 1.10 2013/03/11 20:19:29 tron Exp $	*/
+/*	$NetBSD: rpcb_st_xdr.c,v 1.10.8.1 2017/09/04 06:15:02 snj Exp $	*/
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -42,7 +42,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: rpcb_st_xdr.c,v 1.10 2013/03/11 20:19:29 tron Exp $");
+__RCSID("$NetBSD: rpcb_st_xdr.c,v 1.10.8.1 2017/09/04 06:15:02 snj Exp $");
 #endif
 
 #include "namespace.h"
@@ -257,6 +257,9 @@ xdr_rpcb_stat(XDR *xdrs, rpcb_stat *objp
 	if (!xdr_rpcbs_addrlist_ptr(xdrs, >addrinfo)) {
 		return (FALSE);
 	}
+	if (!xdr_rpcbs_rmtcalllist_ptr(xdrs, >rmtinfo)) {
+		return (FALSE);
+	}
 	return (TRUE);
 }
 

CVS commit: [netbsd-7] src/lib/libc/rpc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:15:02 UTC 2017

Modified Files:
src/lib/libc/rpc [netbsd-7]: rpcb_st_xdr.c

Log Message:
Pull up following revision(s) (requested by ginsbach in ticket #1494):
lib/libc/rpc/rpcb_st_xdr.c: revision 1.12
PR lib/15802: Shuuichirou Murata: Add missing xdr_rpcbs_rmtcalllist_ptr
There was a missing call to xdr_rpcbs_rmtcalllist_ptr in xdr_rpcb_stat.
This fixes issues with RPCBPROC_GETSTAT not working correctly with
systems that correctly implement the XDR encode/decode routine.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/lib/libc/rpc/rpcb_st_xdr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7] src/sys/dev/pci/hdaudio

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:10:30 UTC 2017

Modified Files:
src/sys/dev/pci/hdaudio [netbsd-7]: hdafg.c hdafg_dd.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1492):
sys/dev/hdaudio/hdafg.c: revision 1.13 (s,hdaudio,pci/hdaudio,)
sys/dev/hdaudio/hdafg_dd.c: revision 1.2 (s,hdaudio,pci/hdaudio,)
put all the ELD debugging messages under #ifdef HDAFG_HDMI_DEBUG.
this silences a frequent and largely useless series of messages
in my dmesg.  ok jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.21.2.1 -r1.21.2.2 src/sys/dev/pci/hdaudio/hdafg.c
cvs rdiff -u -r1.2 -r1.2.14.1 src/sys/dev/pci/hdaudio/hdafg_dd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-7] src/sys/dev/pci/hdaudio

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:10:30 UTC 2017

Modified Files:
src/sys/dev/pci/hdaudio [netbsd-7]: hdafg.c hdafg_dd.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1492):
sys/dev/hdaudio/hdafg.c: revision 1.13 (s,hdaudio,pci/hdaudio,)
sys/dev/hdaudio/hdafg_dd.c: revision 1.2 (s,hdaudio,pci/hdaudio,)
put all the ELD debugging messages under #ifdef HDAFG_HDMI_DEBUG.
this silences a frequent and largely useless series of messages
in my dmesg.  ok jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.21.2.1 -r1.21.2.2 src/sys/dev/pci/hdaudio/hdafg.c
cvs rdiff -u -r1.2 -r1.2.14.1 src/sys/dev/pci/hdaudio/hdafg_dd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/hdaudio/hdafg.c
diff -u src/sys/dev/pci/hdaudio/hdafg.c:1.21.2.1 src/sys/dev/pci/hdaudio/hdafg.c:1.21.2.2
--- src/sys/dev/pci/hdaudio/hdafg.c:1.21.2.1	Fri Sep  4 15:07:08 2015
+++ src/sys/dev/pci/hdaudio/hdafg.c	Mon Sep  4 06:10:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.21.2.1 2015/09/04 15:07:08 martin Exp $ */
+/* $NetBSD: hdafg.c,v 1.21.2.2 2017/09/04 06:10:30 snj Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd 
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.21.2.1 2015/09/04 15:07:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.21.2.2 2017/09/04 06:10:30 snj Exp $");
 
 #include 
 #include 
@@ -874,15 +874,19 @@ hdafg_assoc_dump_dd(struct hdafg_softc *
 			res = (*cmd)(sc->sc_codec, as->as_pins[pin],
 			CORB_GET_HDMI_ELD_DATA, i);
 			if (!(res & COP_ELD_VALID)) {
+#ifdef HDAFG_HDMI_DEBUG
 hda_error(sc, "bad ELD size (%u/%u)\n",
 i, elddatalen);
+#endif
 break;
 			}
 			elddata[i] = COP_ELD_DATA(res);
 		}
 
 		if (hdafg_dd_parse_info(elddata, elddatalen, ) != 0) {
+#ifdef HDAFG_HDMI_DEBUG
 			hda_error(sc, "failed to parse ELD data\n");
+#endif
 			return;
 		}
 
@@ -4260,7 +4264,9 @@ hdafg_unsol(device_t self, uint8_t tag)
 
 	switch (tag) {
 	case HDAUDIO_UNSOLTAG_EVENT_DD:
+#ifdef HDAFG_HDMI_DEBUG
 		hda_print(sc, "unsol: display device hotplug\n");
+#endif
 		for (i = 0; i < sc->sc_nassocs; i++) {
 			if (as[i].as_displaydev == false)
 continue;
@@ -4272,7 +4278,9 @@ hdafg_unsol(device_t self, uint8_t tag)
 		}
 		break;
 	default:
+#ifdef HDAFG_HDMI_DEBUG
 		hda_print(sc, "unsol: tag=%u\n", tag);
+#endif
 		break;
 	}
 

Index: src/sys/dev/pci/hdaudio/hdafg_dd.c
diff -u src/sys/dev/pci/hdaudio/hdafg_dd.c:1.2 src/sys/dev/pci/hdaudio/hdafg_dd.c:1.2.14.1
--- src/sys/dev/pci/hdaudio/hdafg_dd.c:1.2	Wed Aug 29 18:52:31 2012
+++ src/sys/dev/pci/hdaudio/hdafg_dd.c	Mon Sep  4 06:10:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg_dd.c,v 1.2 2012/08/29 18:52:31 dholland Exp $ */
+/* $NetBSD: hdafg_dd.c,v 1.2.14.1 2017/09/04 06:10:30 snj Exp $ */
 
 /*
  * Copyright (c) 2011 Jared D. McNeill 
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hdafg_dd.c,v 1.2 2012/08/29 18:52:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg_dd.c,v 1.2.14.1 2017/09/04 06:10:30 snj Exp $");
 
 #include 
 #include 
@@ -51,12 +51,16 @@ hdafg_dd_parse_info(uint8_t *data, size_
 	struct eld_baseline_block *block = >eld;
 	unsigned int i;
 
+#ifdef HDAFG_HDMI_DEBUG
 	printf("hdafg_dd_parse_info: datalen=%u\n", (unsigned int)datalen);
+#endif
 
 	memset(hdi, 0, sizeof(*hdi));
 
 	if (datalen < sizeof(block->header)) {
+#ifdef HDAFG_HDMI_DEBUG
 		printf(" no room for header\n");
+#endif
 		return EINVAL;
 	}
 
@@ -66,7 +70,9 @@ hdafg_dd_parse_info(uint8_t *data, size_
 
 	if (datalen < block->header.baseline_eld_len * 4 ||
 	datalen < sizeof(*block) - sizeof(block->header)) {
+#ifdef HDAFG_HDMI_DEBUG
 		printf(" ack!\n");
+#endif
 		return EINVAL;
 	}
 
@@ -77,7 +83,9 @@ hdafg_dd_parse_info(uint8_t *data, size_
 	datalen -= sizeof(*block) - sizeof(block->header);
 
 	if (datalen < ELD_MNL(block)) {
+#ifdef HDAFG_HDMI_DEBUG
 		printf(" MNL=%u\n", ELD_MNL(block));
+#endif
 		return EINVAL;
 	}
 
@@ -86,10 +94,12 @@ hdafg_dd_parse_info(uint8_t *data, size_
 	datalen -= ELD_MNL(block);
 
 	if (datalen != ELD_SAD_COUNT(block) * sizeof(hdi->sad[0])) {
+#ifdef HDAFG_HDMI_DEBUG
 		printf(" datalen %u sadcount %u sizeof sad %u\n",
 		(unsigned int)datalen,
 		ELD_SAD_COUNT(block),
 		(unsigned int)sizeof(hdi->sad[0]));
+#endif
 		return EINVAL;
 	}
 	hdi->nsad = ELD_SAD_COUNT(block);
@@ -99,7 +109,9 @@ hdafg_dd_parse_info(uint8_t *data, size_
 		datalen -= sizeof(hdi->sad[i]);
 	}
 
+#ifdef HDAFG_HDMI_DEBUG
 	printf("datalen = %u\n", (unsigned int)datalen);
+#endif
 	KASSERT(datalen == 0);
 
 	return 0;

CVS commit: [netbsd-7] src/usr.bin/systat

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:04:06 UTC 2017

Modified Files:
src/usr.bin/systat [netbsd-7]: main.c systat.1

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1491):
usr.bin/systat/main.c: revision 1.51
usr.bin/systat/systat.1: revision 1.47 via patch
add a basic "-b" option - that outputs one display and exits.
inspired by "top -b".  still requires a curses-capable output
without some fairly significant internal restructuring.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.2.1 src/usr.bin/systat/main.c
cvs rdiff -u -r1.43 -r1.43.4.1 src/usr.bin/systat/systat.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/systat/main.c
diff -u src/usr.bin/systat/main.c:1.48 src/usr.bin/systat/main.c:1.48.2.1
--- src/usr.bin/systat/main.c:1.48	Tue Jun  3 22:22:41 2014
+++ src/usr.bin/systat/main.c	Mon Sep  4 06:04:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.48 2014/06/03 22:22:41 joerg Exp $	*/
+/*	$NetBSD: main.c,v 1.48.2.1 2017/09/04 06:04:06 snj Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1992, 1993
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: main.c,v 1.48 2014/06/03 22:22:41 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.48.2.1 2017/09/04 06:04:06 snj Exp $");
 #endif /* not lint */
 
 #include 
@@ -96,6 +96,7 @@ main(int argc, char **argv)
 	const char *all;
 	struct clockinfo clk;
 	size_t len;
+	int bflag = 0;
 
 	all = "all";
 	egid = getegid();
@@ -120,6 +121,9 @@ main(int argc, char **argv)
 			if ((turns = atoi(optarg)) <= 0)
 errx(1, "turns <= 0.");
 			break;
+		case 'b':
+			bflag = !bflag;
+			break;
 		case '?':
 		default:
 			usage();
@@ -226,9 +230,12 @@ main(int argc, char **argv)
 	dellave = 0.0;
 
 	display(0);
-	noecho();
-	cbreak();
-	keyboard();
+	if (!bflag) {
+		noecho();
+		cbreak();
+		keyboard();
+	} else
+		die(0);
 	/*NOTREACHED*/
 }
 

Index: src/usr.bin/systat/systat.1
diff -u src/usr.bin/systat/systat.1:1.43 src/usr.bin/systat/systat.1:1.43.4.1
--- src/usr.bin/systat/systat.1:1.43	Fri Oct 18 22:42:31 2013
+++ src/usr.bin/systat/systat.1	Mon Sep  4 06:04:06 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: systat.1,v 1.43 2013/10/18 22:42:31 bad Exp $
+.\"	$NetBSD: systat.1,v 1.43.4.1 2017/09/04 06:04:06 snj Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd October 19, 2012
+.Dd November 16, 2016
 .Dt SYSTAT 1
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nd display system statistics on a CRT
 .Sh SYNOPSIS
 .Nm
-.Op Fl n
+.Op Fl bn
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Op Fl t Ar turns
@@ -94,6 +94,8 @@ Extract the name list from
 .Ar system
 instead of the default
 .Pa /netbsd .
+.It Fl b
+Show the chosen display once and exit.
 .It Fl n
 Do not resolve IP addresses into string hostnames
 .Pq FQDNs
@@ -577,3 +579,8 @@ The
 .Ic vmstat
 display looks out of place because it is (it was added in as
 a separate display from what used to be a different program).
+.Pp
+The
+.Fl b
+option requires a real terminal and could be converted to
+simply output to standard output.

CVS commit: [netbsd-7] src/usr.bin/systat

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Sep  4 06:04:06 UTC 2017

Modified Files:
src/usr.bin/systat [netbsd-7]: main.c systat.1

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1491):
usr.bin/systat/main.c: revision 1.51
usr.bin/systat/systat.1: revision 1.47 via patch
add a basic "-b" option - that outputs one display and exits.
inspired by "top -b".  still requires a curses-capable output
without some fairly significant internal restructuring.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.2.1 src/usr.bin/systat/main.c
cvs rdiff -u -r1.43 -r1.43.4.1 src/usr.bin/systat/systat.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.