CVS commit: src/sys/arch/amd64/amd64

2018-04-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sat Apr 21 23:25:01 UTC 2018

Modified Files:
src/sys/arch/amd64/amd64: locore.S

Log Message:
Do not use movq for loading arbitrary 64bit immediates. The ISA
restricts it to 32bit immediates.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/amd64/amd64/locore.S

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/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.163 src/sys/arch/amd64/amd64/locore.S:1.164
--- src/sys/arch/amd64/amd64/locore.S:1.163	Fri Mar 30 09:53:08 2018
+++ src/sys/arch/amd64/amd64/locore.S	Sat Apr 21 23:25:01 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.163 2018/03/30 09:53:08 maxv Exp $	*/
+/*	$NetBSD: locore.S,v 1.164 2018/04/21 23:25:01 joerg Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -1616,7 +1616,7 @@ END(intrfastexit)
 	.globl	nosvs_leave_altstack, nosvs_leave_altstack_end
 
 LABEL(svs_enter)
-	movq	SVS_UTLS+UTLS_KPDIRPA,%rax
+	movabs	SVS_UTLS+UTLS_KPDIRPA,%rax
 	movq	%rax,%cr3
 	movq	CPUVAR(KRSP0),%rsp
 LABEL(svs_enter_end)
@@ -1624,7 +1624,7 @@ LABEL(svs_enter_end)
 LABEL(svs_enter_altstack)
 	testb	$SEL_UPL,TF_CS(%rsp)
 	jz	1234f
-	movq	SVS_UTLS+UTLS_KPDIRPA,%rax
+	movabs	SVS_UTLS+UTLS_KPDIRPA,%rax
 	movq	%rax,%cr3
 1234:
 LABEL(svs_enter_altstack_end)



CVS commit: src/bin/sh

2018-04-21 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sat Apr 21 23:01:29 UTC 2018

Modified Files:
src/bin/sh: arithmetic.c

Log Message:
In uses like $(( var )) (un-dollared vars in arithmetic) we allow
leading whitespace in the value of var (because strtoimax() does)
but did not allow trailing whitespace.   The effect is that some
cases where $(( ${var:-0} )) would work do not work without the $
expansion.

Fix that - allow trailing whitespace.   However, continue to insist
upon at least one digit (a non-null var that contains nothing but
whitespace is still an error).

Note: posix is not helpful here, it simply requires that the variable
contain "a value that forms a valid integer constant" (with an optional
+ or - sign).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/bin/sh/arithmetic.c

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

Modified files:

Index: src/bin/sh/arithmetic.c
diff -u src/bin/sh/arithmetic.c:1.4 src/bin/sh/arithmetic.c:1.5
--- src/bin/sh/arithmetic.c:1.4	Mon Jul 24 13:21:14 2017
+++ src/bin/sh/arithmetic.c	Sat Apr 21 23:01:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: arithmetic.c,v 1.4 2017/07/24 13:21:14 kre Exp $	*/
+/*	$NetBSD: arithmetic.c,v 1.5 2018/04/21 23:01:29 kre Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -39,7 +39,7 @@
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: arithmetic.c,v 1.4 2017/07/24 13:21:14 kre Exp $");
+__RCSID("$NetBSD: arithmetic.c,v 1.5 2018/04/21 23:01:29 kre Exp $");
 #endif /* not lint */
 
 #include 
@@ -59,6 +59,7 @@ __RCSID("$NetBSD: arithmetic.c,v 1.4 201
 #include "options.h"
 #include "var.h"
 #include "show.h"
+#include "syntax.h"
 
 #if ARITH_BOR + ARITH_ASS_GAP != ARITH_BORASS || \
 	ARITH_ASS + ARITH_ASS_GAP != ARITH_EQ
@@ -127,8 +128,15 @@ arith_lookupvarint(char *varname)
 		str = "0";
 	errno = 0;
 	result = strtoimax(str, &p, 0);
-	if (errno != 0 || *p != '\0')
+	if (errno != 0 || *p != '\0') {
+		if (errno == 0) {
+			while (*p != '\0' && is_space(*p))
+p++;
+			if (*p == '\0')
+return result;
+		}
 		arith_err("variable contains non-numeric value");
+	}
 	return result;
 }
 



CVS commit: src/bin/sh

2018-04-21 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sat Apr 21 21:32:14 UTC 2018

