CVS commit: src

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Tue May 17 23:53:02 UTC 2016

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi
src/external/mit/expat/dist/lib: xmlparse.c xmltok.c xmltok.h
xmltok_impl.c
src/external/mit/expat/lib/libexpat: shlib_version

Log Message:
Fixes for CVE-2016-0718 from upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.771 -r1.772 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.133 -r1.134 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.4 -r1.5 src/external/mit/expat/dist/lib/xmlparse.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/mit/expat/dist/lib/xmltok.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/expat/dist/lib/xmltok.h
cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/dist/lib/xmltok_impl.c
cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/lib/libexpat/shlib_version

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

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.771 src/distrib/sets/lists/base/shl.mi:1.772
--- src/distrib/sets/lists/base/shl.mi:1.771	Sat May 14 14:39:39 2016
+++ src/distrib/sets/lists/base/shl.mi	Tue May 17 23:53:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.771 2016/05/14 14:39:39 spz Exp $
+# $NetBSD: shl.mi,v 1.772 2016/05/17 23:53:02 spz Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -276,7 +276,7 @@
 ./usr/lib/libexecinfo.so.0.0			base-sys-shlib		compatfile
 ./usr/lib/libexpat.sobase-sys-shlib		compatfile
 ./usr/lib/libexpat.so.2base-sys-shlib		compatfile
-./usr/lib/libexpat.so.2.2			base-sys-shlib		compatfile
+./usr/lib/libexpat.so.2.3			base-sys-shlib		compatfile
 ./usr/lib/libfetch.sobase-sys-shlib		compatfile
 ./usr/lib/libfetch.so.3base-sys-shlib		compatfile
 ./usr/lib/libfetch.so.3.0			base-sys-shlib		compatfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.133 src/distrib/sets/lists/debug/shl.mi:1.134
--- src/distrib/sets/lists/debug/shl.mi:1.133	Sat May 14 14:39:39 2016
+++ src/distrib/sets/lists/debug/shl.mi	Tue May 17 23:53:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.133 2016/05/14 14:39:39 spz Exp $
+# $NetBSD: shl.mi,v 1.134 2016/05/17 23:53:02 spz Exp $
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libc.so.12.202.debug			comp-sys-debug	debug,dynamicroot
@@ -90,7 +90,7 @@
 ./usr/libdata/debug/usr/lib/libevent_openssl.so.4.0.debug	comp-sys-debug	debug,compatfile,crypto
 ./usr/libdata/debug/usr/lib/libevent_pthreads.so.4.0.debug	comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libexecinfo.so.0.0.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libexpat.so.2.2.debug		comp-sys-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libexpat.so.2.3.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libfetch.so.3.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libform.so.6.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libg2c.so.2.0.debug			comp-sys-debug	obsolete