Modified Files:
src/bin/sh: parser.c

Log Message:
PR bin/53201

Don't synerr on
${var-anything
more}

The newline in the middle of the var expansion is permitted.

Bug reported by Martijn Dekker from his modernish tests.

XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/bin/sh/parser.c

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

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.145 src/bin/sh/parser.c:1.146
--- src/bin/sh/parser.c:1.145	Fri Nov 10 17:31:12 2017
+++ src/bin/sh/parser.c	Sat Apr 21 21:32:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.145 2017/11/10 17:31:12 kre Exp $	*/
+/*	$NetBSD: parser.c,v 1.146 2018/04/21 21:32:14 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.145 2017/11/10 17:31:12 kre Exp $");
+__RCSID("$NetBSD: parser.c,v 1.146 2018/04/21 21:32:14 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -1773,7 +1773,7 @@ readtoken1(int firstc, char const *syn, 
 		CHECKSTRSPACE(4, out);	/* permit 4 calls to USTPUTC */
 		switch (syntax[c]) {
 		case CNL:	/* '\n' */
-			if (syntax == BASESYNTAX)
+			if (syntax == BASESYNTAX && varnest == 0)
 break;	/* exit loop */
 			USTPUTC(c, out);
 			plinno++;



CVS commit: src/tests/bin/sh

2018-04-21 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sat Apr 21 21:28:35 UTC 2018

Modified Files:
src/tests/bin/sh: t_expand.sh

Log Message:
Add a test case for PR bin/53201

Currently this test case will fail, a fix is coming soon (not worth
marking this as an expected failure.)

This test case and the initial bug report comes from
Martijn Dekker's modernish (shell/test set).


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/bin/sh/t_expand.sh

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

Modified files:

Index: src/tests/bin/sh/t_expand.sh
diff -u src/tests/bin/sh/t_expand.sh:1.18 src/tests/bin/sh/t_expand.sh:1.19
--- src/tests/bin/sh/t_expand.sh:1.18	Fri Oct  6 17:05:05 2017
+++ src/tests/bin/sh/t_expand.sh	Sat Apr 21 21:28:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.18 2017/10/06 17:05:05 kre Exp $
+# $NetBSD: t_expand.sh,v 1.19 2018/04/21 21:28:35 kre Exp $
 #
 # Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -997,6 +997,58 @@ dollar_star_in_quoted_word_body() {
 	results	  # FIXED: 'PR bin/52090 - 2 of 26 subtests expected to fail'
 }
 
+atf_test_case embedded_nl
+embedded_nl_head() {
+	atf_set "descr" 'Test literal \n in xxx string in ${var-xxx}'
+}
+embedded_nl_body() {
+
+	atf_check -s exit:0 -o inline:'a\nb\n' -e empty ${TEST_SH} <<- 'EOF'
+		unset V
+		X="${V-a
+		b}"
+		printf '%s\n' "${X}"
+		EOF
+
+	atf_check -s exit:0 -o inline:'a\nb\n' -e empty ${TEST_SH} <<- 'EOF'
+		unset V
+		X=${V-"a
+		b"}
+		printf '%s\n' "${X}"
+		EOF
+
+	# This should not generate a syntax error, see PR bin/53201
+	atf_check -s exit:0 -o inline:'abc\n' -e empty ${TEST_SH} <<- 'EOF'
+		V=abc
+		X=${V-a
+		b}
+		printf '%s\n' "${X}"
+		EOF
+
+	# Nor should any of these...
+	atf_check -s exit:0 -o inline:'a\nb\n' -e empty ${TEST_SH} <<- 'EOF'
+		unset V
+		X=${V-a
+		b}
+		printf '%s\n' "${X}"
+		EOF
+
+	atf_check -s exit:0 -o inline:'a\nb\n' -e empty ${TEST_SH} <<- 'EOF'
+		unset V
+		X=${V:=a
+		b}
+		printf '%s\n' "${X}"
+		EOF
+
+	atf_check -s exit:0 -o inline:'xa\nby\na\nb\n' -e empty \
+	${TEST_SH} <<- 'EOF'
+		unset V
+		X=x${V:=a
+		b}y
+		printf '%s\n' "${X}" "${V}"
+		EOF
+}
+
 atf_init_test_cases() {
 	# Listed here in the order ATF runs them, not the order from above
 
@@ -1009,6 +1061,7 @@ atf_init_test_cases() {
 	atf_add_test_case dollar_star_in_word
 	atf_add_test_case dollar_star_in_word_empty_ifs
 	atf_add_test_case dollar_star_with_empty_ifs
+	atf_add_test_case embedded_nl
 	atf_add_test_case iteration_on_null_parameter
 	atf_add_test_case iteration_on_quoted_null_parameter
 	atf_add_test_case iteration_on_null_or_null_parameter



CVS commit: src/external/bsd/am-utils/dist/fixmount

2018-04-21 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Apr 21 18:34:08 UTC 2018

Modified Files:
src/external/bsd/am-utils/dist/fixmount: fixmount.8

Log Message:
we don't have mtab or rmtab


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/fixmount/fixmount.8

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/am-utils/dist/fixmount/fixmount.8
diff -u src/external/bsd/am-utils/dist/fixmount/fixmount.8:1.3 src/external/bsd/am-utils/dist/fixmount/fixmount.8:1.4
--- src/external/bsd/am-utils/dist/fixmount/fixmount.8:1.3	Sat Jan 17 12:46:31 2015
+++ src/external/bsd/am-utils/dist/fixmount/fixmount.8	Sat Apr 21 14:34:08 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: fixmount.8,v 1.3 2015/01/17 17:46:31 christos Exp $
+.\"	$NetBSD: fixmount.8,v 1.4 2018/04/21 18:34:08 christos Exp $
 .\"
 .\"
 .\" Copyright (c) 1997-2014 Erez Zadok
@@ -37,7 +37,7 @@
 .\"
 .\" File: am-utils/fixmount/fixmount.8
 .\"
-.TH FIXMOUNT 8 "26 Feb 1993"
+.TH FIXMOUNT 8 "21 Apr 2018"
 .SH NAME
 fixmount \- fix remote mount entries
 .SH SYNOPSIS
@@ -73,8 +73,8 @@ Removes those remote mount entries on
 .I host
 that do not correspond to current mounts, i.e., which are left-over
 from a crash or are the result of improper mount protocol.
-The actuality of mounts is verified using the entries in
-.BR /etc/mtab .
+.\" The actuality of mounts is verified using the entries in
+.\" .BR /etc/mtab .
 .TP
 .B \-v
 Verify remote mounts.  Similar to
@@ -96,26 +96,26 @@ i.e., due to remote hosts not supporting
 .BI \-h \ name
 Pretend the local hostname is
 .IR name .
-This is useful after the local hostname has been changed and rmtab entries
-using the old name remain on a remote machine.
-Unfortunately, most mountd's won't be able to successfully handle removal
-of such entries, so this option is useful in combination with
-.B \-v
-only.
-.br
+.\" This is useful after the local hostname has been changed and rmtab entries
+.\" using the old name remain on a remote machine.
+.\" Unfortunately, most mountd's won't be able to successfully handle removal
+.\" of such entries, so this option is useful in combination with
+.\" .B \-v
+.\" only.
+.\" .br
 This option also saves time as comparisons of remotely recorded and local
 hostnames by address are avoided.
-.SH FILES
-.TP 20
-.B /etc/mtab
-List of current mounts.
-.TP
-.B /etc/rmtab
-Backup file for remote mount entries on NFS server.
+.\" .SH FILES
+.\" .TP 20
+.\" .B /etc/mtab
+.\" List of current mounts.
+.\" .TP
+.\" .B /etc/rmtab
+.\" Backup file for remote mount entries on NFS server.
 .SH "SEE ALSO"
 .BR showmount (8),
-.BR mtab (5),
-.BR rmtab (5),
+.\" .BR mtab (5),
+.\" .BR rmtab (5),
 .BR mountd (8C).
 .LP
 ``am-utils''
@@ -129,35 +129,35 @@ by Erez Zadok, ISBN 0-7821-2739-8, (Sybe
 .LP
 .I "Amd \- The 4.4 BSD Automounter"
 .SH BUGS
-No attempt is made to verify the information in
-.B /etc/mtab
-itself.
-.PP
-Since swap file mounts are not recorded in
-.BR /etc/mtab ,
-a heuristic specific to SunOS is used to determine whether such a mount
-is actual (replacing the string "swap" with "root" and verifying the resulting
-path).
-.PP
-Symbolic links on the server will cause the path in the remote entry to differ
-from the one in
-.BR /etc/mtab .
-To catch those cases, a filesystem is also deemed mounted if its
-.I local
-mount point is identical to the remote entry.
-I.e., on a SunOS diskless client,
-.B server:/export/share/sunos.4.1.1
-is actually
-.BR /usr/share .
-Since the local mount point is
-.B /usr/share
-as well this will be handled correctly.
-.PP
-There is no way to clear a stale entry in a remote mountd after the
-local hostname (or whatever reverse name resolution returns for it)
-has been changed.  To take care of these cases,
-the remote /etc/rmtab file has to be edited and mountd restarted.
-.PP
+.\" No attempt is made to verify the information in
+.\" .B /etc/mtab
+.\" itself.
+.\" .PP
+.\" Since swap file mounts are not recorded in
+.\" .BR /etc/mtab ,
+.\" a heuristic specific to SunOS is used to determine whether such a mount
+.\" is actual (replacing the string "swap" with "root" and verifying the resulting
+.\" path).
+.\" .PP
+.\" Symbolic links on the server will cause the path in the remote entry to differ
+.\" from the one in
+.\" .BR /etc/mtab .
+.\" To catch those cases, a filesystem is also deemed mounted if its
+.\" .I local
+.\" mount point is identical to the remote entry.
+.\" I.e., on a SunOS diskless client,
+.\" .B server:/export/share/sunos.4.1.1
+.\" is actually
+.\" .BR /usr/share .
+.\" Since the local mount point is
+.\" .B /usr/share
+.\" as well this will be handled correctly.
+.\" .PP
+.\" There is no way to clear a stale entry in a remote mountd after the
+.\" local hostname (or whatever reverse name resolution returns for it)
+.\" has been changed.  To take care of these cases,
+.\" the remote /etc/

CVS commit: src/sys/dev/usb

2018-04-21 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Apr 21 18:07:24 UTC 2018

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

Log Message:
downgrade error to debug.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/usb/if_axe.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/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.86 src/sys/dev/usb/if_axe.c:1.87
--- src/sys/dev/usb/if_axe.c:1.86	Fri Apr 20 17:03:00 2018
+++ src/sys/dev/usb/if_axe.c	Sat Apr 21 14:07:23 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axe.c,v 1.86 2018/04/20 21:03:00 christos Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.87 2018/04/21 18:07:23 christos Exp $	*/
 /*	$OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
 
 /*
@@ -87,7 +87,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.86 2018/04/20 21:03:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.87 2018/04/21 18:07:23 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -984,9 +984,8 @@ axe_attach(device_t parent, device_t sel
 	if (!(sc->axe_flags & AX772B)) {
 		if (axe_cmd(sc, AXE_172_CMD_READ_NODEID, 0, 0, sc->axe_enaddr))
 		{
-			aprint_error_dev(self,
+			aprint_debug_dev(self,
 			"failed to read ethernet address\n");
-			return;
 		}
 	}
 



CVS commit: src/sys/dev/usb

2018-04-21 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Sat Apr 21 15:53:25 UTC 2018

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

Log Message:
add KASSERT() that sc_child* is set to NULL after child detach; just for
readability, it's not immediatelly obvious this is done in xhci_childdet()

no functional changes


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/usb/xhci.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/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.87 src/sys/dev/usb/xhci.c:1.88
--- src/sys/dev/usb/xhci.c:1.87	Mon Apr  9 16:21:11 2018
+++ src/sys/dev/usb/xhci.c	Sat Apr 21 15:53:24 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.87 2018/04/09 16:21:11 jakllsch Exp $	*/
+/*	$NetBSD: xhci.c,v 1.88 2018/04/21 15:53:24 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.87 2018/04/09 16:21:11 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.88 2018/04/21 15:53:24 jdolecek Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -593,12 +593,14 @@ xhci_detach(struct xhci_softc *sc, int f
 		rv = config_detach(sc->sc_child2, flags);
 		if (rv != 0)
 			return rv;
+		KASSERT(sc->sc_child2 == NULL);
 	}
 
 	if (sc->sc_child != NULL) {
 		rv = config_detach(sc->sc_child, flags);
 		if (rv != 0)
 			return rv;
+		KASSERT(sc->sc_child == NULL);
 	}
 
 	/* XXX unconfigure/free slots */



CVS commit: src/sys/dev/isa

2018-04-21 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Apr 21 15:10:28 UTC 2018

Modified Files:
src/sys/dev/isa: pcdisplay.c

Log Message:
Fix an ancient typo, instead of setting the base address, the size
value is written leaving the autoconf setting (-1) as the address.
The value is only used for printing an attach message, the actual
pcdisplay_init code uses hard coded base addresses again.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/isa/pcdisplay.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/isa/pcdisplay.c
diff -u src/sys/dev/isa/pcdisplay.c:1.42 src/sys/dev/isa/pcdisplay.c:1.43
--- src/sys/dev/isa/pcdisplay.c:1.42	Thu Jul 14 04:19:27 2016
+++ src/sys/dev/isa/pcdisplay.c	Sat Apr 21 15:10:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay.c,v 1.42 2016/07/14 04:19:27 msaitoh Exp $ */
+/* $NetBSD: pcdisplay.c,v 1.43 2018/04/21 15:10:28 mlelstv Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.42 2016/07/14 04:19:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.43 2018/04/21 15:10:28 mlelstv Exp $");
 
 #include 
 #include 
@@ -269,7 +269,7 @@ pcdisplay_match(device_t parent, cfdata_
 	ia->ia_io[0].ir_size = 0x10;
 
 	ia->ia_niomem = 1;
-	ia->ia_iomem[0].ir_size = mono ? 0xb : 0xb8000;
+	ia->ia_iomem[0].ir_addr = mono ? 0xb : 0xb8000;
 	ia->ia_iomem[0].ir_size = 0x8000;
 
 	ia->ia_nirq = 0;



CVS commit: src/sys/netinet

2018-04-21 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sat Apr 21 13:22:06 UTC 2018

Modified Files:
src/sys/netinet: ip_output.c

Log Message:
Remove #ifndef __vax__.

The check enforces a 4-byte-aligned size for the option mbuf. If the size
is not multiple of 4, the computation of ip_hl gets truncated in the
output path. There is no reason for this check not to be present on VAX.

While here add a KASSERT in ip_insertoptions to enforce the assumption.

Discussed briefly on tech-net@


To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/sys/netinet/ip_output.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/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.302 src/sys/netinet/ip_output.c:1.303
--- src/sys/netinet/ip_output.c:1.302	Fri Apr 13 09:00:29 2018
+++ src/sys/netinet/ip_output.c	Sat Apr 21 13:22:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_output.c,v 1.302 2018/04/13 09:00:29 maxv Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.303 2018/04/21 13:22:06 maxv Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.302 2018/04/13 09:00:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.303 2018/04/21 13:22:06 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1016,6 +1016,7 @@ ip_insertoptions(struct mbuf *m, struct 
 	unsigned optlen;
 
 	optlen = opt->m_len - sizeof(p->ipopt_dst);
+	KASSERT(optlen % 4 == 0);
 	if (optlen + ntohs(ip->ip_len) > IP_MAXPACKET)
 		return m;		/* XXX should fail */
 	if (!in_nullhost(p->ipopt_dst))
@@ -1577,10 +1578,10 @@ ip_pcbopts(struct inpcb *inp, const stru
 	}
 	cp = sopt->sopt_data;
 
-#ifndef	__vax__
-	if (cnt % sizeof(int32_t))
+	if (cnt % 4) {
+		/* Must be 4-byte aligned, because there's no padding. */
 		return EINVAL;
-#endif
+	}
 
 	m = m_get(M_DONTWAIT, MT_SOOPTS);
 	if (m == NULL)



CVS commit: src/share/man/man7

2018-04-21 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sat Apr 21 12:38:17 UTC 2018

Modified Files:
src/share/man/man7: sysctl.7

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/share/man/man7/sysctl.7

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

Modified files:

Index: src/share/man/man7/sysctl.7
diff -u src/share/man/man7/sysctl.7:1.124 src/share/man/man7/sysctl.7:1.125
--- src/share/man/man7/sysctl.7:1.124	Thu Feb 22 14:49:29 2018
+++ src/share/man/man7/sysctl.7	Sat Apr 21 12:38:17 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysctl.7,v 1.124 2018/02/22 14:49:29 sevan Exp $
+.\"	$NetBSD: sysctl.7,v 1.125 2018/04/21 12:38:17 wiz Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -2450,7 +2450,7 @@ privilege may change the value.
 .Bl -column "Second level name" "integer" "Changeable" -offset indent
 .It Sy Second level name Ta Sy Type Ta Sy Changeable
 .It ddb.commandonenter	string	yes
-.It ddb.dumpstack 	integer yes
+.It ddb.dumpstack 	integer	yes
 .It ddb.fromconsole	integer	yes
 .It ddb.lines	integer	yes
 .It ddb.maxoff	integer	yes
@@ -2467,7 +2467,8 @@ If not empty, the string is used as the 
 DDB is entered.
 .It Li ddb.dumpstack
 A value of 1 causes a stack trace to be printed on entering ddb from a panic.
-A value of 0 disables this behaviour. The default value is 1.
+A value of 0 disables this behaviour.
+The default value is 1.
 .It Li ddb.fromconsole ( Dv DDBCTL_FROMCONSOLE )
 If not zero, DDB may be entered by sending a break on a serial
 console or by a special key sequence on a graphics console.



CVS commit: src/usr.sbin/rtadvd

2018-04-21 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sat Apr 21 09:31:08 UTC 2018

Modified Files:
src/usr.sbin/rtadvd: rtadvd.conf.5

Log Message:
Minor improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/rtadvd/rtadvd.conf.5

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/rtadvd/rtadvd.conf.5
diff -u src/usr.sbin/rtadvd/rtadvd.conf.5:1.19 src/usr.sbin/rtadvd/rtadvd.conf.5:1.20
--- src/usr.sbin/rtadvd/rtadvd.conf.5:1.19	Fri Apr 20 16:37:17 2018
+++ src/usr.sbin/rtadvd/rtadvd.conf.5	Sat Apr 21 09:31:08 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rtadvd.conf.5,v 1.19 2018/04/20 16:37:17 roy Exp $
+.\"	$NetBSD: rtadvd.conf.5,v 1.20 2018/04/21 09:31:08 wiz Exp $
 .\"	$KAME: rtadvd.conf.5,v 1.50 2005/01/14 05:30:59 jinmei Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -142,9 +142,7 @@ means low.
 Bits 10 is reserved, and must not be specified.
 There is no character to specify the medium preference explicitly.
 The default value of the entire flag is 0
-.Po
-or a null string,
-.Pc
+(or a null string),
 which means no additional
 configuration methods, and the medium router preference.
 .It Cm \&rltime
@@ -448,7 +446,7 @@ The following example configures the
 .Li wlan0
 interface and adds two DNS servers and a DNS domain search options
 using the default option lifetime values.
-.Bd -literal -offset
+.Bd -literal -offset 8n
 wlan0:\\
 	:addr="2001:db8::1000::":prefixlen#64:\\
 	:rdnss="2001:db8:::10,2001:db8:::2:43":\\



CVS commit: src/sys/netisdn

2018-04-21 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sat Apr 21 08:30:19 UTC 2018

Modified Files:
src/sys/netisdn: i4b_ipr.c

Log Message:
Remove unused variable since previous revision.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/netisdn/i4b_ipr.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/netisdn/i4b_ipr.c
diff -u src/sys/netisdn/i4b_ipr.c:1.43 src/sys/netisdn/i4b_ipr.c:1.44
--- src/sys/netisdn/i4b_ipr.c:1.43	Fri Apr 20 09:56:22 2018
+++ src/sys/netisdn/i4b_ipr.c	Sat Apr 21 08:30:19 2018
@@ -27,7 +27,7 @@
  *	i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
  *	-
  *
- *	$Id: i4b_ipr.c,v 1.43 2018/04/20 09:56:22 knakahara Exp $
+ *	$Id: i4b_ipr.c,v 1.44 2018/04/21 08:30:19 rin Exp $
  *
  * $FreeBSD$
  *
@@ -59,7 +59,7 @@
  *---*/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.43 2018/04/20 09:56:22 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.44 2018/04/21 08:30:19 rin Exp $");
 
 #include "irip.h"
 #include "opt_irip.h"
@@ -567,7 +567,6 @@ iripioctl(struct ifnet *ifp, u_long cmd,
 	struct ipr_softc *sc = ifp->if_softc;
 
 	struct ifreq *ifr = (struct ifreq *)data;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s;
 	int error = 0;