Index: src/external/mit/expat/dist/lib/xmlparse.c
diff -u src/external/mit/expat/dist/lib/xmlparse.c:1.4 src/external/mit/expat/dist/lib/xmlparse.c:1.5
--- src/external/mit/expat/dist/lib/xmlparse.c:1.4	Sat May 14 14:39:39 2016
+++ src/external/mit/expat/dist/lib/xmlparse.c	Tue May 17 23:53:02 2016
@@ -1693,7 +1693,8 @@ XML_GetBuffer(XML_Parser parser, int len
   }
 
   if (len > bufferLim - bufferEnd) {
-int neededSize = len + (int)(bufferEnd - bufferPtr);
+/* Do not invoke signed arithmetic overflow: */
+int neededSize = (int) ((unsigned)len + (unsigned)(bufferEnd - bufferPtr));
 if (neededSize < 0) {
   errorCode = XML_ERROR_NO_MEMORY;
   return NULL;
@@ -1725,7 +1726,8 @@ XML_GetBuffer(XML_Parser parser, int len
   if (bufferSize == 0)
 bufferSize = INIT_BUFFER_SIZE;
   do {
-bufferSize *= 2;
+/* Do not invoke signed arithmetic overflow: */
+bufferSize = (int) (2U * (unsigned) bufferSize);
   } while (bufferSize < neededSize && bufferSize > 0);
   if (bufferSize <= 0) {
 errorCode = XML_ERROR_NO_MEMORY;
@@ -2426,11 +2428,11 @@ doContent(XML_Parser parser,
   for (;;) {
 int bufSize;
 int convLen;
-XmlConvert(enc,
+const enum XML_Convert_Result convert_res = XmlConvert(enc,
, rawNameEnd,
(ICHAR **), (ICHAR *)tag->bufEnd - 1);
 convLen = (int)(toPtr - (XML_Char *)tag->buf);
-if (fromPtr == rawNameEnd) {
+if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == 

CVS commit: src

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Tue May 17 23:53:02 UTC 2016

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi
src/external/mit/expat/dist/lib: xmlparse.c xmltok.c xmltok.h
xmltok_impl.c
src/external/mit/expat/lib/libexpat: shlib_version

Log Message:
Fixes for CVE-2016-0718 from upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.771 -r1.772 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.133 -r1.134 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.4 -r1.5 src/external/mit/expat/dist/lib/xmlparse.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/mit/expat/dist/lib/xmltok.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/expat/dist/lib/xmltok.h
cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/dist/lib/xmltok_impl.c
cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/lib/libexpat/shlib_version

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

CVS commit: src/doc/roadmaps

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May 17 21:03:36 UTC 2016

Modified Files:
src/doc/roadmaps: storage

Log Message:
mention my last coda work


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/doc/roadmaps/storage

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

CVS commit: src/doc/roadmaps

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May 17 21:03:36 UTC 2016

Modified Files:
src/doc/roadmaps: storage

Log Message:
mention my last coda work


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/doc/roadmaps/storage

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

Modified files:

Index: src/doc/roadmaps/storage
diff -u src/doc/roadmaps/storage:1.14 src/doc/roadmaps/storage:1.15
--- src/doc/roadmaps/storage:1.14	Sat May 14 17:32:50 2016
+++ src/doc/roadmaps/storage	Tue May 17 17:03:36 2016
@@ -1,4 +1,4 @@
-$NetBSD: storage,v 1.14 2016/05/14 21:32:50 mlelstv Exp $
+$NetBSD: storage,v 1.15 2016/05/17 21:03:36 christos Exp $
 
 NetBSD Storage Roadmap
 ==
@@ -31,12 +31,13 @@ priorities but are still important under
  14. Port hammer from Dragonfly
  15. afs maintenance
  16. execute-in-place
+ 17. extended attributes for acl and capability storage
 
 The following elements, projects, and goals are perhaps less pressing;
 this doesn't mean one shouldn't work on them but the expected payoff
 is perhaps less than for other things:
 
- 17. coda maintenance
+ 18. coda maintenance
 
 
 Explanations
@@ -387,7 +388,17 @@ structurally and for performance analysi
  - Contact dholland for further information.
 
 
-17. coda maintenance
+17. use extended attributes for ACL and capability storage
+--
+
+Currently there is some support for extended attributes in ffs,
+but nothing really uses it. I would be nice if we came up with
+a standard format to store ACL's and capabilities like Linux has.
+The various tools must be modified to understand this and be able
+to copy them if requested. Also tools to manipulate the data will
+need to be written.
+
+18. coda maintenance
 
 
 Coda only sort of works. [And I think it's behind relative to
@@ -398,7 +409,8 @@ really be cleaned up. That or maybe it's
  - As of November 2015 nobody is known to be working on this.
  - There is no clear timeframe or release target.
  - There isn't anyone in particular to contact.
-
+ - Circa 2012 christos made it work read-write and split it
+   into modules. Since then christos has not tested it.
 
 Alistair Crooks, David Holland
 Fri Nov 20 02:17:53 EST 2015

CVS commit: src/doc/roadmaps

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May 17 20:53:53 UTC 2016

Modified Files:
src/doc/roadmaps: networking

Log Message:
reflect reality (through my ping glasses)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/doc/roadmaps/networking

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

Modified files:

Index: src/doc/roadmaps/networking
diff -u src/doc/roadmaps/networking:1.9 src/doc/roadmaps/networking:1.10
--- src/doc/roadmaps/networking:1.9	Sat Jan 14 21:56:17 2012
+++ src/doc/roadmaps/networking	Tue May 17 16:53:53 2016
@@ -1,4 +1,4 @@
-$NetBSD: networking,v 1.9 2012/01/15 02:56:17 agc Exp $
+$NetBSD: networking,v 1.10 2016/05/17 20:53:53 christos Exp $
 
 NetBSD Networking Roadmap
 =
@@ -6,42 +6,65 @@ NetBSD Networking Roadmap
 This is a small roadmap document, and deals with the networking
 side of the operating system.
 
-The following projects are expected to be included in NetBSD 6.0
-8. SMP-aware Network Packet Filter
+The following projects are expected to be included in NetBSD 8.0
+0. SCTP
 
 The following features are expected to be in future releases:
-1. Mobile IPv6
-2. SCTP
+1. net80211 support [n/ac]
+2. Mobile IPv6
 3. network driver polling
 4. ALTQ processing on input
 5. integrated multicast dns / zeroconf
 6. tcp support in libsa
 7. netboot from http
+8. MP network stack
 
 We'll continue to update this roadmap as features and dates get firmed up.
 
-
 Some explanations
 =
 
-2. SCTP
+0. SCTP
 ---
 
 Add support for the SCTP for both IPv4 and IPv6.
 
-Responsible: TBD
+Responsible: rjs
+Status: committed, done
+
+1. net80211 [n/ac]
+--
+
+Resync FreeBSD stack to get support for n, ac, VAP
 
+Responsible: christos
+Status: started porting FreeBSD code
+Comment[christos]: This will add VAP support too, and needs changes to all
+the specific drivers.
+
+2. Mobile IPv6
+--
+
+Responsible: TBD
+Status: not started
+Comment[christos]: XXX: Fill in the project description and justification.
 
 3. network driver polling
 -
 
 Responsible: matt
+Status: not started
+Comment[christos]: XXX: Fill in the project description and justification.
 
 
 4. ALTQ processing for input
 
 
 Responsible: matt
+Status: not started
+Comment[christos]: The ALTQ code and interface is very messy and there
+is a lot of code duplication. People (ozaki-r/knakahara) are working on
+this as part as MP stack
 
 
 5. multicast DNS / zeroconf
@@ -50,6 +73,8 @@ Responsible: matt
 Add support for multicast DNS (name.local)
 
 Responsible: tsarna
+Status: not started
+Comment[christos]: XXX: Fill in the project description and justification.
 
 
 6. tcp support in libsa
@@ -58,6 +83,8 @@ Responsible: tsarna
 Add a tiny tcp implementation to libsa.
 
 Responsible: matt
+Status: not started
+Comment[christos]: XXX: Why? What's going to use it?
 
 
 7. http netbooting
@@ -67,18 +94,19 @@ Be able to use a HTTP server hosting a k
 read-only root device.
 
 Responsible: TBD
+Status: not started
+Comment[christos]: Not very interesting
 
-8. SMP-aware Packet Filter
---
-
-A new packet filter which is SMP-aware has been written by rmind, as a
-project funded by the NetBSD Foundation.  zoltan has updated it for
-IPv6, and various bits contributed by christos, dholland and martin. 
-This will be in 6.0
+8. net SMP work
+--
 
-Responsible: rmind, zoltan, christos, dholland, martin
+Make multi-threaded network stack
 
+Responsible: ozaki-r,knakahara
+Status: in progress
 
 Matt Thomas
 Alistair Crooks
 Sat Jan 14 11:44:46 PST 2012
+Christos Zoulas
+Tue May 17 16:46:54 EDT 2016

CVS commit: src/doc/roadmaps

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May 17 20:53:53 UTC 2016

Modified Files:
src/doc/roadmaps: networking

Log Message:
reflect reality (through my ping glasses)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/doc/roadmaps/networking

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

CVS commit: src/sys/arch/sparc64/sparc64

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Tue May 17 19:43:28 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64: genassym.cf locore.s

Log Message:
sun4v: Implement missng MMU protection trap handling - mostly from OpenBSD


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sparc64/sparc64/genassym.cf
cvs rdiff -u -r1.395 -r1.396 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/genassym.cf
diff -u src/sys/arch/sparc64/sparc64/genassym.cf:1.78 src/sys/arch/sparc64/sparc64/genassym.cf:1.79
--- src/sys/arch/sparc64/sparc64/genassym.cf:1.78	Mon May 16 20:03:07 2016
+++ src/sys/arch/sparc64/sparc64/genassym.cf	Tue May 17 19:43:28 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.78 2016/05/16 20:03:07 palle Exp $
+#	$NetBSD: genassym.cf,v 1.79 2016/05/17 19:43:28 palle Exp $
 
 #
 # Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -148,6 +148,8 @@ export SUN4U_TTE_CV
 export SUN4U_TTE_P
 export SUN4U_TTE_EXEC
 export SUN4V_TLB_ACCESS
+export SUN4V_TLB_MODIFY
+export SUN4V_TLB_W
 export SUN4V_TLB_TSB_LOCK
 
 export PG_SHIFT4U

Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.395 src/sys/arch/sparc64/sparc64/locore.s:1.396
--- src/sys/arch/sparc64/sparc64/locore.s:1.395	Mon May 16 20:03:07 2016
+++ src/sys/arch/sparc64/sparc64/locore.s	Tue May 17 19:43:28 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.395 2016/05/16 20:03:07 palle Exp $	*/
+/*	$NetBSD: locore.s,v 1.396 2016/05/17 19:43:28 palle Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -1068,7 +1068,9 @@ _C_LABEL(trapbase_sun4v):
 	HARDINT4V(13)		! 0x04d = level 13 interrupt
 	HARDINT4V(14)		! 0x04e = level 14 interrupt
 	HARDINT4V(15)		! 0x04f = level 15 interrupt
-	sun4v_trap_entry 44	! 0x050-0x07b
+	sun4v_trap_entry 28	! 0x050-0x06b
+	VTRAP(T_FDMMU_PROT, sun4v_tl0_dtsb_prot)		! 0x6c
+	sun4v_trap_entry 15	! 0x06d-0x07b
 	VTRAP(T_CPU_MONDO, sun4v_cpu_mondo)			! 0x07c = cpu mondo
 	VTRAP(T_DEV_MONDO, sun4v_dev_mondo)			! 0x07d = dev mondo
 	sun4v_trap_entry 2	! 0x07e-0x07f
@@ -2891,7 +2893,105 @@ sun4v_datatrap_tl0:
 sun4v_datatrap_tl1:
 	/* XXX missing implementaion */
 	sir
-			
+
+sun4v_tl0_dtsb_prot:
+	GET_MMFSA %g1! MMU Fault status area
+	add	%g1, 0x48, %g3
+	LDPTRA	[%g3] ASI_PHYS_CACHED, %g3	! Data fault address
+	add	%g1, 0x50, %g6
+	LDPTRA	[%g6] ASI_PHYS_CACHED, %g6	! Data fault context
+
+	GET_CTXBUSY %g4
+	sllx	%g6, 3, %g6			! Make it into an offset into ctxbusy
+	LDPTR	[%g4 + %g6], %g4		! Load up our page table.
+
+	srax	%g3, HOLESHIFT, %g5		! Check for valid address
+	brz,pt	%g5, 0f! Should be zero or -1
+	 inc	%g5! Make -1 -> 0
+	brnz,pn	%g5, sun4v_datatrap		! Error! In hole!
+0:
+	srlx	%g3, STSHIFT, %g6
+	and	%g6, STMASK, %g6		! Index into pm_segs
+	sll	%g6, 3, %g6
+	add	%g4, %g6, %g4
+	LDPTRA	[%g4] ASI_PHYS_CACHED, %g4	! Load page directory pointer
+
+	srlx	%g3, PDSHIFT, %g6
+	and	%g6, PDMASK, %g6
+	sll	%g6, 3, %g6
+	brz,pn	%g4, sun4v_datatrap		! NULL entry? check somewhere else
+	 add	%g4, %g6, %g4
+	LDPTRA	[%g4] ASI_PHYS_CACHED, %g4	! Load page table pointer
+
+	srlx	%g3, PTSHIFT, %g6		! Convert to ptab offset
+	and	%g6, PTMASK, %g6
+	sll	%g6, 3, %g6
+	brz,pn	%g4, sun4v_datatrap		! NULL entry? check somewhere else
+	 add	%g4, %g6, %g6
+1:
+	LDPTRA	[%g6] ASI_PHYS_CACHED, %g4	! Fetch TTE
+	brgez,pn %g4, sun4v_datatrap		! Entry invalid?  Punt
+	 or	%g4, SUN4V_TLB_MODIFY|SUN4V_TLB_ACCESS|SUN4V_TLB_W, %g7
+	! Update the modified bit
+
+#	btst	SUN4V_TLB_REAL_W|SUN4V_TLB_W, %g4	! Is it a ref fault?
+	mov	1, %g2
+	sllx	%g2, 61, %g2
+	or	%g2, SUN4V_TLB_W, %g2
+	btst	%g2, %g4
+	bz,pn	%xcc, sun4v_datatrap			! No -- really fault
+	 nop
+	casxa	[%g6] ASI_PHYS_CACHED, %g4, %g7		!  and write it out
+	cmp	%g4, %g7
+	bne,pn	%xcc, 1b
+	 or	%g4, SUN4V_TLB_MODIFY|SUN4V_TLB_ACCESS|SUN4V_TLB_W, %g4
+		! Update the modified bit
+2:
+	GET_TSB_DMMU %g2
+
+	mov	%g1, %g7			! save MMFSA
+
+	/* Construct TSB tag word. */
+	add	%g1, 0x50, %g6
+	LDPTRA	[%g6] ASI_PHYS_CACHED, %g6	! Data fault context
+	mov	%g3, %g1			! Data fault address
+	srlx	%g1, 22, %g1			! 63..22 of virt addr
+	sllx	%g6, 48, %g6			! context_id in 63..48
+	or	%g1, %g6, %g1			! construct TTE tag
+
+	srlx	%g3, PTSHIFT, %g3
+	sethi	%hi(_C_LABEL(tsbsize)), %g5
+	mov	512, %g6
+	ld	[%g5 + %lo(_C_LABEL(tsbsize))], %g5
+	sllx	%g6, %g5, %g5			! %g5 = 512 << tsbsize = TSBENTS
+	sub	%g5, 1, %g5			! TSBENTS -> offset
+	and	%g3, %g5, %g3			! mask out TTE index
+	sllx	%g3, 4, %g3			! TTE size is 16 bytes
+	add	%g2, %g3, %g2			! location of TTE in ci_tsb_dmmu
+
+	membar	#StoreStore
+	
+	STPTR	%g4, [%g2 + 8]		! store TTE data
+	STPTR	%g1, [%g2]		! store TTE tag
+
+	mov	%o0, %g1
+	mov	%o1, %g2
+	mov	%o2, %g3
+
+	add	%g7, 0x48, %o0
+	ldxa	[%o0] ASI_PHYS_CACHED, %o0	! Data fault address
+	add	%g7, 0x50, %o1
+	ldxa	

CVS commit: src/sys/arch/sparc64/sparc64

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Tue May 17 19:43:28 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64: genassym.cf locore.s

Log Message:
sun4v: Implement missng MMU protection trap handling - mostly from OpenBSD


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sparc64/sparc64/genassym.cf
cvs rdiff -u -r1.395 -r1.396 src/sys/arch/sparc64/sparc64/locore.s

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

CVS commit: src/sys/arch/sparc64/doc

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Tue May 17 19:39:44 UTC 2016

Modified Files:
src/sys/arch/sparc64/doc: TODO

Log Message:
Update TODO: sun4v_datatrap handling for trap level 0 is working


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/doc/TODO

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/doc/TODO
diff -u src/sys/arch/sparc64/doc/TODO:1.16 src/sys/arch/sparc64/doc/TODO:1.17
--- src/sys/arch/sparc64/doc/TODO:1.16	Tue May 10 19:35:08 2016
+++ src/sys/arch/sparc64/doc/TODO	Tue May 17 19:39:44 2016
@@ -1,4 +1,4 @@
- /* $NetBSD: TODO,v 1.16 2016/05/10 19:35:08 palle Exp $ */
+ /* $NetBSD: TODO,v 1.17 2016/05/17 19:39:44 palle Exp $ */
 
 Things to be done:
 
@@ -15,7 +15,7 @@ sun4v:
 - 32-bit kernel support
 - libkvm
 - ofwboot: tlb_init_sun4v() hardcodes number of slots to 64
-- locore.s: sun4v_datatrap missing implementation for trap levels 0 and 1
+- locore.s: sun4v_datatrap missing implementation for trap level 1
 - check build without SUN4V defined
 - replace relevant references to %ver with GET_MAXCWP
 - pmap_mp_init(): sun4v missing handling

CVS commit: src/sys/arch/sparc64/doc

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Tue May 17 19:39:44 UTC 2016

Modified Files:
src/sys/arch/sparc64/doc: TODO

Log Message:
Update TODO: sun4v_datatrap handling for trap level 0 is working


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/doc/TODO

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:   Tue May 17 18:51:39 UTC 2016

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

Log Message:
1168


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-7.1

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:   Tue May 17 18:51:39 UTC 2016

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

Log Message:
1168


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-7.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
diff -u src/doc/CHANGES-7.1:1.1.2.89 src/doc/CHANGES-7.1:1.1.2.90
--- src/doc/CHANGES-7.1:1.1.2.89	Sun May 15 09:09:13 2016
+++ src/doc/CHANGES-7.1	Tue May 17 18:51:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.89 2016/05/15 09:09:13 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.90 2016/05/17 18:51:39 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4661,7 +4661,6 @@ external/bsd/ntp/scripts/mkver  
 	Update ntp to 4.2.8p7.
 	[snj, ticket #1166]
 
-
 sys/net80211/ieee80211_input.c			1.83-1.84
 
 	Don't check sequence number on multicast packets in station mode.
@@ -4670,4 +4669,11 @@ sys/net80211/ieee80211_input.c			1.83-1.
 	interface is in promiscous mode or doesn't filter packets itself.
 	[mlelstv, ticket #1167]
 
+crypto/external/bsd/openssh/dist/session.c	1.19
+
+	If PAM is configured to read user-specified environment variables
+	and UseLogin=yes in sshd_config, then a hostile local user may
+	attack /bin/login via LD_PRELOAD or similar environment variables
+	set via PAM.  CVE-2015-8325.
+	[christos, ticket #1168]
 

CVS commit: [netbsd-7] src/crypto/external/bsd/openssh/dist

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 17 18:50:35 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7]: session.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1168):
crypto/external/bsd/openssh/dist/session.c: revision 1.19
If PAM is configured to read user-specified environment variables
and UseLogin=yes in sshd_config, then a hostile local user may
attack /bin/login via LD_PRELOAD or similar environment variables
set via PAM.
CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
https://anongit.mindrot.org/openssh.git/commit/?id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755
XXX: pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 \
src/crypto/external/bsd/openssh/dist/session.c

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

Modified files:

Index: src/crypto/external/bsd/openssh/dist/session.c
diff -u src/crypto/external/bsd/openssh/dist/session.c:1.12.4.1 src/crypto/external/bsd/openssh/dist/session.c:1.12.4.2
--- src/crypto/external/bsd/openssh/dist/session.c:1.12.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/session.c	Tue May 17 18:50:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: session.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: session.c,v 1.12.4.2 2016/05/17 18:50:34 snj Exp $	*/
 /* $OpenBSD: session.c,v 1.277 2015/01/16 06:40:12 deraadt Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: session.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: session.c,v 1.12.4.2 2016/05/17 18:50:34 snj Exp $");
 #include 
 #include 
 #include 
@@ -1223,7 +1223,7 @@ do_setup_env(Session *s, const char *she
 	 * Pull in any environment variables that may have
 	 * been set by PAM.
 	 */
-	if (options.use_pam) {
+	if (options.use_pam && !options.use_login) {
 		char **p;
 
 		p = fetch_pam_child_environment();

CVS commit: [netbsd-7] src/crypto/external/bsd/openssh/dist

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 17 18:50:35 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7]: session.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1168):
crypto/external/bsd/openssh/dist/session.c: revision 1.19
If PAM is configured to read user-specified environment variables
and UseLogin=yes in sshd_config, then a hostile local user may
attack /bin/login via LD_PRELOAD or similar environment variables
set via PAM.
CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
https://anongit.mindrot.org/openssh.git/commit/?id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755
XXX: pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 \
src/crypto/external/bsd/openssh/dist/session.c

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/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 17 18:49:33 UTC 2016

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

Log Message:
1168


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-7.0.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.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.54 src/doc/CHANGES-7.0.1:1.1.2.55
--- src/doc/CHANGES-7.0.1:1.1.2.54	Wed May 11 10:10:09 2016
+++ src/doc/CHANGES-7.0.1	Tue May 17 18:49:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.54 2016/05/11 10:10:09 martin Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.55 2016/05/17 18:49:33 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -3057,4 +3057,11 @@ external/bsd/ntp/scripts/mkver  
 	Update ntp to 4.2.8p7.
 	[snj, ticket #1166]
 
+crypto/external/bsd/openssh/dist/session.c	1.19
+
+	If PAM is configured to read user-specified environment variables
+	and UseLogin=yes in sshd_config, then a hostile local user may
+	attack /bin/login via LD_PRELOAD or similar environment variables
+	set via PAM.  CVE-2015-8325.
+	[christos, ticket #1168]
 

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 17 18:49:33 UTC 2016

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

Log Message:
1168


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

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/crypto/external/bsd/openssh/dist

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 17 18:48:29 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7-0]: session.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1168):
crypto/external/bsd/openssh/dist/session.c: revision 1.19
If PAM is configured to read user-specified environment variables
and UseLogin=yes in sshd_config, then a hostile local user may
attack /bin/login via LD_PRELOAD or similar environment variables
set via PAM.
CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
https://anongit.mindrot.org/openssh.git/commit/?id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755
XXX: pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.1.2.1 \
src/crypto/external/bsd/openssh/dist/session.c

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/crypto/external/bsd/openssh/dist

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 17 18:48:29 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7-0]: session.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1168):
crypto/external/bsd/openssh/dist/session.c: revision 1.19
If PAM is configured to read user-specified environment variables
and UseLogin=yes in sshd_config, then a hostile local user may
attack /bin/login via LD_PRELOAD or similar environment variables
set via PAM.
CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
https://anongit.mindrot.org/openssh.git/commit/?id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755
XXX: pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.1.2.1 \
src/crypto/external/bsd/openssh/dist/session.c

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

Modified files:

Index: src/crypto/external/bsd/openssh/dist/session.c
diff -u src/crypto/external/bsd/openssh/dist/session.c:1.12.4.1 src/crypto/external/bsd/openssh/dist/session.c:1.12.4.1.2.1
--- src/crypto/external/bsd/openssh/dist/session.c:1.12.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/session.c	Tue May 17 18:48:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: session.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: session.c,v 1.12.4.1.2.1 2016/05/17 18:48:29 snj Exp $	*/
 /* $OpenBSD: session.c,v 1.277 2015/01/16 06:40:12 deraadt Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: session.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: session.c,v 1.12.4.1.2.1 2016/05/17 18:48:29 snj Exp $");
 #include 
 #include 
 #include 
@@ -1223,7 +1223,7 @@ do_setup_env(Session *s, const char *she
 	 * Pull in any environment variables that may have
 	 * been set by PAM.
 	 */
-	if (options.use_pam) {
+	if (options.use_pam && !options.use_login) {
 		char **p;
 
 		p = fetch_pam_child_environment();

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 17 15:21:14 UTC 2016

Modified Files:
src/sys/net: rtsock.c

Log Message:
Fix RT_IN_PRINT


To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/net/rtsock.c

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

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 17 15:21:14 UTC 2016

Modified Files:
src/sys/net: rtsock.c

Log Message:
Fix RT_IN_PRINT


To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/net/rtsock.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/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.187 src/sys/net/rtsock.c:1.188
--- src/sys/net/rtsock.c:1.187	Tue May 17 12:58:21 2016
+++ src/sys/net/rtsock.c	Tue May 17 15:21:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.187 2016/05/17 12:58:21 ozaki-r Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.188 2016/05/17 15:21:14 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.187 2016/05/17 12:58:21 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.188 2016/05/17 15:21:14 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -140,8 +140,8 @@ DOMAIN_DEFINE(routedomain); /* forward d
 #endif
 
 #ifdef RTSOCK_DEBUG
-#define RT_IN_PRINT(b, a) (in_print((b), sizeof(b), \
-&((const struct sockaddr_in *)info.rti_info[(a)])->sin_addr), (b))
+#define RT_IN_PRINT(info, b, a) (in_print((b), sizeof(b), \
+&((const struct sockaddr_in *)(info)->rti_info[(a)])->sin_addr), (b))
 #endif /* RTSOCK_DEBUG */
 
 struct route_info COMPATNAME(route_info) = {
@@ -507,8 +507,8 @@ route_output_report(struct rtentry *rt, 
 			"for info->rti_info[RTAX_DST] %s "
 			"ifa_getifa %p ifa_seqno %p\n",
 			__func__,
-			RT_IN_PRINT(ibuf, RTAX_IFA),
-			RT_IN_PRINT(abuf, RTAX_DST),
+			RT_IN_PRINT(info, ibuf, RTAX_IFA),
+			RT_IN_PRINT(info, abuf, RTAX_DST),
 			(void *)rtifa->ifa_getifa,
 			rtifa->ifa_seqno);
 		}
@@ -589,7 +589,7 @@ COMPATNAME(route_output)(struct mbuf *m,
 	if (info.rti_info[RTAX_DST]->sa_family == AF_INET) {
 		char abuf[INET_ADDRSTRLEN];
 		printf("%s: extracted info.rti_info[RTAX_DST] %s\n", __func__,
-		RT_IN_PRINT(abuf, RTAX_DST));
+		RT_IN_PRINT(, abuf, RTAX_DST));
 	}
 #endif /* RTSOCK_DEBUG */
 	if (info.rti_info[RTAX_DST] == NULL ||

CVS commit: src/sys/dev/ic

[Julian Coleman]

Module Name:src
Committed By:   jdc
Date:   Tue May 17 14:44:53 UTC 2016

Modified Files:
src/sys/dev/ic: gem.c

Log Message:
PR kern/46083

Track the start of each packet, so that we set the "Start of Frame" bit in
all the relevant transmit descriptors when enqueing multiple packets.

Patch from Valery Ushakov, slightly modified by me to handle debug output.

Tested on macppc/6.x and sparc64/7.99.x.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/ic/gem.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/ic/gem.c
diff -u src/sys/dev/ic/gem.c:1.104 src/sys/dev/ic/gem.c:1.105
--- src/sys/dev/ic/gem.c:1.104	Tue Feb  9 08:32:10 2016
+++ src/sys/dev/ic/gem.c	Tue May 17 14:44:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gem.c,v 1.104 2016/02/09 08:32:10 ozaki-r Exp $ */
+/*	$NetBSD: gem.c,v 1.105 2016/05/17 14:44:53 jdc Exp $ */
 
 /*
  *
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.104 2016/02/09 08:32:10 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.105 2016/05/17 14:44:53 jdc Exp $");
 
 #include "opt_inet.h"
 
@@ -1362,6 +1362,9 @@ gem_start(struct ifnet *ifp)
 	struct gem_txsoft *txs;
 	bus_dmamap_t dmamap;
 	int error, firsttx, nexttx = -1, lasttx = -1, ofree, seg;
+#ifdef GEM_DEBUG
+	int otxnext;
+#endif
 	uint64_t flags = 0;
 
 	if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
@@ -1372,10 +1375,12 @@ gem_start(struct ifnet *ifp)
 	 * the first descriptor we'll use.
 	 */
 	ofree = sc->sc_txfree;
-	firsttx = sc->sc_txnext;
+#ifdef GEM_DEBUG
+	otxnext = sc->sc_txnext;
+#endif
 
 	DPRINTF(sc, ("%s: gem_start: txfree %d, txnext %d\n",
-	device_xname(sc->sc_dev), ofree, firsttx));
+	device_xname(sc->sc_dev), ofree, otxnext));
 
 	/*
 	 * Loop through the send queue, setting up transmit descriptors
@@ -1480,7 +1485,8 @@ gem_start(struct ifnet *ifp)
 		/*
 		 * Initialize the transmit descriptors.
 		 */
-		for (nexttx = sc->sc_txnext, seg = 0;
+		firsttx = sc->sc_txnext;
+		for (nexttx = firsttx, seg = 0;
 		 seg < dmamap->dm_nsegs;
 		 seg++, nexttx = GEM_NEXTTX(nexttx)) {
 
@@ -1602,7 +1608,7 @@ gem_start(struct ifnet *ifp)
 
 	if (sc->sc_txfree != ofree) {
 		DPRINTF(sc, ("%s: packets enqueued, IC on %d, OWN on %d\n",
-		device_xname(sc->sc_dev), lasttx, firsttx));
+		device_xname(sc->sc_dev), lasttx, otxnext));
 		/*
 		 * The entire packet chain is set up.
 		 * Kick the transmitter.

CVS commit: src/sys/dev/ic

[Julian Coleman]

Module Name:src
Committed By:   jdc
Date:   Tue May 17 14:44:53 UTC 2016

Modified Files:
src/sys/dev/ic: gem.c

Log Message:
PR kern/46083

Track the start of each packet, so that we set the "Start of Frame" bit in
all the relevant transmit descriptors when enqueing multiple packets.

Patch from Valery Ushakov, slightly modified by me to handle debug output.

Tested on macppc/6.x and sparc64/7.99.x.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/ic/gem.c

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

CVS commit: src/external/gpl2/xcvs/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May 17 14:00:09 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/lib: __fpending.c alloca.c allocsa.c
asnprintf.c asprintf.c atexit.c basename.c canon-host.c
canonicalize.c chdir-long.c closeout.c cycle-check.c dirname.c
dup-safer.c dup2.c error.c exitfail.c fd-safer.c filenamecat.c
fncase.c fnmatch.c fnmatch_loop.c fseeko.c ftello.c ftruncate.c
gai_strerror.c getaddrinfo.c getcwd.c getdate.c getdelim.c
gethostname.c getline.c getlogin_r.c getndelim2.c getnline.c
getopt.c getopt1.c getpass.c gettime.c gettimeofday.c glob.c
lstat.c malloc.c mbchar.c md5.c memchr.c memmove.c mempcpy.c
memrchr.c mkdir.c mkstemp.c mktime.c nanosleep.c openat.c
pagealign_alloc.c pipe-safer.c printf-args.c printf-parse.c
progname.c quotearg.c readlink.c realloc.c regcomp.c regex.c
regex_internal.c regexec.c rename.c rpmatch.c save-cwd.c setenv.c
sighandle.c strcasecmp.c strdup.c strerror.c strftime.c
stripslash.c strncasecmp.c strnlen1.c strstr.c strtol.c strtoul.c
sunos57-select.c tempname.c time_r.c unsetenv.c vasnprintf.c
vasprintf.c waitpid.c xalloc-die.c xgetcwd.c xgethostname.c
xmalloc.c xreadlink.c yesno.c
src/external/gpl2/xcvs/dist/src: acl.c add.c admin.c annotate.c
buffer.c checkin.c checkout.c classify.c client.c commit.c
create_adm.c cvsrc.c diff.c edit.c entries.c error.c exithandle.c
expand_path.c fileattr.c filesubr.c find_names.c gssapi-client.c
hardlink.c hash.c history.c ignore.c import.c kerberos4-client.c
lock.c log-buffer.c log.c login.c logmsg.c ls.c main.c mkmodules.c
modules.c ms-buffer.c myndbm.c no_diff.c parseinfo.c patch.c rcs.c
rcscmds.c recurse.c release.c remove.c repos.c root.c rsh-client.c
run.c scramble.c server.c socket-client.c stack.c status.c subr.c
tag.c update.c vers_ts.c version.c watch.c wrapper.c zlib.c

Log Message:
Add RCSID's


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/xcvs/dist/lib/__fpending.c \
src/external/gpl2/xcvs/dist/lib/alloca.c \
src/external/gpl2/xcvs/dist/lib/allocsa.c \
src/external/gpl2/xcvs/dist/lib/asnprintf.c \
src/external/gpl2/xcvs/dist/lib/asprintf.c \
src/external/gpl2/xcvs/dist/lib/atexit.c \
src/external/gpl2/xcvs/dist/lib/basename.c \
src/external/gpl2/xcvs/dist/lib/canon-host.c \
src/external/gpl2/xcvs/dist/lib/canonicalize.c \
src/external/gpl2/xcvs/dist/lib/chdir-long.c \
src/external/gpl2/xcvs/dist/lib/closeout.c \
src/external/gpl2/xcvs/dist/lib/cycle-check.c \
src/external/gpl2/xcvs/dist/lib/dirname.c \
src/external/gpl2/xcvs/dist/lib/dup-safer.c \
src/external/gpl2/xcvs/dist/lib/dup2.c \
src/external/gpl2/xcvs/dist/lib/error.c \
src/external/gpl2/xcvs/dist/lib/exitfail.c \
src/external/gpl2/xcvs/dist/lib/fd-safer.c \
src/external/gpl2/xcvs/dist/lib/filenamecat.c \
src/external/gpl2/xcvs/dist/lib/fncase.c \
src/external/gpl2/xcvs/dist/lib/fnmatch.c \
src/external/gpl2/xcvs/dist/lib/fnmatch_loop.c \
src/external/gpl2/xcvs/dist/lib/fseeko.c \
src/external/gpl2/xcvs/dist/lib/ftello.c \
src/external/gpl2/xcvs/dist/lib/ftruncate.c \
src/external/gpl2/xcvs/dist/lib/gai_strerror.c \
src/external/gpl2/xcvs/dist/lib/getaddrinfo.c \
src/external/gpl2/xcvs/dist/lib/getcwd.c \
src/external/gpl2/xcvs/dist/lib/getdelim.c \
src/external/gpl2/xcvs/dist/lib/gethostname.c \
src/external/gpl2/xcvs/dist/lib/getline.c \
src/external/gpl2/xcvs/dist/lib/getlogin_r.c \
src/external/gpl2/xcvs/dist/lib/getndelim2.c \
src/external/gpl2/xcvs/dist/lib/getnline.c \
src/external/gpl2/xcvs/dist/lib/getopt.c \
src/external/gpl2/xcvs/dist/lib/getopt1.c \
src/external/gpl2/xcvs/dist/lib/getpass.c \
src/external/gpl2/xcvs/dist/lib/gettime.c \
src/external/gpl2/xcvs/dist/lib/gettimeofday.c \
src/external/gpl2/xcvs/dist/lib/glob.c \
src/external/gpl2/xcvs/dist/lib/lstat.c \
src/external/gpl2/xcvs/dist/lib/malloc.c \
src/external/gpl2/xcvs/dist/lib/mbchar.c \
src/external/gpl2/xcvs/dist/lib/md5.c \
src/external/gpl2/xcvs/dist/lib/memchr.c \
src/external/gpl2/xcvs/dist/lib/memmove.c \
src/external/gpl2/xcvs/dist/lib/mempcpy.c \
src/external/gpl2/xcvs/dist/lib/memrchr.c \
src/external/gpl2/xcvs/dist/lib/mkdir.c \
src/external/gpl2/xcvs/dist/lib/mkstemp.c \
src/external/gpl2/xcvs/dist/lib/mktime.c \
src/external/gpl2/xcvs/dist/lib/nanosleep.c \
src/external/gpl2/xcvs/dist/lib/openat.c \
src/external/gpl2/xcvs/dist/lib/pagealign_alloc.c \
src/external/gpl2/xcvs/dist/lib/pipe-safer.c \
src/external/gpl2/xcvs/dist/lib/printf-args.c \

CVS commit: src/external/gpl2/xcvs/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May 17 14:00:09 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/lib: __fpending.c alloca.c allocsa.c
asnprintf.c asprintf.c atexit.c basename.c canon-host.c
canonicalize.c chdir-long.c closeout.c cycle-check.c dirname.c
dup-safer.c dup2.c error.c exitfail.c fd-safer.c filenamecat.c
fncase.c fnmatch.c fnmatch_loop.c fseeko.c ftello.c ftruncate.c
gai_strerror.c getaddrinfo.c getcwd.c getdate.c getdelim.c
gethostname.c getline.c getlogin_r.c getndelim2.c getnline.c
getopt.c getopt1.c getpass.c gettime.c gettimeofday.c glob.c
lstat.c malloc.c mbchar.c md5.c memchr.c memmove.c mempcpy.c
memrchr.c mkdir.c mkstemp.c mktime.c nanosleep.c openat.c
pagealign_alloc.c pipe-safer.c printf-args.c printf-parse.c
progname.c quotearg.c readlink.c realloc.c regcomp.c regex.c
regex_internal.c regexec.c rename.c rpmatch.c save-cwd.c setenv.c
sighandle.c strcasecmp.c strdup.c strerror.c strftime.c
stripslash.c strncasecmp.c strnlen1.c strstr.c strtol.c strtoul.c
sunos57-select.c tempname.c time_r.c unsetenv.c vasnprintf.c
vasprintf.c waitpid.c xalloc-die.c xgetcwd.c xgethostname.c
xmalloc.c xreadlink.c yesno.c
src/external/gpl2/xcvs/dist/src: acl.c add.c admin.c annotate.c
buffer.c checkin.c checkout.c classify.c client.c commit.c
create_adm.c cvsrc.c diff.c edit.c entries.c error.c exithandle.c
expand_path.c fileattr.c filesubr.c find_names.c gssapi-client.c
hardlink.c hash.c history.c ignore.c import.c kerberos4-client.c
lock.c log-buffer.c log.c login.c logmsg.c ls.c main.c mkmodules.c
modules.c ms-buffer.c myndbm.c no_diff.c parseinfo.c patch.c rcs.c
rcscmds.c recurse.c release.c remove.c repos.c root.c rsh-client.c
run.c scramble.c server.c socket-client.c stack.c status.c subr.c
tag.c update.c vers_ts.c version.c watch.c wrapper.c zlib.c

Log Message:
Add RCSID's


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/xcvs/dist/lib/__fpending.c \
src/external/gpl2/xcvs/dist/lib/alloca.c \
src/external/gpl2/xcvs/dist/lib/allocsa.c \
src/external/gpl2/xcvs/dist/lib/asnprintf.c \
src/external/gpl2/xcvs/dist/lib/asprintf.c \
src/external/gpl2/xcvs/dist/lib/atexit.c \
src/external/gpl2/xcvs/dist/lib/basename.c \
src/external/gpl2/xcvs/dist/lib/canon-host.c \
src/external/gpl2/xcvs/dist/lib/canonicalize.c \
src/external/gpl2/xcvs/dist/lib/chdir-long.c \
src/external/gpl2/xcvs/dist/lib/closeout.c \
src/external/gpl2/xcvs/dist/lib/cycle-check.c \
src/external/gpl2/xcvs/dist/lib/dirname.c \
src/external/gpl2/xcvs/dist/lib/dup-safer.c \
src/external/gpl2/xcvs/dist/lib/dup2.c \
src/external/gpl2/xcvs/dist/lib/error.c \
src/external/gpl2/xcvs/dist/lib/exitfail.c \
src/external/gpl2/xcvs/dist/lib/fd-safer.c \
src/external/gpl2/xcvs/dist/lib/filenamecat.c \
src/external/gpl2/xcvs/dist/lib/fncase.c \
src/external/gpl2/xcvs/dist/lib/fnmatch.c \
src/external/gpl2/xcvs/dist/lib/fnmatch_loop.c \
src/external/gpl2/xcvs/dist/lib/fseeko.c \
src/external/gpl2/xcvs/dist/lib/ftello.c \
src/external/gpl2/xcvs/dist/lib/ftruncate.c \
src/external/gpl2/xcvs/dist/lib/gai_strerror.c \
src/external/gpl2/xcvs/dist/lib/getaddrinfo.c \
src/external/gpl2/xcvs/dist/lib/getcwd.c \
src/external/gpl2/xcvs/dist/lib/getdelim.c \
src/external/gpl2/xcvs/dist/lib/gethostname.c \
src/external/gpl2/xcvs/dist/lib/getline.c \
src/external/gpl2/xcvs/dist/lib/getlogin_r.c \
src/external/gpl2/xcvs/dist/lib/getndelim2.c \
src/external/gpl2/xcvs/dist/lib/getnline.c \
src/external/gpl2/xcvs/dist/lib/getopt.c \
src/external/gpl2/xcvs/dist/lib/getopt1.c \
src/external/gpl2/xcvs/dist/lib/getpass.c \
src/external/gpl2/xcvs/dist/lib/gettime.c \
src/external/gpl2/xcvs/dist/lib/gettimeofday.c \
src/external/gpl2/xcvs/dist/lib/glob.c \
src/external/gpl2/xcvs/dist/lib/lstat.c \
src/external/gpl2/xcvs/dist/lib/malloc.c \
src/external/gpl2/xcvs/dist/lib/mbchar.c \
src/external/gpl2/xcvs/dist/lib/md5.c \
src/external/gpl2/xcvs/dist/lib/memchr.c \
src/external/gpl2/xcvs/dist/lib/memmove.c \
src/external/gpl2/xcvs/dist/lib/mempcpy.c \
src/external/gpl2/xcvs/dist/lib/memrchr.c \
src/external/gpl2/xcvs/dist/lib/mkdir.c \
src/external/gpl2/xcvs/dist/lib/mkstemp.c \
src/external/gpl2/xcvs/dist/lib/mktime.c \
src/external/gpl2/xcvs/dist/lib/nanosleep.c \
src/external/gpl2/xcvs/dist/lib/openat.c \
src/external/gpl2/xcvs/dist/lib/pagealign_alloc.c \
src/external/gpl2/xcvs/dist/lib/pipe-safer.c \
src/external/gpl2/xcvs/dist/lib/printf-args.c \

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 17 12:58:21 UTC 2016

Modified Files:
src/sys/net: rtsock.c

Log Message:
Tidy up route_output

Avoid jumping into the middle of a switch statement, use a function instead.


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/net/rtsock.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/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.186 src/sys/net/rtsock.c:1.187
--- src/sys/net/rtsock.c:1.186	Thu May 12 02:24:16 2016
+++ src/sys/net/rtsock.c	Tue May 17 12:58:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.186 2016/05/12 02:24:16 ozaki-r Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.187 2016/05/17 12:58:21 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.186 2016/05/12 02:24:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.187 2016/05/17 12:58:21 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -480,13 +480,72 @@ route_get_sdl(const struct ifnet *ifp, c
 	}
 }
 
+static int
+route_output_report(struct rtentry *rt, struct rt_addrinfo *info,
+struct rt_xmsghdr *rtm, struct rt_xmsghdr **new_rtm)
+{
+	int len;
+	struct ifnet *ifp;
+
+	if ((rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) == 0)
+		;
+	else if ((ifp = rt->rt_ifp) != NULL) {
+		const struct ifaddr *rtifa;
+		info->rti_info[RTAX_IFP] = ifp->if_dl->ifa_addr;
+		/* rtifa used to be simply rt->rt_ifa.
+		 * If rt->rt_ifa != NULL, then
+		 * rt_get_ifa() != NULL.  So this
+		 * ought to still be safe. --dyoung
+		 */
+		rtifa = rt_get_ifa(rt);
+		info->rti_info[RTAX_IFA] = rtifa->ifa_addr;
+#ifdef RTSOCK_DEBUG
+		if (info->rti_info[RTAX_IFA]->sa_family == AF_INET) {
+			char ibuf[INET_ADDRSTRLEN];
+			char abuf[INET_ADDRSTRLEN];
+			printf("%s: copying out RTAX_IFA %s "
+			"for info->rti_info[RTAX_DST] %s "
+			"ifa_getifa %p ifa_seqno %p\n",
+			__func__,
+			RT_IN_PRINT(ibuf, RTAX_IFA),
+			RT_IN_PRINT(abuf, RTAX_DST),
+			(void *)rtifa->ifa_getifa,
+			rtifa->ifa_seqno);
+		}
+#endif /* RTSOCK_DEBUG */
+		if (ifp->if_flags & IFF_POINTOPOINT)
+			info->rti_info[RTAX_BRD] = rtifa->ifa_dstaddr;
+		else
+			info->rti_info[RTAX_BRD] = NULL;
+		rtm->rtm_index = ifp->if_index;
+	} else {
+		info->rti_info[RTAX_IFP] = NULL;
+		info->rti_info[RTAX_IFA] = NULL;
+	}
+	(void)rt_msg2(rtm->rtm_type, info, NULL, NULL, );
+	if (len > rtm->rtm_msglen) {
+		struct rt_xmsghdr *old_rtm = rtm;
+		R_Malloc(*new_rtm, struct rt_xmsghdr *, len);
+		if (*new_rtm == NULL)
+			return ENOBUFS;
+		(void)memcpy(*new_rtm, old_rtm, old_rtm->rtm_msglen);
+		rtm = *new_rtm;
+	}
+	(void)rt_msg2(rtm->rtm_type, info, rtm, NULL, 0);
+	rtm->rtm_flags = rt->rt_flags;
+	rtm_setmetrics(rt, rtm);
+	rtm->rtm_addrs = info->rti_addrs;
+
+	return 0;
+}
+
 /*ARGSUSED*/
 int
 COMPATNAME(route_output)(struct mbuf *m, struct socket *so)
 {
 	struct sockproto proto = { .sp_family = PF_XROUTE, };
 	struct rt_xmsghdr *rtm = NULL;
-	struct rt_xmsghdr *old_rtm = NULL;
+	struct rt_xmsghdr *old_rtm = NULL, *new_rtm = NULL;
 	struct rtentry *rt = NULL;
 	struct rtentry *saved_nrt = NULL;
 	struct rt_addrinfo info;
@@ -494,8 +553,6 @@ COMPATNAME(route_output)(struct mbuf *m,
 	struct ifnet *ifp = NULL;
 	struct ifaddr *ifa = NULL;
 	sa_family_t family;
-	bool is_ll = false;
-	int ll_flags = 0;
 	struct sockaddr_dl sdl;
 
 #define senderr(e) do { error = e; goto flush;} while (/*CONSTCOND*/ 0)
@@ -621,9 +678,20 @@ COMPATNAME(route_output)(struct mbuf *m,
 		}
 #endif /* INET */
 		error = rtrequest1(rtm->rtm_type, , _nrt);
-		if (error == 0) {
-			rt = saved_nrt;
-			goto report;
+		if (error != 0)
+			break;
+
+		rt = saved_nrt;
+		info.rti_info[RTAX_DST] = rt_getkey(rt);
+		info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
+		info.rti_info[RTAX_NETMASK] = rt_mask(rt);
+		info.rti_info[RTAX_TAG] = rt_gettag(rt);
+		error = route_output_report(rt, , rtm, _rtm);
+		if (error)
+			senderr(error);
+		if (new_rtm != NULL) {
+			old_rtm = rtm;
+			rtm = new_rtm;
 		}
 		break;
 
@@ -661,73 +729,34 @@ COMPATNAME(route_output)(struct mbuf *m,
 		 (rtm->rtm_flags & RTF_UP) == 0) &&
 		rtm->rtm_type == RTM_GET &&
 		sockaddr_cmp(rt_getkey(rt), info.rti_info[RTAX_DST]) != 0) {
+			int ll_flags = 0;
 			route_get_sdl(rt->rt_ifp, info.rti_info[RTAX_DST], ,
 			_flags);
 			info.rti_info[RTAX_GATEWAY] = sstocsa();
-			is_ll = true;
-			goto skip;
+			error = route_output_report(rt, , rtm, _rtm);
+			if (error)
+senderr(error);
+			if (new_rtm != NULL) {
+old_rtm = rtm;
+rtm = new_rtm;
+			}
+			rtm->rtm_flags |= RTF_LLDATA;
+			rtm->rtm_flags |= (ll_flags & LLE_STATIC) ? RTF_STATIC : 0;
+			break;
 		}
 
 		switch (rtm->rtm_type) {
 		case RTM_GET:
-		report:
 			info.rti_info[RTAX_DST] = rt_getkey(rt);
 			info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
 			

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 17 12:58:21 UTC 2016

Modified Files:
src/sys/net: rtsock.c

Log Message:
Tidy up route_output

Avoid jumping into the middle of a switch statement, use a function instead.


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/net/rtsock.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/usb

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue May 17 11:37:51 UTC 2016

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

Log Message:
initialize buf to NULL for error branch on line 532


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/dev/usb/usbdi.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/usb

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue May 17 11:37:51 UTC 2016

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

Log Message:
initialize buf to NULL for error branch on line 532


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/dev/usb/usbdi.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/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.170 src/sys/dev/usb/usbdi.c:1.171
--- src/sys/dev/usb/usbdi.c:1.170	Fri May  6 05:19:32 2016
+++ src/sys/dev/usb/usbdi.c	Tue May 17 11:37:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.170 2016/05/06 05:19:32 skrll Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.171 2016/05/17 11:37:50 pooka Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.170 2016/05/06 05:19:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.171 2016/05/17 11:37:50 pooka Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -508,7 +508,7 @@ usbd_create_xfer(struct usbd_pipe *pipe,
 unsigned int nframes, struct usbd_xfer **xp)
 {
 	KASSERT(xp != NULL);
-	void *buf;
+	void *buf = NULL;
 
 	struct usbd_xfer *xfer = usbd_alloc_xfer(pipe->up_dev, nframes);
 	if (xfer == NULL)

CVS commit: src/sys/dev/pci

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue May 17 10:05:31 UTC 2016

Modified Files:
src/sys/dev/pci: if_vioif.c

Log Message:
Try to get more packets going if the transmit interrupt indicates
some were sent.  Doing so avoids a situation where vioif_start never
gets called in case the sendqueue fills up and therefore the interface
perpetually drops all packets due to the queue being full.
(not sure why all drivers need to do this themselves; just keeping
up with the joneses)

Problem reported and patch tested by jmmlmendes and yasukata at
repo.rumpkernel.org/rumprun


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_vioif.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/pci

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue May 17 10:05:31 UTC 2016

Modified Files:
src/sys/dev/pci: if_vioif.c

Log Message:
Try to get more packets going if the transmit interrupt indicates
some were sent.  Doing so avoids a situation where vioif_start never
gets called in case the sendqueue fills up and therefore the interface
perpetually drops all packets due to the queue being full.
(not sure why all drivers need to do this themselves; just keeping
up with the joneses)

Problem reported and patch tested by jmmlmendes and yasukata at
repo.rumpkernel.org/rumprun


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_vioif.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/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.22 src/sys/dev/pci/if_vioif.c:1.23
--- src/sys/dev/pci/if_vioif.c:1.22	Tue Feb  9 08:32:11 2016
+++ src/sys/dev/pci/if_vioif.c	Tue May 17 10:05:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vioif.c,v 1.22 2016/02/09 08:32:11 ozaki-r Exp $	*/
+/*	$NetBSD: if_vioif.c,v 1.23 2016/05/17 10:05:31 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.22 2016/02/09 08:32:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.23 2016/05/17 10:05:31 pooka Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -1116,6 +1116,7 @@ vioif_tx_vq_done(struct virtqueue *vq)
 {
 	struct virtio_softc *vsc = vq->vq_owner;
 	struct vioif_softc *sc = device_private(vsc->sc_child);
+	struct ifnet *ifp = >sc_ethercom.ec_if;
 	int r = 0;
 
 	VIOIF_TX_LOCK(sc);
@@ -1127,6 +1128,8 @@ vioif_tx_vq_done(struct virtqueue *vq)
 
 out:
 	VIOIF_TX_UNLOCK(sc);
+	if (r)
+		vioif_start(ifp);
 	return r;
 }
 

CVS commit: src/tests/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Tue May 17 09:05:15 UTC 2016

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

Log Message:
Use valid (standard) shell syntax, in anticipation of /bin/sh enforcing
it sometime soon (perhaps.)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/sh/t_shift.sh

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

CVS commit: src/tests/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Tue May 17 09:05:15 UTC 2016

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

Log Message:
Use valid (standard) shell syntax, in anticipation of /bin/sh enforcing
it sometime soon (perhaps.)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/sh/t_shift.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_shift.sh
diff -u src/tests/bin/sh/t_shift.sh:1.1 src/tests/bin/sh/t_shift.sh:1.2
--- src/tests/bin/sh/t_shift.sh:1.1	Tue Mar  8 14:26:26 2016
+++ src/tests/bin/sh/t_shift.sh	Tue May 17 09:05:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_shift.sh,v 1.1 2016/03/08 14:26:26 christos Exp $
+# $NetBSD: t_shift.sh,v 1.2 2016/05/17 09:05:14 kre Exp $
 #
 # Copyright (c) 2016 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -120,7 +120,7 @@ function_shift_head() {
 	atf_set "descr" "Test that shift in a function does not affect outside"
 }
 function_shift_body() {
-	# later...
+	: # later...
 }
 
 atf_test_case non_numeric_shift

CVS commit: src/sys/netinet

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 17 09:00:24 UTC 2016

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

Log Message:
Get rid of unnecessary assignment


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/netinet/if_arp.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/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.209 src/sys/netinet/if_arp.c:1.210
--- src/sys/netinet/if_arp.c:1.209	Mon Apr 25 14:38:08 2016
+++ src/sys/netinet/if_arp.c	Tue May 17 09:00:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_arp.c,v 1.209 2016/04/25 14:38:08 ozaki-r Exp $	*/
+/*	$NetBSD: if_arp.c,v 1.210 2016/05/17 09:00:24 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.209 2016/04/25 14:38:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.210 2016/05/17 09:00:24 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -598,7 +598,7 @@ arp_rtrequest(int req, struct rtentry *r
 
 		rt->rt_expire = 0;
 		if (useloopback) {
-			ifp = rt->rt_ifp = lo0ifp;
+			rt->rt_ifp = lo0ifp;
 			rt->rt_rmx.rmx_mtu = 0;
 		}
 		rt->rt_flags |= RTF_LOCAL;

CVS commit: src/sys/netinet

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue May 17 09:00:24 UTC 2016

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

Log Message:
Get rid of unnecessary assignment


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/netinet/if_arp.c

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

CVS commit: src/sys/arch/arm/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue May 17 08:27:24 UTC 2016

Modified Files:
src/sys/arch/arm/include: armreg.h

Log Message:
Fix CORTEXA9Rx definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/arm/include/armreg.h

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

CVS commit: src/sys/arch/arm/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue May 17 08:27:24 UTC 2016

Modified Files:
src/sys/arch/arm/include: armreg.h

Log Message:
Fix CORTEXA9Rx definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/arm/include/armreg.h

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/arm/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.110 src/sys/arch/arm/include/armreg.h:1.111
--- src/sys/arch/arm/include/armreg.h:1.110	Thu Mar  3 17:01:31 2016
+++ src/sys/arch/arm/include/armreg.h	Tue May 17 08:27:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: armreg.h,v 1.110 2016/03/03 17:01:31 skrll Exp $	*/
+/*	$NetBSD: armreg.h,v 1.111 2016/05/17 08:27:24 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -220,9 +220,10 @@
 #define CPU_ID_CORTEXA8R1	0x411fc080
 #define CPU_ID_CORTEXA8R2	0x412fc080
 #define CPU_ID_CORTEXA8R3	0x413fc080
-#define CPU_ID_CORTEXA9R2	0x411fc090
-#define CPU_ID_CORTEXA9R3	0x412fc090
-#define CPU_ID_CORTEXA9R4	0x413fc090
+#define CPU_ID_CORTEXA9R1	0x411fc090
+#define CPU_ID_CORTEXA9R2	0x412fc090
+#define CPU_ID_CORTEXA9R3	0x413fc090
+#define CPU_ID_CORTEXA9R4	0x414fc090
 #define CPU_ID_CORTEXA15R2	0x412fc0f0
 #define CPU_ID_CORTEXA15R3	0x413fc0f0
 #define CPU_ID_CORTEXA17R1	0x411fc0e0

CVS commit: src/doc

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Tue May 17 06:52:00 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
Note i.MX7


To generate a diff of this commit:
cvs rdiff -u -r1.2162 -r1.2163 src/doc/CHANGES

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
diff -u src/doc/CHANGES:1.2162 src/doc/CHANGES:1.2163
--- src/doc/CHANGES:1.2162	Mon May 16 07:37:45 2016
+++ src/doc/CHANGES	Tue May 17 06:52:00 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2162 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2163 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -293,3 +293,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		permissions on amd64 and i386. [maxv 20160514]
 	x86: Use processor-specific features to optimize memory access time to
 		the kernel image on amd64 and i386. [maxv 20160515]
+	arm: Add support for i.MX7 SoC. [ryo 20160517]

CVS commit: src/doc

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Tue May 17 06:52:00 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
Note i.MX7


To generate a diff of this commit:
cvs rdiff -u -r1.2162 -r1.2163 src/doc/CHANGES

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

CVS commit: src

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Tue May 17 06:44:46 UTC 2016

Modified Files:
src/etc/etc.evbarm: Makefile.inc
src/sys/arch/arm/imx: files.imx6 if_enet.c if_enetreg.h imx6_reg.h
imx6_snvs.c imxusb.c imxusbreg.h imxusbvar.h
Added Files:
src/sys/arch/arm/imx: files.imx7 if_enet_imx6.c if_enet_imx7.c
if_enetvar.h imx7_axi.c imx7_board.c imx7_ccm.c imx7_ccmreg.h
imx7_ccmvar.h imx7_gpcreg.h imx7_gpio.c imx7_intr.h imx7_iomux.c
imx7_iomuxreg.h imx7_ocotp.c imx7_ocotpreg.h imx7_ocotpvar.h
imx7_snvs.c imx7_srcreg.h imx7_uart.c imx7_usb.c imx7_usbreg.h
imx7_usdhc.c imx7_wdog.c imx7reg.h imx7var.h imxsnvs.c imxsnvsreg.h
imxsnvsvar.h
src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 ARMADILLO-IOT-G3_INSTALL
files.imx7 mk.imx7 std.imx7
src/sys/arch/evbarm/imx7: genassym.cf imx7_ioconfig.c imx7_machdep.c
imx7_start.S platform.h

Log Message:
Add initial support for Freescale i.MX7 SoC and
Atmark Techno Armadillo-IoT G3 boards.

Contributed by Internet Initiative Japan Inc.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/etc/etc.evbarm/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/files.imx6
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/imx/files.imx7 \
src/sys/arch/arm/imx/if_enet_imx6.c src/sys/arch/arm/imx/if_enet_imx7.c \
src/sys/arch/arm/imx/if_enetvar.h src/sys/arch/arm/imx/imx7_axi.c \
src/sys/arch/arm/imx/imx7_board.c src/sys/arch/arm/imx/imx7_ccm.c \
src/sys/arch/arm/imx/imx7_ccmreg.h src/sys/arch/arm/imx/imx7_ccmvar.h \
src/sys/arch/arm/imx/imx7_gpcreg.h src/sys/arch/arm/imx/imx7_gpio.c \
src/sys/arch/arm/imx/imx7_intr.h src/sys/arch/arm/imx/imx7_iomux.c \
src/sys/arch/arm/imx/imx7_iomuxreg.h src/sys/arch/arm/imx/imx7_ocotp.c \
src/sys/arch/arm/imx/imx7_ocotpreg.h src/sys/arch/arm/imx/imx7_ocotpvar.h \
src/sys/arch/arm/imx/imx7_snvs.c src/sys/arch/arm/imx/imx7_srcreg.h \
src/sys/arch/arm/imx/imx7_uart.c src/sys/arch/arm/imx/imx7_usb.c \
src/sys/arch/arm/imx/imx7_usbreg.h src/sys/arch/arm/imx/imx7_usdhc.c \
src/sys/arch/arm/imx/imx7_wdog.c src/sys/arch/arm/imx/imx7reg.h \
src/sys/arch/arm/imx/imx7var.h src/sys/arch/arm/imx/imxsnvs.c \
src/sys/arch/arm/imx/imxsnvsreg.h src/sys/arch/arm/imx/imxsnvsvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/if_enet.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/if_enetreg.h \
src/sys/arch/arm/imx/imx6_snvs.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/imx6_reg.h \
src/sys/arch/arm/imx/imxusbreg.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/imx/imxusb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imxusbvar.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 \
src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3_INSTALL \
src/sys/arch/evbarm/conf/files.imx7 src/sys/arch/evbarm/conf/mk.imx7 \
src/sys/arch/evbarm/conf/std.imx7
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/imx7/genassym.cf \
src/sys/arch/evbarm/imx7/imx7_ioconfig.c \
src/sys/arch/evbarm/imx7/imx7_machdep.c \
src/sys/arch/evbarm/imx7/imx7_start.S src/sys/arch/evbarm/imx7/platform.h

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