Re: CVS commit: src/sys/fs/msdosfs
On Sun, Jul 13, 2014 at 04:34:59PM +0200, Martin Husemann wrote: On Sun, Jul 13, 2014 at 04:31:58PM +0200, Martin Husemann wrote: Why does lsof define _KERNEL ? Let me rephrase: we provide the userland important stuff when either _KERNEL or MAKEFS is defined - maybe MAKEFS should be renamed and lsof could use the new define instead of _KERNEL. MSDOSFS_MOUNT_USERLAND_DEFS or something. lsof inherently want to mess with the kernel details, i.e. to try to rediscover the original path name used to open a file etc. Joerg
Re: CVS commit: src/sys/fs/msdosfs
On Mon, Jul 14, 2014 at 10:26:58AM +0200, Joerg Sonnenberger wrote: MSDOSFS_MOUNT_USERLAND_DEFS or something. lsof inherently want to mess with the kernel details, i.e. to try to rediscover the original path name used to open a file etc. Yes, but some other parts in that file are really kernel only (and currently #ifdef'd on !MAKEFS, which is just a strange name). Martin
Re: CVS commit: src/sys
hello,
(07/09/14 13:54), Tyler R. Retzlaff wrote:
Module Name:src
Committed By: rtr
Date: Wed Jul 9 04:54:04 UTC 2014
Modified Files:
src/sys/compat/svr4: svr4_stream.c
src/sys/kern: uipc_syscalls.c uipc_usrreq.c
src/sys/net: if_gre.c link_proto.c raw_usrreq.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap.h l2cap_socket.c l2cap_upper.c
rfcomm.h rfcomm_dlc.c rfcomm_session.c rfcomm_socket.c
rfcomm_upper.c sco.h sco_socket.c sco_upper.c
src/sys/netinet: raw_ip.c tcp_usrreq.c udp_usrreq.c
src/sys/netinet6: raw_ip6.c udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netmpls: mpls_proto.c
src/sys/netnatm: natm.c
src/sys/rump/net/lib/libsockin: sockin.c
src/sys/sys: param.h protosw.h socketvar.h
Log Message:
* split PRU_PEERADDR and PRU_SOCKADDR function out of pr_generic()
usrreq switches and put into separate functions
xxx_{peer,sock}addr(struct socket *, struct mbuf *).
- KASSERT(solocked(so)) always in new functions even if request
is not implemented
At line 597, 608 in raw_ip.c rev 1.132
KASSERT(solocked(0));
These always cause null pointer dereference.
--
t-hash
Re: CVS commit: src/sys
yikes!
thanks for spotting that. should have been KASSERT(solocked(so)).
On Mon, Jul 14, 2014 at 08:56:16PM +0900, Takahiro HAYASHI wrote:
hello,
(07/09/14 13:54), Tyler R. Retzlaff wrote:
Module Name: src
Committed By:rtr
Date:Wed Jul 9 04:54:04 UTC 2014
Modified Files:
src/sys/compat/svr4: svr4_stream.c
src/sys/kern: uipc_syscalls.c uipc_usrreq.c
src/sys/net: if_gre.c link_proto.c raw_usrreq.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap.h l2cap_socket.c l2cap_upper.c
rfcomm.h rfcomm_dlc.c rfcomm_session.c rfcomm_socket.c
rfcomm_upper.c sco.h sco_socket.c sco_upper.c
src/sys/netinet: raw_ip.c tcp_usrreq.c udp_usrreq.c
src/sys/netinet6: raw_ip6.c udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netmpls: mpls_proto.c
src/sys/netnatm: natm.c
src/sys/rump/net/lib/libsockin: sockin.c
src/sys/sys: param.h protosw.h socketvar.h
Log Message:
* split PRU_PEERADDR and PRU_SOCKADDR function out of pr_generic()
usrreq switches and put into separate functions
xxx_{peer,sock}addr(struct socket *, struct mbuf *).
- KASSERT(solocked(so)) always in new functions even if request
is not implemented
At line 597, 608 in raw_ip.c rev 1.132
KASSERT(solocked(0));
These always cause null pointer dereference.
--
t-hash
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 06:21:22 UTC 2014
Modified Files:
src/sys/kern [netbsd-6]: kern_core.c
Log Message:
Pull up following revision(s) (requested by maxt in ticket #1097):
sys/kern/kern_core.c: revision 1.23
Fix a read-beyond-end string read.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/kern/kern_core.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/kern/kern_core.c
diff -u src/sys/kern/kern_core.c:1.20 src/sys/kern/kern_core.c:1.20.8.1
--- src/sys/kern/kern_core.c:1.20 Sat Sep 24 22:53:50 2011
+++ src/sys/kern/kern_core.c Mon Jul 14 06:21:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_core.c,v 1.20 2011/09/24 22:53:50 christos Exp $ */
+/* $NetBSD: kern_core.c,v 1.20.8.1 2014/07/14 06:21:22 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_core.c,v 1.20 2011/09/24 22:53:50 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_core.c,v 1.20.8.1 2014/07/14 06:21:22 msaitoh Exp $);
#include sys/param.h
#include sys/vnode.h
@@ -155,6 +155,12 @@ coredump(struct lwp *l, const char *patt
error = coredump_buildname(p, name, pattern, MAXPATHLEN);
mutex_exit(lim-pl_lock);
+ if (error) {
+ mutex_exit(p-p_lock);
+ mutex_exit(proc_lock);
+ goto done;
+ }
+
/*
* On a simple filename, see if the filesystem allow us to write
* core dumps there.
CVS commit: [netbsd-6-1] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 06:24:17 UTC 2014
Modified Files:
src/sys/kern [netbsd-6-1]: kern_core.c
Log Message:
Pull up following revision(s) (requested by maxt in ticket #1097):
sys/kern/kern_core.c: revision 1.23
Fix a read-beyond-end string read.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.22.1 src/sys/kern/kern_core.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/kern/kern_core.c
diff -u src/sys/kern/kern_core.c:1.20 src/sys/kern/kern_core.c:1.20.22.1
--- src/sys/kern/kern_core.c:1.20 Sat Sep 24 22:53:50 2011
+++ src/sys/kern/kern_core.c Mon Jul 14 06:24:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_core.c,v 1.20 2011/09/24 22:53:50 christos Exp $ */
+/* $NetBSD: kern_core.c,v 1.20.22.1 2014/07/14 06:24:17 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_core.c,v 1.20 2011/09/24 22:53:50 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_core.c,v 1.20.22.1 2014/07/14 06:24:17 msaitoh Exp $);
#include sys/param.h
#include sys/vnode.h
@@ -155,6 +155,12 @@ coredump(struct lwp *l, const char *patt
error = coredump_buildname(p, name, pattern, MAXPATHLEN);
mutex_exit(lim-pl_lock);
+ if (error) {
+ mutex_exit(p-p_lock);
+ mutex_exit(proc_lock);
+ goto done;
+ }
+
/*
* On a simple filename, see if the filesystem allow us to write
* core dumps there.
CVS commit: [netbsd-6-0] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 06:26:02 UTC 2014
Modified Files:
src/sys/kern [netbsd-6-0]: kern_core.c
Log Message:
Pull up following revision(s) (requested by maxt in ticket #1097):
sys/kern/kern_core.c: revision 1.23
Fix a read-beyond-end string read.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.14.1 src/sys/kern/kern_core.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/kern/kern_core.c
diff -u src/sys/kern/kern_core.c:1.20 src/sys/kern/kern_core.c:1.20.14.1
--- src/sys/kern/kern_core.c:1.20 Sat Sep 24 22:53:50 2011
+++ src/sys/kern/kern_core.c Mon Jul 14 06:26:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_core.c,v 1.20 2011/09/24 22:53:50 christos Exp $ */
+/* $NetBSD: kern_core.c,v 1.20.14.1 2014/07/14 06:26:01 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_core.c,v 1.20 2011/09/24 22:53:50 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_core.c,v 1.20.14.1 2014/07/14 06:26:01 msaitoh Exp $);
#include sys/param.h
#include sys/vnode.h
@@ -155,6 +155,12 @@ coredump(struct lwp *l, const char *patt
error = coredump_buildname(p, name, pattern, MAXPATHLEN);
mutex_exit(lim-pl_lock);
+ if (error) {
+ mutex_exit(p-p_lock);
+ mutex_exit(proc_lock);
+ goto done;
+ }
+
/*
* On a simple filename, see if the filesystem allow us to write
* core dumps there.
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 06:32:31 UTC 2014
Modified Files:
src/sys/kern [netbsd-6]: sys_module.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1098):
sys/kern/sys_module.c: revision 1.15
Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/kern/sys_module.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/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.13 src/sys/kern/sys_module.c:1.13.8.1
--- src/sys/kern/sys_module.c:1.13 Fri Jul 8 09:32:45 2011
+++ src/sys/kern/sys_module.c Mon Jul 14 06:32:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.13 2011/07/08 09:32:45 mrg Exp $ */
+/* $NetBSD: sys_module.c,v 1.13.8.1 2014/07/14 06:32:30 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.13 2011/07/08 09:32:45 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.13.8.1 2014/07/14 06:32:30 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,6 +43,11 @@ __KERNEL_RCSID(0, $NetBSD: sys_module.c
#include sys/syscall.h
#include sys/syscallargs.h
+/*
+ * Arbitrary limit to avoid DoS for excessive memory allocation.
+ */
+#define MAXPROPSLEN 4096
+
static int
handle_modctl_load(modctl_load_t *ml)
{
@@ -64,7 +69,12 @@ handle_modctl_load(modctl_load_t *ml)
goto out2;
if (ml-ml_props != NULL) {
+ if (ml-ml_propslen MAXPROPSLEN) {
+ error = ENOMEM;
+ goto out2;
+ }
propslen = ml-ml_propslen + 1;
+
props = (char *)kmem_alloc(propslen, KM_SLEEP);
if (props == NULL) {
error = ENOMEM;
CVS commit: [netbsd-6-1] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 06:33:33 UTC 2014
Modified Files:
src/sys/kern [netbsd-6-1]: sys_module.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1098):
sys/kern/sys_module.c: revision 1.15
Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.14.1 src/sys/kern/sys_module.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/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.13 src/sys/kern/sys_module.c:1.13.14.1
--- src/sys/kern/sys_module.c:1.13 Fri Jul 8 09:32:45 2011
+++ src/sys/kern/sys_module.c Mon Jul 14 06:33:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.13 2011/07/08 09:32:45 mrg Exp $ */
+/* $NetBSD: sys_module.c,v 1.13.14.1 2014/07/14 06:33:32 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.13 2011/07/08 09:32:45 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.13.14.1 2014/07/14 06:33:32 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,6 +43,11 @@ __KERNEL_RCSID(0, $NetBSD: sys_module.c
#include sys/syscall.h
#include sys/syscallargs.h
+/*
+ * Arbitrary limit to avoid DoS for excessive memory allocation.
+ */
+#define MAXPROPSLEN 4096
+
static int
handle_modctl_load(modctl_load_t *ml)
{
@@ -64,7 +69,12 @@ handle_modctl_load(modctl_load_t *ml)
goto out2;
if (ml-ml_props != NULL) {
+ if (ml-ml_propslen MAXPROPSLEN) {
+ error = ENOMEM;
+ goto out2;
+ }
propslen = ml-ml_propslen + 1;
+
props = (char *)kmem_alloc(propslen, KM_SLEEP);
if (props == NULL) {
error = ENOMEM;
CVS commit: [netbsd-6-0] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 06:33:55 UTC 2014
Modified Files:
src/sys/kern [netbsd-6-0]: sys_module.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1098):
sys/kern/sys_module.c: revision 1.15
Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.12.1 src/sys/kern/sys_module.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/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.13 src/sys/kern/sys_module.c:1.13.12.1
--- src/sys/kern/sys_module.c:1.13 Fri Jul 8 09:32:45 2011
+++ src/sys/kern/sys_module.c Mon Jul 14 06:33:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.13 2011/07/08 09:32:45 mrg Exp $ */
+/* $NetBSD: sys_module.c,v 1.13.12.1 2014/07/14 06:33:55 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.13 2011/07/08 09:32:45 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.13.12.1 2014/07/14 06:33:55 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,6 +43,11 @@ __KERNEL_RCSID(0, $NetBSD: sys_module.c
#include sys/syscall.h
#include sys/syscallargs.h
+/*
+ * Arbitrary limit to avoid DoS for excessive memory allocation.
+ */
+#define MAXPROPSLEN 4096
+
static int
handle_modctl_load(modctl_load_t *ml)
{
@@ -64,7 +69,12 @@ handle_modctl_load(modctl_load_t *ml)
goto out2;
if (ml-ml_props != NULL) {
+ if (ml-ml_propslen MAXPROPSLEN) {
+ error = ENOMEM;
+ goto out2;
+ }
propslen = ml-ml_propslen + 1;
+
props = (char *)kmem_alloc(propslen, KM_SLEEP);
if (props == NULL) {
error = ENOMEM;
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:34:22 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 1097 and 1098. To generate a diff of this commit: cvs rdiff -u -r1.1.2.122 -r1.1.2.123 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.122 src/doc/CHANGES-6.2:1.1.2.123 --- src/doc/CHANGES-6.2:1.1.2.122 Wed Jul 9 09:50:24 2014 +++ src/doc/CHANGES-6.2 Mon Jul 14 06:34:22 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.122 2014/07/09 09:50:24 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.123 2014/07/14 06:34:22 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -2952,3 +2952,13 @@ libexec/httpd/small/Makefile 1.2 Update bozohttpd from 2018 to 20140708. [mrg, ticket #1095] + +sys/kern/kern_core.c1.23 + + Fix a read-beyond-end string read. + [maxv, ticket #1097] + +sys/kern/sys_module.c1.15 + + Fix a user-controlled memory allocation. + [maxv, ticket #1098]
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:34:51 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.5 Log Message: Ticket 1097 and 1098. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.1.5 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.5 diff -u src/doc/CHANGES-6.1.5:1.1.2.14 src/doc/CHANGES-6.1.5:1.1.2.15 --- src/doc/CHANGES-6.1.5:1.1.2.14 Wed Jul 9 09:51:22 2014 +++ src/doc/CHANGES-6.1.5 Mon Jul 14 06:34:51 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.5,v 1.1.2.14 2014/07/09 09:51:22 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.5,v 1.1.2.15 2014/07/14 06:34:51 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.4 release to the NetBSD 6.1.5 release: @@ -653,3 +653,13 @@ libexec/httpd/small/Makefile 1.2 Update bozohttpd from 2018 to 20140708. [mrg, ticket #1095] + +sys/kern/kern_core.c1.23 + + Fix a read-beyond-end string read. + [maxv, ticket #1097] + +sys/kern/sys_module.c1.15 + + Fix a user-controlled memory allocation. + [maxv, ticket #1098]
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:35:33 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.6 Log Message: Ticket 1097 and 1098. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.0.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.0.6 diff -u src/doc/CHANGES-6.0.6:1.1.2.14 src/doc/CHANGES-6.0.6:1.1.2.15 --- src/doc/CHANGES-6.0.6:1.1.2.14 Wed Jul 9 09:51:48 2014 +++ src/doc/CHANGES-6.0.6 Mon Jul 14 06:35:33 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.6,v 1.1.2.14 2014/07/09 09:51:48 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.6,v 1.1.2.15 2014/07/14 06:35:33 msaitoh Exp $ A complete list of changes from the NetBSD 6.0.5 release to the NetBSD 6.0.6 release: @@ -653,3 +653,13 @@ libexec/httpd/small/Makefile 1.2 Update bozohttpd from 2018 to 20140708. [mrg, ticket #1095] + +sys/kern/kern_core.c1.23 + + Fix a read-beyond-end string read. + [maxt, ticket #1097] + +sys/kern/sys_module.c1.15 + + Fix a user-controlled memory allocation. + [maxv, ticket #1098]
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Mon Jul 14 07:55:27 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Don't include atomic.c, we have aliases for it in src/common.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/compiler_rt/Makefile.inc
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/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.20 src/lib/libc/compiler_rt/Makefile.inc:1.21
--- src/lib/libc/compiler_rt/Makefile.inc:1.20 Tue May 20 12:23:47 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Mon Jul 14 07:55:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2014/05/20 12:23:47 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.21 2014/07/14 07:55:26 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -23,10 +23,8 @@ COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCD
# divdc3.c \
# divsc3.c
-.if ${HAVE_LLVM:Uno} == yes
-# Requires C11 support
-GENERIC_SRCS+= atomic.c
-.endif
+# Implemented on top of our atomic interface.
+#GENERIC_SRCS+= atomic.c
.if ${HAVE_LIBGCC_EH} == no
GENERIC_SRCS+= \
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 09:08:42 UTC 2014
Modified Files:
src/sys/kern [netbsd-5]: sys_module.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1914):
sys/kern/sys_module.c: revision 1.15 via patch
Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.8.4.1 -r1.8.4.2 src/sys/kern/sys_module.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/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.8.4.1 src/sys/kern/sys_module.c:1.8.4.2
--- src/sys/kern/sys_module.c:1.8.4.1 Sun May 3 13:07:39 2009
+++ src/sys/kern/sys_module.c Mon Jul 14 09:08:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.8.4.1 2009/05/03 13:07:39 bouyer Exp $ */
+/* $NetBSD: sys_module.c,v 1.8.4.2 2014/07/14 09:08:42 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.8.4.1 2009/05/03 13:07:39 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.8.4.2 2014/07/14 09:08:42 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,6 +43,11 @@ __KERNEL_RCSID(0, $NetBSD: sys_module.c
#include sys/syscall.h
#include sys/syscallargs.h
+/*
+ * Arbitrary limit to avoid DoS for excessive memory allocation.
+ */
+#define MAXPROPSLEN 4096
+
static int
handle_modctl_load(modctl_load_t *ml)
{
@@ -63,6 +68,11 @@ handle_modctl_load(modctl_load_t *ml)
if (error != 0)
goto out2;
+ if (ml-ml_propslen MAXPROPSLEN) {
+ error = ENOMEM;
+ goto out2;
+ }
+
propslen = ml-ml_propslen + 1;
props = (char *)kmem_alloc(propslen, KM_SLEEP);
if (props == NULL) {
CVS commit: [netbsd-5-2] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 09:09:37 UTC 2014
Modified Files:
src/sys/kern [netbsd-5-2]: sys_module.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1914):
sys/kern/sys_module.c: revision 1.15 via patch
Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.8.4.1 -r1.8.4.1.6.1 src/sys/kern/sys_module.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/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.8.4.1 src/sys/kern/sys_module.c:1.8.4.1.6.1
--- src/sys/kern/sys_module.c:1.8.4.1 Sun May 3 13:07:39 2009
+++ src/sys/kern/sys_module.c Mon Jul 14 09:09:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.8.4.1 2009/05/03 13:07:39 bouyer Exp $ */
+/* $NetBSD: sys_module.c,v 1.8.4.1.6.1 2014/07/14 09:09:37 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.8.4.1 2009/05/03 13:07:39 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.8.4.1.6.1 2014/07/14 09:09:37 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,6 +43,11 @@ __KERNEL_RCSID(0, $NetBSD: sys_module.c
#include sys/syscall.h
#include sys/syscallargs.h
+/*
+ * Arbitrary limit to avoid DoS for excessive memory allocation.
+ */
+#define MAXPROPSLEN 4096
+
static int
handle_modctl_load(modctl_load_t *ml)
{
@@ -63,6 +68,11 @@ handle_modctl_load(modctl_load_t *ml)
if (error != 0)
goto out2;
+ if (ml-ml_propslen MAXPROPSLEN) {
+ error = ENOMEM;
+ goto out2;
+ }
+
propslen = ml-ml_propslen + 1;
props = (char *)kmem_alloc(propslen, KM_SLEEP);
if (props == NULL) {
CVS commit: [netbsd-5-1] src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 09:10:18 UTC 2014
Modified Files:
src/sys/kern [netbsd-5-1]: sys_module.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1914):
sys/kern/sys_module.c: revision 1.15 via patch
Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.8.4.1 -r1.8.4.1.2.1 src/sys/kern/sys_module.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/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.8.4.1 src/sys/kern/sys_module.c:1.8.4.1.2.1
--- src/sys/kern/sys_module.c:1.8.4.1 Sun May 3 13:07:39 2009
+++ src/sys/kern/sys_module.c Mon Jul 14 09:10:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.8.4.1 2009/05/03 13:07:39 bouyer Exp $ */
+/* $NetBSD: sys_module.c,v 1.8.4.1.2.1 2014/07/14 09:10:18 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.8.4.1 2009/05/03 13:07:39 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_module.c,v 1.8.4.1.2.1 2014/07/14 09:10:18 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,6 +43,11 @@ __KERNEL_RCSID(0, $NetBSD: sys_module.c
#include sys/syscall.h
#include sys/syscallargs.h
+/*
+ * Arbitrary limit to avoid DoS for excessive memory allocation.
+ */
+#define MAXPROPSLEN 4096
+
static int
handle_modctl_load(modctl_load_t *ml)
{
@@ -63,6 +68,11 @@ handle_modctl_load(modctl_load_t *ml)
if (error != 0)
goto out2;
+ if (ml-ml_propslen MAXPROPSLEN) {
+ error = ENOMEM;
+ goto out2;
+ }
+
propslen = ml-ml_propslen + 1;
props = (char *)kmem_alloc(propslen, KM_SLEEP);
if (props == NULL) {
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 14 09:15:07 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1914. To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-5.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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.63 src/doc/CHANGES-5.3:1.1.2.64 --- src/doc/CHANGES-5.3:1.1.2.63 Wed Jul 9 16:11:23 2014 +++ src/doc/CHANGES-5.3 Mon Jul 14 09:15:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.63 2014/07/09 16:11:23 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.64 2014/07/14 09:15:07 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -919,3 +919,8 @@ libexec/httpd/testsuite/data/index.html Update bozohttpd from 20080303+patches to 20140708. [mrg, ticket #1913] + +sys/kern/sys_module.c1.15 via patch + + Fix a user-controlled memory allocation. + [maxv, ticket #1914]
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 14 09:16:12 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.3 Log Message: Ticket 1914. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.2.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-5.2.3 diff -u src/doc/CHANGES-5.2.3:1.1.2.11 src/doc/CHANGES-5.2.3:1.1.2.12 --- src/doc/CHANGES-5.2.3:1.1.2.11 Wed Jul 9 16:11:45 2014 +++ src/doc/CHANGES-5.2.3 Mon Jul 14 09:16:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.3,v 1.1.2.11 2014/07/09 16:11:45 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.3,v 1.1.2.12 2014/07/14 09:16:12 msaitoh Exp $ A complete list of changes from the NetBSD 5.2.2 release to the NetBSD 5.2.3 release: @@ -184,3 +184,8 @@ libexec/httpd/testsuite/data/index.html Update bozohttpd from 20080303+patches to 20140708. [mrg, ticket #1913] + +sys/kern/sys_module.c1.15 via patch + + Fix a user-controlled memory allocation. + [maxv, ticket #1914]
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 14 09:17:04 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.5 Log Message: Ticket 1914. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.1.5 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-5.1.5 diff -u src/doc/CHANGES-5.1.5:1.1.2.11 src/doc/CHANGES-5.1.5:1.1.2.12 --- src/doc/CHANGES-5.1.5:1.1.2.11 Wed Jul 9 16:12:11 2014 +++ src/doc/CHANGES-5.1.5 Mon Jul 14 09:17:04 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.5,v 1.1.2.11 2014/07/09 16:12:11 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.5,v 1.1.2.12 2014/07/14 09:17:04 msaitoh Exp $ A complete list of changes from the NetBSD 5.1.4 release to the NetBSD 5.1.5 release: @@ -184,3 +184,8 @@ libexec/httpd/testsuite/data/index.html Update bozohttpd from 20080303+patches to 20140708. [mrg, ticket #1913] + +sys/kern/sys_module.c1.15 via patch + + Fix a user-controlled memory allocation. + [maxv, ticket #1914]
CVS commit: src/sys/dev
Module Name:src
Committed By: mbalmer
Date: Mon Jul 14 10:05:24 UTC 2014
Modified Files:
src/sys/dev/pckbport: wskbdmap_mfii.c
src/sys/dev/usb: ukbdmap.c
Log Message:
Add a belgian keyboard layout, based on the french keyboard layout.
Fixes PR install/46871.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pckbport/wskbdmap_mfii.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/ukbdmap.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/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.24 src/sys/dev/pckbport/wskbdmap_mfii.c:1.25
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.24 Wed Jun 11 20:09:17 2014
+++ src/sys/dev/pckbport/wskbdmap_mfii.c Mon Jul 14 10:05:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_mfii.c,v 1.24 2014/06/11 20:09:17 riastradh Exp $ */
+/* $NetBSD: wskbdmap_mfii.c,v 1.25 2014/07/14 10:05:24 mbalmer Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.24 2014/06/11 20:09:17 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.25 2014/07/14 10:05:24 mbalmer Exp $);
#include opt_wskbdmap.h
#include sys/types.h
@@ -419,6 +419,28 @@ static const keysym_t pckbd_keydesc_fr[]
KC(184), KS_Mode_switch, KS_Multi_key,
};
+static const keysym_t pckbd_keydesc_be[] = {
+/* pos normal shifted altgr shift-altgr */
+KC(2), KS_ampersand, KS_1, KS_bar,
+KC(3), KS_eacute, KS_2, KS_at,
+KC(5), KS_apostrophe, KS_4,
+KC(6), KS_parenleft, KS_5,
+KC(7), KS_section, KS_6, KS_asciicircum,
+KC(8), KS_egrave, KS_7,
+KC(9), KS_exclam, KS_8,
+KC(10), KS_ccedilla, KS_9, KS_braceleft,
+KC(11), KS_agrave, KS_0, KS_braceright,
+KC(12), KS_parenright, KS_degree,
+KC(13), KS_minus, KS_underscore,
+KC(26), KS_dead_circumflex, KS_dead_diaeresis, KS_bracketleft,
+KC(27), KS_dollar, KS_asterisk, KS_bracketright,
+KC(43), KS_mu, KS_sterling, KS_grave,
+KC(40), KS_ugrave, KS_percent, KS_acute,
+KC(41), KS_twosuperior, KS_threesuperior,
+KC(53), KS_equal, KS_plus, KS_asciitilde,
+KC(86), KS_less, KS_greater, KS_backslash,
+};
+
static const keysym_t pckbd_keydesc_it[] = {
/* pos normal shifted altgr shift-altgr */
KC(3), KS_2, KS_quotedbl, KS_twosuperior,
@@ -788,6 +810,7 @@ const struct wscons_keydesc pckbd_keydes
KBD_MAP(KB_SF, KB_SG, pckbd_keydesc_sf),
KBD_MAP(KB_SF | KB_NODEAD, KB_SF, pckbd_keydesc_sg_nodead),
KBD_MAP(KB_FR, KB_US, pckbd_keydesc_fr),
+ KBD_MAP(KB_BE, KB_FR, pckbd_keydesc_be),
KBD_MAP(KB_DK, KB_US, pckbd_keydesc_dk),
KBD_MAP(KB_DK | KB_NODEAD, KB_DK, pckbd_keydesc_dk_nodead),
KBD_MAP(KB_IT, KB_US, pckbd_keydesc_it),
Index: src/sys/dev/usb/ukbdmap.c
diff -u src/sys/dev/usb/ukbdmap.c:1.28 src/sys/dev/usb/ukbdmap.c:1.29
--- src/sys/dev/usb/ukbdmap.c:1.28 Fri Apr 16 11:29:06 2010
+++ src/sys/dev/usb/ukbdmap.c Mon Jul 14 10:05:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbdmap.c,v 1.28 2010/04/16 11:29:06 ahoka Exp $ */
+/* $NetBSD: ukbdmap.c,v 1.29 2014/07/14 10:05:23 mbalmer Exp $ */
/*
* Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbdmap.c,v 1.28 2010/04/16 11:29:06 ahoka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbdmap.c,v 1.29 2014/07/14 10:05:23 mbalmer Exp $);
#include sys/types.h
#include dev/wscons/wsksymdef.h
@@ -416,6 +416,28 @@ Static const keysym_t ukbd_keydesc_fr[]
KC(230), KS_Mode_switch, KS_Multi_key,
};
+Static const keysym_t ukbd_keydesc_be[] = {
+/* pos normal shifted altgr shift-altgr */
+KC(30), KS_ampersand, KS_1, KS_bar,
+KC(31), KS_eacute, KS_2, KS_at,
+KC(33), KS_apostrophe, KS_4,
+KC(34), KS_parenleft, KS_5,
+KC(35), KS_section, KS_6, KS_asciicircum,
+KC(36), KS_egrave, KS_7,
+KC(37), KS_exclam, KS_8,
+KC(38), KS_ccedilla, KS_9, KS_braceleft,
+KC(39), KS_agrave, KS_0, KS_braceright,
+KC(45), KS_parenright, KS_degree,
+KC(46), KS_minus, KS_underscore,
+KC(47), KS_dead_circumflex, KS_dead_diaeresis, KS_bracketleft,
+KC(48), KS_dollar, KS_asterisk, KS_bracketright,
+KC(50), KS_mu, KS_sterling, KS_grave,
+KC(52), KS_ugrave, KS_percent, KS_acute,
+KC(53), KS_twosuperior, KS_threesuperior,
+KC(56), KS_equal, KS_plus, KS_asciitilde,
+KC(100), KS_less, KS_greater, KS_backslash,
+};
+
Static const keysym_t ukbd_keydesc_it[] = {
/* pos normal shifted altgr shift-altgr */
KC(31), KS_2, KS_quotedbl, KS_twosuperior,
@@ -611,6 +633,7 @@ const struct wscons_keydesc ukbd_keydesc
KBD_MAP(KB_DE | KB_NODEAD, KB_DE, ukbd_keydesc_de_nodead),
KBD_MAP(KB_FR, KB_US,
CVS commit: src/lib/librumpuser
Module Name:src Committed By: alnsn Date: Mon Jul 14 10:36:33 UTC 2014 Removed Files: src/lib/librumpuser: rumpuser_cache.c Log Message: Remove unused file. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/lib/librumpuser/rumpuser_cache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Mon Jul 14 11:36:39 UTC 2014
Modified Files:
src/sys/lib/libunwind: AddressSpace.hpp
Log Message:
Use static_cast for rb_tree_insert_node void * return value.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/lib/libunwind/AddressSpace.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libunwind/AddressSpace.hpp
diff -u src/sys/lib/libunwind/AddressSpace.hpp:1.5 src/sys/lib/libunwind/AddressSpace.hpp:1.6
--- src/sys/lib/libunwind/AddressSpace.hpp:1.5 Mon Apr 28 13:39:23 2014
+++ src/sys/lib/libunwind/AddressSpace.hpp Mon Jul 14 11:36:39 2014
@@ -294,7 +294,7 @@ public:
n-last_pc = pcEnd;
n-data_base = 0;
n-ehframe_base = 0;
-if (rb_tree_insert_node(segmentTree, n) == n) {
+if (static_castRange *(rb_tree_insert_node(segmentTree, n)) == n) {
pthread_rwlock_unlock(fdeTreeLock);
return true;
}
@@ -305,7 +305,7 @@ public:
bool removeFDE(pint_t pcStart, pint_t pcEnd, pint_t fde) {
pthread_rwlock_wrlock(fdeTreeLock);
-Range *n = (Range *)rb_tree_find_node(segmentTree, pcStart);
+Range *n = static_castRange *(rb_tree_find_node(segmentTree, pcStart));
if (n == NULL) {
pthread_rwlock_unlock(fdeTreeLock);
return false;
@@ -402,7 +402,7 @@ private:
n-data_base = data_base;
n-ehframe_base = ehframe_base;
-if (rb_tree_insert_node(segmentTree, n) != n) {
+if (static_castRange *(rb_tree_insert_node(segmentTree, n)) == n) {
free(n);
return;
}
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jul 14 11:45:06 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13355 Log Message: Import dhcpcd-6.4.1 with the following changes: * If just given a domain and no search list, make the search list the domain * Skip arpping directives if we have a profile but not parsing one * Allow the request of a DHCPv6 address or prefix, a prefix length must be specified * Add the ability to dump DHCPv6 leases * Improve startup with regards to carrier checking and adding a link-local IPv6 address * Start the correct interface reference for added devices * Support http://datatracker.ietf.org/doc/draft-ietf-dhc-dhcpv6-stateful-issues-06 via the ia_pd_mix option * Fix link handling where kernel reported flags in LINK_UP may not be valid when we actually process them * Fix defining new options in dhcpcd.conf and requesting them * Fix a potential segfault when reloading configurations * Print user defined options via -V * Add support for RFC6603, Prefix Exclude option * When requesting a IA_PD and another IA type, create a psuedo interface to handle the IA_PD * Handle truncated DHCPv6 saved leases Status: Vendor Tag: roy Release Tags: dhcpcd-6-4-1 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if.c C src/external/bsd/dhcpcd/dist/if-options.c C src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c C src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in C src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/crypt/md5.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Mon Jul 14 11:49:48 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd.8.in dhcpcd.c
dhcpcd.conf.5.in if-bsd.c if-options.c ipv6nd.c script.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.28 -r1.29 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcpcd/dist/dhcpcd.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in \
src/external/bsd/dhcpcd/dist/ipv6nd.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/if-bsd.c \
src/external/bsd/dhcpcd/dist/script.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/if-options.c
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/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.13 src/external/bsd/dhcpcd/dist/dhcp.c:1.14
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.13 Sat Jun 14 20:55:37 2014
+++ src/external/bsd/dhcpcd/dist/dhcp.c Mon Jul 14 11:49:48 2014
@@ -1,5 +1,5 @@
#include sys/cdefs.h
- __RCSID($NetBSD: dhcp.c,v 1.13 2014/06/14 20:55:37 roy Exp $);
+ __RCSID($NetBSD: dhcp.c,v 1.14 2014/07/14 11:49:48 roy Exp $);
/*
* dhcpcd - DHCP client daemon
@@ -128,16 +128,24 @@ static const size_t udp_dhcp_len = sizeo
static int dhcp_open(struct interface *);
void
-dhcp_printoptions(const struct dhcpcd_ctx *ctx)
+dhcp_printoptions(const struct dhcpcd_ctx *ctx,
+const struct dhcp_opt *opts, size_t opts_len)
{
const char * const *p;
- size_t i;
- const struct dhcp_opt *opt;
+ size_t i, j;
+ const struct dhcp_opt *opt, *opt2;
for (p = dhcp_params; *p; p++)
printf(%s\n, *p);
- for (i = 0, opt = ctx-dhcp_opts; i ctx-dhcp_opts_len; i++, opt++)
+ for (i = 0, opt = ctx-dhcp_opts; i ctx-dhcp_opts_len; i++, opt++) {
+ for (j = 0, opt2 = opts; j opts_len; j++, opt2++)
+ if (opt-option == opt2-option)
+break;
+ if (j == opts_len)
+ printf(%03d %s\n, opt-option, opt-var);
+ }
+ for (i = 0, opt = opts; i opts_len; i++, opt++)
printf(%03d %s\n, opt-option, opt-var);
}
@@ -289,7 +297,7 @@ decode_rfc3442(char *out, size_t len, co
errno = EINVAL;
return -1;
}
- ocets = (cidr + 7) / 8;
+ ocets = (cidr + 7) / NBBY;
if (!out) {
p += 4 + ocets;
bytes += ((4 * 4) * 2) + 4;
@@ -360,7 +368,7 @@ decode_rfc3442_rt(const uint8_t *data, s
}
TAILQ_INSERT_TAIL(routes, rt, next);
- ocets = (cidr + 7) / 8;
+ ocets = (cidr + 7) / NBBY;
/* If we have ocets then we have a destination and netmask */
if (ocets 0) {
memcpy(rt-dest.s_addr, p, ocets);
@@ -946,6 +954,30 @@ make_message(struct dhcp_message **messa
goto toobig;
*p++ = (uint8_t)opt-option;
}
+ for (i = 0, opt = ifo-dhcp_override;
+ i ifo-dhcp_override_len;
+ i++, opt++)
+ {
+ /* Check if added above */
+ for (lp = n_params + 1; lp p; lp++)
+if (*lp == (uint8_t)opt-option)
+ break;
+ if (lp p)
+continue;
+ if (!(opt-type REQUEST ||
+has_option_mask(ifo-requestmask, opt-option)))
+continue;
+ if (opt-type NOREQ)
+continue;
+ if (type == DHCP_INFORM
+ (opt-option == DHO_RENEWALTIME ||
+opt-option == DHO_REBINDTIME))
+continue;
+ len = (size_t)((p - m) + 2);
+ if (len sizeof(*dhcp))
+goto toobig;
+ *p++ = (uint8_t)opt-option;
+ }
*n_params = (uint8_t)(p - n_params - 1);
}
@@ -2736,40 +2768,23 @@ dhcp_open(struct interface *ifp)
}
int
-dhcp_dump(struct dhcpcd_ctx *ctx, const char *ifname)
+dhcp_dump(struct interface *ifp)
{
- struct interface *ifp;
struct dhcp_state *state;
- if (ctx-ifaces == NULL) {
- ctx-ifaces = malloc(sizeof(*ctx-ifaces));
- if (ctx-ifaces == NULL)
- return -1;
- TAILQ_INIT(ctx-ifaces);
- }
- state = NULL;
- ifp = calloc(1, sizeof(*ifp));
- if (ifp == NULL)
- goto eexit;
- ifp-ctx = ctx;
- TAILQ_INSERT_HEAD(ctx-ifaces, ifp, next);
ifp-if_data[IF_DATA_DHCP] = state = calloc(1, sizeof(*state));
if (state == NULL)
goto eexit;
- ifp-options = calloc(1, sizeof(*ifp-options));
- if (ifp-options == NULL)
- goto eexit;
- strlcpy(ifp-name, ifname, sizeof(ifp-name));
snprintf(state-leasefile, sizeof(state-leasefile),
LEASEFILE, ifp-name);
state-new = read_lease(ifp);
if (state-new == NULL errno == ENOENT) {
- strlcpy(state-leasefile, ifname, sizeof(state-leasefile));
+ strlcpy(state-leasefile, ifp-name, sizeof(state-leasefile));
state-new = read_lease(ifp);
}
if (state-new == NULL) {
if (errno == ENOENT)
- syslog(LOG_ERR, %s: no lease to dump, ifname);
+ syslog(LOG_ERR, %s: no lease to dump, ifp-name);
return -1;
}
state-reason = DUMP;
@@ -3018,13 +3033,22 @@ dhcp_start(struct interface *ifp)
if (!(ifp-options-options DHCPCD_IPV4))
return;
- tv.tv_sec = DHCP_MIN_DELAY;
- tv.tv_usec = (suseconds_t)arc4random_uniform(
-
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jul 14 11:51:08 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.4.1 To generate a diff of this commit: cvs rdiff -u -r1.1134 -r1.1135 src/doc/3RDPARTY cvs rdiff -u -r1.1944 -r1.1945 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1134 src/doc/3RDPARTY:1.1135 --- src/doc/3RDPARTY:1.1134 Sat Jul 12 12:53:27 2014 +++ src/doc/3RDPARTY Mon Jul 14 11:51:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1134 2014/07/12 12:53:27 spz Exp $ +# $NetBSD: 3RDPARTY,v 1.1135 2014/07/14 11:51:08 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -305,8 +305,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.4.0 -Current Vers: 6.4.0 +Version: 6.4.1 +Current Vers: 6.4.1 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1944 src/doc/CHANGES:1.1945 --- src/doc/CHANGES:1.1944 Sat Jul 12 12:53:27 2014 +++ src/doc/CHANGES Mon Jul 14 11:51:08 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1944 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1945 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -440,3 +440,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: postfix(1): Import version 2.11.1 [tron 20140706] bind: Import version 9.10.0-P2 [spz 20140708] dhcp: Import version 4.3.0 [spz 20140712] + dhcpcd(8): Import dhcpcd-6.4.1 [roy 20140714]
CVS commit: src/sys/dev/usb
Module Name:src Committed By: ryoon Date: Mon Jul 14 12:02:59 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Sharp CE-175TU USB to Zaurus Option Port 16 cable. With this cable, you can login to NetBSD/zaurus on SL-C750 via serial console. To generate a diff of this commit: cvs rdiff -u -r1.673 -r1.674 src/sys/dev/usb/usbdevs 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.673 src/sys/dev/usb/usbdevs:1.674 --- src/sys/dev/usb/usbdevs:1.673 Wed Jun 11 07:05:03 2014 +++ src/sys/dev/usb/usbdevs Mon Jul 14 12:02:59 2014 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.673 2014/06/11 07:05:03 njoly Exp $ +$NetBSD: usbdevs,v 1.674 2014/07/14 12:02:59 ryoon Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2798,6 +2798,7 @@ product SHANTOU ADM8515 0x8515 ADM8515 product SHARK PA 0x0400 Pocket Adapter /* Sharp products */ +product SHARP CE175TU 0x8000 CE175TU product SHARP SL5500 0x8004 SL5500 product SHARP A300 0x8005 A300 product SHARP SL5600 0x8006 SL5600
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: ryoon
Date: Mon Jul 14 12:03:42 UTC 2014
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.665 -r1.666 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.666 -r1.667 src/sys/dev/usb/usbdevs_data.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/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.665 src/sys/dev/usb/usbdevs.h:1.666
--- src/sys/dev/usb/usbdevs.h:1.665 Wed Jun 11 07:05:35 2014
+++ src/sys/dev/usb/usbdevs.h Mon Jul 14 12:03:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.665 2014/06/11 07:05:35 njoly Exp $ */
+/* $NetBSD: usbdevs.h,v 1.666 2014/07/14 12:03:42 ryoon Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -2805,6 +2805,7 @@
#define USB_PRODUCT_SHARK_PA 0x0400 /* Pocket Adapter */
/* Sharp products */
+#define USB_PRODUCT_SHARP_CE175TU 0x8000 /* CE175TU */
#define USB_PRODUCT_SHARP_SL5500 0x8004 /* SL5500 */
#define USB_PRODUCT_SHARP_A300 0x8005 /* A300 */
#define USB_PRODUCT_SHARP_SL5600 0x8006 /* SL5600 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.666 src/sys/dev/usb/usbdevs_data.h:1.667
--- src/sys/dev/usb/usbdevs_data.h:1.666 Wed Jun 11 07:05:35 2014
+++ src/sys/dev/usb/usbdevs_data.h Mon Jul 14 12:03:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.666 2014/06/11 07:05:35 njoly Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.667 2014/07/14 12:03:42 ryoon Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -8551,6 +8551,10 @@ const struct usb_product usb_products[]
Pocket Adapter,
},
{
+ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_CE175TU,
+ CE175TU,
+ },
+ {
USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500,
SL5500,
},
@@ -10159,4 +10163,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1999;
+const int usb_nproducts = 2000;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: ryoon
Date: Mon Jul 14 12:04:48 UTC 2014
Modified Files:
src/sys/dev/usb: uplcom.c
Log Message:
Sharp CE-175TU USB to Zaurus Option Port 16 cable is uplcom(4) device.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/usb/uplcom.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/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.73 src/sys/dev/usb/uplcom.c:1.74
--- src/sys/dev/usb/uplcom.c:1.73 Fri Dec 23 00:51:48 2011
+++ src/sys/dev/usb/uplcom.c Mon Jul 14 12:04:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.73 2011/12/23 00:51:48 jakllsch Exp $ */
+/* $NetBSD: uplcom.c,v 1.74 2014/07/14 12:04:48 ryoon Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uplcom.c,v 1.73 2011/12/23 00:51:48 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: uplcom.c,v 1.74 2014/07/14 12:04:48 ryoon Exp $);
#include sys/param.h
#include sys/systm.h
@@ -191,6 +191,8 @@ static const struct usb_devno uplcom_dev
{ USB_VENDOR_NETINDEX, USB_PRODUCT_NETINDEX_WS002IN },
/* COREGA CG-USBRS232R */
{ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGUSBRS232R },
+ /* Sharp CE-175TU (USB to Zaurus option port 15 adapter) */
+ { USB_VENDOR_SHARP, USB_PRODUCT_SHARP_CE175TU },
};
#define uplcom_lookup(v, p) usb_lookup(uplcom_devs, v, p)
CVS commit: src/share/man/man4
Module Name:src Committed By: ryoon Date: Mon Jul 14 12:07:04 UTC 2014 Modified Files: src/share/man/man4: uplcom.4 Log Message: Add Sharp CE-175TU entry, and bump date. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/uplcom.4 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/man4/uplcom.4 diff -u src/share/man/man4/uplcom.4:1.18 src/share/man/man4/uplcom.4:1.19 --- src/share/man/man4/uplcom.4:1.18 Wed Apr 30 13:10:54 2008 +++ src/share/man/man4/uplcom.4 Mon Jul 14 12:07:04 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: uplcom.4,v 1.18 2008/04/30 13:10:54 martin Exp $ +.\ $NetBSD: uplcom.4,v 1.19 2014/07/14 12:07:04 ryoon Exp $ .\ .\ Copyright (c) 2001, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 14, 2007 +.Dd July 14, 2014 .Dt UPLCOM 4 .Os .Sh NAME @@ -52,6 +52,7 @@ driver supports the following adapters: .It I/O DATA USB-RSAQ3 .It I/O DATA USB-RSAQ5 .It PLANEX USB RS-232 URS-03 +.It Sharp CE-175TU .It Sitecom CN-116 USB to serial .It Sony Ericsson DCU-10 .It Sony Ericsson DCU-11
CVS commit: src/share/wscons/keymaps
Module Name:src Committed By: mbalmer Date: Mon Jul 14 12:21:56 UTC 2014 Modified Files: src/share/wscons/keymaps: Makefile Log Message: Put them one file per line. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/wscons/keymaps/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/wscons/keymaps/Makefile diff -u src/share/wscons/keymaps/Makefile:1.19 src/share/wscons/keymaps/Makefile:1.20 --- src/share/wscons/keymaps/Makefile:1.19 Sun Jul 13 15:12:27 2014 +++ src/share/wscons/keymaps/Makefile Mon Jul 14 12:21:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2014/07/13 15:12:27 martin Exp $ +# $NetBSD: Makefile,v 1.20 2014/07/14 12:21:56 mbalmer Exp $ NOOBJ= # defined @@ -6,8 +6,10 @@ FILES= \ amikbd.pl.qwertz.iso8859-2 \ mkbd.pt.iso8859-1 \ pckbd.be.azerty pckbd.br.abnt2 \ - pckbd.bg.bds.cp1251 pckbd.bg.bds.iso8859-5 \ - pckbd.bg.qwerty.cp1251 pckbd.bg.qwerty.iso8859-5 \ + pckbd.bg.bds.cp1251 \ + pckbd.bg.bds.iso8859-5 \ + pckbd.bg.qwerty.cp1251 \ + pckbd.bg.qwerty.iso8859-5 \ pckbd.bg.qwerty.koi8-r \ pckbd.de_CH.iso8859-1 \ pckbd.fr_CA.iso8859-1 \
CVS commit: src/etc
Module Name:src Committed By: mbalmer Date: Mon Jul 14 12:29:48 UTC 2014 Modified Files: src/etc: rc.conf Log Message: Consistency changes only. Start sentences with a capital letter and end them with a full stop. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/etc/rc.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.conf diff -u src/etc/rc.conf:1.96 src/etc/rc.conf:1.97 --- src/etc/rc.conf:1.96 Sat Oct 14 17:01:29 2000 +++ src/etc/rc.conf Mon Jul 14 12:29:48 2014 @@ -1,6 +1,6 @@ -# $NetBSD: rc.conf,v 1.96 2000/10/14 17:01:29 wiz Exp $ +# $NetBSD: rc.conf,v 1.97 2014/07/14 12:29:48 mbalmer Exp $ # -# see rc.conf(5) for more information. +# See rc.conf(5) for more information. # # Use program=YES to enable program, NO to disable it. program_flags are # passed to the program on the command line. @@ -17,5 +17,5 @@ fi # rc_configured=NO -# Add local overrides below +# Add local overrides below. #
CVS commit: src/doc
Module Name:src Committed By: mbalmer Date: Mon Jul 14 12:38:00 UTC 2014 Modified Files: src/doc: CHANGES Log Message: wskbd(4) has a belgian keyboard layout now. To generate a diff of this commit: cvs rdiff -u -r1.1945 -r1.1946 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.1945 src/doc/CHANGES:1.1946 --- src/doc/CHANGES:1.1945 Mon Jul 14 11:51:08 2014 +++ src/doc/CHANGES Mon Jul 14 12:38:00 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1945 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1946 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -441,3 +441,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: bind: Import version 9.10.0-P2 [spz 20140708] dhcp: Import version 4.3.0 [spz 20140712] dhcpcd(8): Import dhcpcd-6.4.1 [roy 20140714] + wskbd(4): Added belgian keyboard layouts (KB_BE) to pckbd(4) and + ukbd(4). [mbalmer 20140714]
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: nakayama
Date: Mon Jul 14 12:40:38 UTC 2014
Modified Files:
src/sys/arch/sparc64/include: bus_funcs.h
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
Make bus_space_barrier inline to avoid unnecessary argument handling.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/include/bus_funcs.h
cvs rdiff -u -r1.277 -r1.278 src/sys/arch/sparc64/sparc64/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/include/bus_funcs.h
diff -u src/sys/arch/sparc64/include/bus_funcs.h:1.2 src/sys/arch/sparc64/include/bus_funcs.h:1.3
--- src/sys/arch/sparc64/include/bus_funcs.h:1.2 Sun Jul 17 23:29:10 2011
+++ src/sys/arch/sparc64/include/bus_funcs.h Mon Jul 14 12:40:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_funcs.h,v 1.2 2011/07/17 23:29:10 dyoung Exp $ */
+/* $NetBSD: bus_funcs.h,v 1.3 2014/07/14 12:40:38 nakayama Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -125,6 +125,30 @@ bus_intr_establish(bus_space_tag_t t, in
#define bus_space_vaddr(t, h) (PHYS_ASI((h)._asi) ? \
NULL : (void *)(vaddr_t)((h)._ptr))
+#define bus_space_barrier(t, h, o, s, f) \
+ sparc_bus_space_barrier((t), (h), (o), (s), (f))
+
+static __inline void
+sparc_bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h,
+bus_size_t o, bus_size_t s, int f)
+{
+ /*
+ * We have a bit of a problem with the bus_space_barrier()
+ * interface. It defines a read barrier and a write barrier
+ * which really don't map to the 7 different types of memory
+ * barriers in the SPARC v9 instruction set.
+ */
+ if (f == BUS_SPACE_BARRIER_READ)
+ /* A load followed by a load to the same location? */
+ __asm volatile(membar #Lookaside);
+ else if (f == BUS_SPACE_BARRIER_WRITE)
+ /* A store followed by a store? */
+ __asm volatile(membar #StoreStore);
+ else
+ /* A store followed by a load? */
+ __asm volatile(membar #StoreLoad|#MemIssue|#Lookaside);
+}
+
/*
* uintN_t bus_space_read_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset);
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.277 src/sys/arch/sparc64/sparc64/machdep.c:1.278
--- src/sys/arch/sparc64/sparc64/machdep.c:1.277 Tue May 13 19:39:40 2014
+++ src/sys/arch/sparc64/sparc64/machdep.c Mon Jul 14 12:40:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.277 2014/05/13 19:39:40 palle Exp $ */
+/* $NetBSD: machdep.c,v 1.278 2014/07/14 12:40:38 nakayama Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.277 2014/05/13 19:39:40 palle Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.278 2014/07/14 12:40:38 nakayama Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -1611,27 +1611,6 @@ static void sparc_bus_free(bus_space_tag
struct extent *io_space = NULL;
-void
-bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h,
- bus_size_t o, bus_size_t s, int f)
-{
- /*
- * We have a bit of a problem with the bus_space_barrier()
- * interface. It defines a read barrier and a write barrier
- * which really don't map to the 7 different types of memory
- * barriers in the SPARC v9 instruction set.
- */
- if (f == BUS_SPACE_BARRIER_READ)
- /* A load followed by a load to the same location? */
- __asm volatile(membar #Lookaside);
- else if (f == BUS_SPACE_BARRIER_WRITE)
- /* A store followed by a store? */
- __asm volatile(membar #StoreStore);
- else
- /* A store followed by a load? */
- __asm volatile(membar #StoreLoad|#MemIssue|#Lookaside);
-}
-
int
bus_space_alloc(bus_space_tag_t t, bus_addr_t rs, bus_addr_t re, bus_size_t s,
bus_size_t a, bus_size_t b, int f, bus_addr_t *ap,
CVS commit: src/sys/netinet
Module Name:src
Committed By: rtr
Date: Mon Jul 14 13:20:41 UTC 2014
Modified Files:
src/sys/netinet: tcp_usrreq.c
Log Message:
pr_generic() for req = PRU_RCVOOB is always called with control == NULL
so don't bother with a conditional block that handles non-NULL, it
doesn't happen.
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/netinet/tcp_usrreq.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/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.187 src/sys/netinet/tcp_usrreq.c:1.188
--- src/sys/netinet/tcp_usrreq.c:1.187 Thu Jul 10 14:05:19 2014
+++ src/sys/netinet/tcp_usrreq.c Mon Jul 14 13:20:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.187 2014/07/10 14:05:19 rmind Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.188 2014/07/14 13:20:41 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.187 2014/07/10 14:05:19 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.188 2014/07/14 13:20:41 rtr Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -473,12 +473,6 @@ tcp_usrreq(struct socket *so, int req, s
break;
case PRU_RCVOOB:
- if (control control-m_len) {
- m_freem(control);
- m_freem(m);
- error = EINVAL;
- break;
- }
if ((so-so_oobmark == 0
(so-so_state SS_RCVATMARK) == 0) ||
so-so_options SO_OOBINLINE ||
CVS commit: src/sys/netinet
Module Name:src
Committed By: rtr
Date: Mon Jul 14 13:39:18 UTC 2014
Modified Files:
src/sys/netinet: raw_ip.c
Log Message:
fix fat fingered KASSERT(solocked(0)) - KASSERT(solocked(so)) mistake.
spotted by Takahiro HAYASHI
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/netinet/raw_ip.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/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.133 src/sys/netinet/raw_ip.c:1.134
--- src/sys/netinet/raw_ip.c:1.133 Wed Jul 9 14:41:42 2014
+++ src/sys/netinet/raw_ip.c Mon Jul 14 13:39:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.133 2014/07/09 14:41:42 rtr Exp $ */
+/* $NetBSD: raw_ip.c,v 1.134 2014/07/14 13:39:18 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: raw_ip.c,v 1.133 2014/07/09 14:41:42 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: raw_ip.c,v 1.134 2014/07/14 13:39:18 rtr Exp $);
#include opt_inet.h
#include opt_compat_netbsd.h
@@ -594,7 +594,7 @@ rip_stat(struct socket *so, struct stat
static int
rip_peeraddr(struct socket *so, struct mbuf *nam)
{
- KASSERT(solocked(0));
+ KASSERT(solocked(so));
KASSERT(sotoinpcb(so) != NULL);
KASSERT(nam != NULL);
@@ -605,7 +605,7 @@ rip_peeraddr(struct socket *so, struct m
static int
rip_sockaddr(struct socket *so, struct mbuf *nam)
{
- KASSERT(solocked(0));
+ KASSERT(solocked(so));
KASSERT(sotoinpcb(so) != NULL);
KASSERT(nam != NULL);
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jul 14 14:02:02 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29618 Log Message: Import dhcpcd-6.4.2 to fix the building of 6.4.1 Status: Vendor Tag: roy Release Tags: dhcpcd-6-4-2 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind No conflicts created by this import
CVS commit: src/external/bsd/dhcpcd/dist/crypt
Module Name:src Committed By: roy Date: Mon Jul 14 14:07:02 UTC 2014 Removed Files: src/external/bsd/dhcpcd/dist/crypt: md5.h Log Message: Remove unused file. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/dhcpcd/dist/crypt/md5.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jul 14 14:08:41 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.4.2 To generate a diff of this commit: cvs rdiff -u -r1.1135 -r1.1136 src/doc/3RDPARTY cvs rdiff -u -r1.1946 -r1.1947 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1135 src/doc/3RDPARTY:1.1136 --- src/doc/3RDPARTY:1.1135 Mon Jul 14 11:51:08 2014 +++ src/doc/3RDPARTY Mon Jul 14 14:08:41 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1135 2014/07/14 11:51:08 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1136 2014/07/14 14:08:41 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -305,8 +305,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.4.1 -Current Vers: 6.4.1 +Version: 6.4.2 +Current Vers: 6.4.2 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1946 src/doc/CHANGES:1.1947 --- src/doc/CHANGES:1.1946 Mon Jul 14 12:38:00 2014 +++ src/doc/CHANGES Mon Jul 14 14:08:41 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1946 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1947 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -440,6 +440,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0: postfix(1): Import version 2.11.1 [tron 20140706] bind: Import version 9.10.0-P2 [spz 20140708] dhcp: Import version 4.3.0 [spz 20140712] - dhcpcd(8): Import dhcpcd-6.4.1 [roy 20140714] + dhcpcd(8): Import dhcpcd-6.4.2 [roy 20140714] wskbd(4): Added belgian keyboard layouts (KB_BE) to pckbd(4) and ukbd(4). [mbalmer 20140714]
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Mon Jul 14 14:56:10 UTC 2014
Modified Files:
src/sys/dev/usb: uatp.c
Log Message:
Convert uatp(4) to use usb_task instead of a workqueue.
Compile-tested only; hardware not available right now.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/uatp.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/uatp.c
diff -u src/sys/dev/usb/uatp.c:1.7 src/sys/dev/usb/uatp.c:1.8
--- src/sys/dev/usb/uatp.c:1.7 Fri Apr 25 18:10:21 2014
+++ src/sys/dev/usb/uatp.c Mon Jul 14 14:56:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uatp.c,v 1.7 2014/04/25 18:10:21 riastradh Exp $ */
+/* $NetBSD: uatp.c,v 1.8 2014/07/14 14:56:10 riastradh Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.7 2014/04/25 18:10:21 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.8 2014/07/14 14:56:10 riastradh Exp $);
#include sys/types.h
#include sys/param.h
@@ -158,7 +158,6 @@ __KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.7
#include sys/sysctl.h
#include sys/systm.h
#include sys/time.h
-#include sys/workqueue.h
/* Order is important here...sigh... */
#include dev/usb/usb.h
@@ -289,7 +288,7 @@ static void geyser34_enable_raw_mode(str
static void geyser34_initialize(struct uatp_softc *);
static int geyser34_finalize(struct uatp_softc *);
static void geyser34_deferred_reset(struct uatp_softc *);
-static void geyser34_reset_worker(struct work *, void *);
+static void geyser34_reset_task(void *);
static void uatp_intr(struct uhidev *, void *, unsigned int);
static bool base_sample_softc_flag(const struct uatp_softc *, const uint8_t *);
static bool base_sample_input_flag(const struct uatp_softc *, const uint8_t *);
@@ -506,9 +505,7 @@ struct uatp_softc {
#define UATP_ENABLED (1 0) /* . Is the wsmouse enabled? */
#define UATP_DYING (1 1) /* . Have we been deactivated? */
#define UATP_VALID (1 2) /* . Do we have valid sensor data? */
- struct workqueue *sc_reset_wq; /* Workqueue for resetting. */
- struct work sc_reset_work; /* Work for said workqueue. */
- unsigned int sc_reset_pending; /* True if a reset is pending. */
+ struct usb_task sc_reset_task; /* Task for resetting device. */
callout_t sc_untap_callout; /* Releases button after tap. */
kmutex_t sc_tap_mutex; /* Protects the following fields. */
@@ -1342,41 +1339,25 @@ geyser34_enable_raw_mode(struct uatp_sof
/*
* The Geyser 3 and 4 need to be reset periodically after we detect a
- * continual flow of spurious interrupts. We use a workqueue for this.
- * The flag avoids deferring a reset more than once before it has run,
- * or detaching the device while there is a deferred reset pending.
+ * continual flow of spurious interrupts. We use a USB task for this.
*/
static void
geyser34_initialize(struct uatp_softc *sc)
{
- DPRINTF(sc, UATP_DEBUG_MISC, (initializing\n));
+ DPRINTF(sc, UATP_DEBUG_MISC, (initializing\n));
geyser34_enable_raw_mode(sc);
- sc-sc_reset_pending = 0;
-
- if (workqueue_create(sc-sc_reset_wq, uatprstq,
- geyser34_reset_worker, sc, PRI_NONE, IPL_USB, WQ_MPSAFE)
-!= 0) {
- sc-sc_reset_wq = NULL;
- aprint_error_dev(uatp_dev(sc),
- couldn't create Geyser 3/4 reset workqueue\n);
- }
+ usb_init_task(sc-sc_reset_task, geyser34_reset_task, sc,
+ USB_TASKQ_MPSAFE);
}
static int
geyser34_finalize(struct uatp_softc *sc)
{
- DPRINTF(sc, UATP_DEBUG_MISC, (finalizing\n));
-
- /* Can't destroy the work queue if there is work pending. */
- if (sc-sc_reset_pending) {
- DPRINTF(sc, UATP_DEBUG_MISC, (EBUSY -- reset pending\n));
- return EBUSY;
- }
- if (sc-sc_reset_wq != NULL)
- workqueue_destroy(sc-sc_reset_wq);
+ DPRINTF(sc, UATP_DEBUG_MISC, (finalizing\n));
+ usb_rem_task(sc-sc_hdev.sc_parent-sc_udev, sc-sc_reset_task);
return 0;
}
@@ -1384,21 +1365,14 @@ geyser34_finalize(struct uatp_softc *sc)
static void
geyser34_deferred_reset(struct uatp_softc *sc)
{
- DPRINTF(sc, UATP_DEBUG_RESET, (deferring reset\n));
- /* Initialization can fail, so make sure we have a work queue. */
- if (sc-sc_reset_wq == NULL)
- DPRINTF(sc, UATP_DEBUG_RESET, (no work queue\n));
- /* Check for pending work. */
- else if (atomic_swap_uint(sc-sc_reset_pending, 1))
- DPRINTF(sc, UATP_DEBUG_RESET, (already pending\n));
- /* No work was pending; flag is now set. */
- else
- workqueue_enqueue(sc-sc_reset_wq, sc-sc_reset_work, NULL);
+ DPRINTF(sc, UATP_DEBUG_RESET, (deferring reset\n));
+ usb_add_task(sc-sc_hdev.sc_parent-sc_udev, sc-sc_reset_task,
+ USB_TASKQ_DRIVER);
}
static void
-geyser34_reset_worker(struct work *work, void *arg)
+geyser34_reset_task(void *arg)
{
struct uatp_softc *sc = arg;
@@ -1406,9 +1380,6 @@ geyser34_reset_worker(struct work *work,
/* Reset by putting it into raw mode.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Mon Jul 14 14:58:32 UTC 2014
Modified Files:
src/sys/dev/usb: uatp.c
Log Message:
Add module crud to uatp(4).
Compile-tested only; hardware not available right now.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/uatp.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/uatp.c
diff -u src/sys/dev/usb/uatp.c:1.8 src/sys/dev/usb/uatp.c:1.9
--- src/sys/dev/usb/uatp.c:1.8 Mon Jul 14 14:56:10 2014
+++ src/sys/dev/usb/uatp.c Mon Jul 14 14:58:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uatp.c,v 1.8 2014/07/14 14:56:10 riastradh Exp $ */
+/* $NetBSD: uatp.c,v 1.9 2014/07/14 14:58:32 riastradh Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.8 2014/07/14 14:56:10 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.9 2014/07/14 14:58:32 riastradh Exp $);
#include sys/types.h
#include sys/param.h
@@ -155,6 +155,7 @@ __KERNEL_RCSID(0, $NetBSD: uatp.c,v 1.8
#include sys/errno.h
#include sys/ioctl.h
#include sys/kernel.h
+#include sys/module.h
#include sys/sysctl.h
#include sys/systm.h
#include sys/time.h
@@ -2645,3 +2646,32 @@ accelerate(struct uatp_softc *sc, unsign
#undef CHECK_
}
+
+MODULE(MODULE_CLASS_DRIVER, uatp, NULL);
+
+#ifdef _MODULE
+#include ioconf.c
+#endif
+
+static int
+uatp_modcmd(modcmd_t cmd, void *aux)
+{
+ int error = 0;
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+#ifdef _MODULE
+ error = config_init_component(cfdriver_ioconf_uatp,
+ cfattach_ioconf_uatp, cfdata_ioconf_uatp);
+#endif
+ return error;
+ case MODULE_CMD_FINI:
+#ifdef _MODULE
+ error = config_fini_component(cfdriver_ioconf_uatp,
+ cfattach_ioconf_uatp, cfdata_ioconf_uatp);
+#endif
+ return error;
+ default:
+ return ENOTTY;
+ }
+}
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Mon Jul 14 16:06:48 UTC 2014
Modified Files:
src/sys/kern: kern_module.c
Log Message:
Tell which dependency has failed
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/kern/kern_module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.95 src/sys/kern/kern_module.c:1.96
--- src/sys/kern/kern_module.c:1.95 Tue Feb 25 18:30:11 2014
+++ src/sys/kern/kern_module.c Mon Jul 14 16:06:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.95 2014/02/25 18:30:11 pooka Exp $ */
+/* $NetBSD: kern_module.c,v 1.96 2014/07/14 16:06:48 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.95 2014/02/25 18:30:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.96 2014/07/14 16:06:48 maxv Exp $);
#define _MODULE_INTERNAL
@@ -1081,8 +1081,9 @@ module_do_load(const char *name, bool is
error = module_do_load(buf, true, flags, NULL,
mod2, MODULE_CLASS_ANY, true);
if (error != 0) {
-module_error(recursive load failed for `%s',
-error %d, mi-mi_name, error);
+module_error(recursive load failed for `%s'
+(`%s' required), error %d, mi-mi_name,
+buf, error);
goto fail;
}
mod-mod_required[mod-mod_nrequired++] = mod2;
CVS commit: src/sys/fs/smbfs
Module Name:src Committed By: maxv Date: Mon Jul 14 16:29:50 UTC 2014 Modified Files: src/sys/fs/smbfs: smbfs_vfsops.c Log Message: smbfs depends on nsmb, so add the dependency as appropriate. Fixes # modload smbfs on modular kernels, PR kern/40011, and probably system crashes. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/fs/smbfs/smbfs_vfsops.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/fs/smbfs/smbfs_vfsops.c diff -u src/sys/fs/smbfs/smbfs_vfsops.c:1.102 src/sys/fs/smbfs/smbfs_vfsops.c:1.103 --- src/sys/fs/smbfs/smbfs_vfsops.c:1.102 Sun May 25 19:33:28 2014 +++ src/sys/fs/smbfs/smbfs_vfsops.c Mon Jul 14 16:29:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: smbfs_vfsops.c,v 1.102 2014/05/25 19:33:28 christos Exp $ */ +/* $NetBSD: smbfs_vfsops.c,v 1.103 2014/07/14 16:29:50 maxv Exp $ */ /* * Copyright (c) 2000-2001, Boris Popov @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: smbfs_vfsops.c,v 1.102 2014/05/25 19:33:28 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: smbfs_vfsops.c,v 1.103 2014/07/14 16:29:50 maxv Exp $); #include sys/param.h #include sys/systm.h @@ -62,7 +62,7 @@ __KERNEL_RCSID(0, $NetBSD: smbfs_vfsops #include fs/smbfs/smbfs_node.h #include fs/smbfs/smbfs_subr.h -MODULE(MODULE_CLASS_VFS, smbfs, NULL); +MODULE(MODULE_CLASS_VFS, smbfs, nsmb); VFS_PROTOS(smbfs);
CVS commit: src/sys/sys
Module Name:src Committed By: plunky Date: Mon Jul 14 18:50:22 UTC 2014 Modified Files: src/sys/sys: cdefs.h Log Message: remove PCC specific definitions for __packed, __aligned and __section which result in a _Pragma() usage. I don't think this ever worked, as you can't concatenate string literals in this way. A warning would have been produced, but until recently did not result in an error condition so this was overlooked. Use __attribute__ instead as this is supported by PCC. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/sys/cdefs.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/sys/cdefs.h diff -u src/sys/sys/cdefs.h:1.119 src/sys/sys/cdefs.h:1.120 --- src/sys/sys/cdefs.h:1.119 Thu Mar 13 20:36:01 2014 +++ src/sys/sys/cdefs.h Mon Jul 14 18:50:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.119 2014/03/13 20:36:01 pooka Exp $ */ +/* $NetBSD: cdefs.h,v 1.120 2014/07/14 18:50:22 plunky Exp $ */ /* * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -353,14 +353,10 @@ #define __packed __packed #define __aligned(x) /* delete */ #define __section(x) /* delete */ -#elif __GNUC_PREREQ__(2, 7) +#elif __GNUC_PREREQ__(2, 7) || defined(__PCC__) #define __packed __attribute__((__packed__)) #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) -#elif defined(__PCC__) -#define __packed _Pragma(packed 1) -#define __aligned(x) _Pragma(aligned __STRING(x)) -#define __section(x) _Pragma(section ## x) #elif defined(_MSC_VER) #define __packed /* ignore */ #else
CVS commit: src/tests/lib/libbpfjit
Module Name:src
Committed By: alnsn
Date: Mon Jul 14 19:11:15 UTC 2014
Modified Files:
src/tests/lib/libbpfjit: t_extmem.c
Log Message:
Add a link to ../../net/bpfjit/t_extmem.c.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libbpfjit/t_extmem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libbpfjit/t_extmem.c
diff -u src/tests/lib/libbpfjit/t_extmem.c:1.2 src/tests/lib/libbpfjit/t_extmem.c:1.3
--- src/tests/lib/libbpfjit/t_extmem.c:1.2 Tue Jul 8 21:13:01 2014
+++ src/tests/lib/libbpfjit/t_extmem.c Mon Jul 14 19:11:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_extmem.c,v 1.2 2014/07/08 21:13:01 alnsn Exp $ */
+/* $NetBSD: t_extmem.c,v 1.3 2014/07/14 19:11:15 alnsn Exp $ */
/*-
* Copyright (c) 2014 Alexander Nasonov.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_extmem.c,v 1.2 2014/07/08 21:13:01 alnsn Exp $);
+__RCSID($NetBSD: t_extmem.c,v 1.3 2014/07/14 19:11:15 alnsn Exp $);
#include atf-c.h
#include stdint.h
@@ -464,6 +464,10 @@ ATF_TC_BODY(libbpfjit_copx_ret_preinited
ATF_TP_ADD_TCS(tp)
{
+ /*
+ * For every new test please also add a similar test
+ * to ../../net/bpfjit/t_extmem.c
+ */
ATF_TP_ADD_TC(tp, libbpfjit_extmem_load_default);
ATF_TP_ADD_TC(tp, libbpfjit_extmem_load_preinited);
ATF_TP_ADD_TC(tp, libbpfjit_extmem_invalid_load);
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: joerg Date: Mon Jul 14 20:20:31 UTC 2014 Modified Files: src/sys/arch/arm/include: int_types.h Log Message: Do not explicitly undef __INT8_TYPE__, clang is handled specially below. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/int_types.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/int_types.h diff -u src/sys/arch/arm/include/int_types.h:1.15 src/sys/arch/arm/include/int_types.h:1.16 --- src/sys/arch/arm/include/int_types.h:1.15 Sun Jul 13 16:31:20 2014 +++ src/sys/arch/arm/include/int_types.h Mon Jul 14 20:20:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.15 2014/07/13 16:31:20 joerg Exp $ */ +/* $NetBSD: int_types.h,v 1.16 2014/07/14 20:20:31 joerg Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -42,9 +42,6 @@ #ifndef __UINT8_TYPE__ # define __UINT8_TYPE__ unsigned char -# ifdef __CHAR_UNSIGNED__ -# undef __INT8_TYPE__ -# endif #endif #ifndef __INT8_TYPE__ # define __INT8_TYPE__ signed char
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: christos
Date: Mon Jul 14 20:44:45 UTC 2014
Modified Files:
src/lib/libc/gen: basename.c dirname.c
Log Message:
Factor out the basename and dirname code into basename_r and dirname_r
which are static for now. Inspired by similar changes to android(bionic).
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gen/basename.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/gen/dirname.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/gen/basename.c
diff -u src/lib/libc/gen/basename.c:1.9 src/lib/libc/gen/basename.c:1.10
--- src/lib/libc/gen/basename.c:1.9 Tue Nov 24 08:34:20 2009
+++ src/lib/libc/gen/basename.c Mon Jul 14 16:44:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: basename.c,v 1.9 2009/11/24 13:34:20 tnozaki Exp $ */
+/* $NetBSD: basename.c,v 1.10 2014/07/14 20:44:45 christos Exp $ */
/*-
* Copyright (c) 1997, 2002 The NetBSD Foundation, Inc.
@@ -31,11 +31,13 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: basename.c,v 1.9 2009/11/24 13:34:20 tnozaki Exp $);
+__RCSID($NetBSD: basename.c,v 1.10 2014/07/14 20:44:45 christos Exp $);
#endif /* !LIBC_SCCS !lint */
#include namespace.h
+#include sys/param.h
#include libgen.h
+#include string.h
#include limits.h
#include string.h
@@ -43,43 +45,57 @@ __RCSID($NetBSD: basename.c,v 1.9 2009/
__weak_alias(basename,_basename)
#endif
-#if !HAVE_BASENAME
-char *
-basename(char *path)
+static size_t
+basename_r(const char *path, char *buf, size_t buflen)
{
- static char result[PATH_MAX];
- const char *p, *lastp;
+ const char *startp, *endp;
size_t len;
/*
* If `path' is a null pointer or points to an empty string,
* return a pointer to the string ..
*/
- if ((path == NULL) || (*path == '\0')) {
- result[0] = '.';
- result[1] = '\0';
-
- return (result);
+ if (path == NULL || *path == '\0') {
+ startp = .;
+ len = 1;
+ goto out;
}
/* Strip trailing slashes, if any. */
- lastp = path + strlen(path) - 1;
- while (lastp != path *lastp == '/')
- lastp--;
+ endp = path + strlen(path) - 1;
+ while (endp != path *endp == '/')
+ endp--;
+
+ /* Only slashes - / */
+ if (endp == path *endp == '/') {
+ startp = /;
+ len = 1;
+ goto out;
+ }
/* Now find the beginning of this (final) component. */
- p = lastp;
- while (p != path *(p - 1) != '/')
- p--;
+ for (startp = endp; startp path *(startp - 1) != '/'; startp--)
+ continue;
/* ...and copy the result into the result buffer. */
- len = (lastp - p) + 1 /* last char */;
- if (len (PATH_MAX - 1))
- len = PATH_MAX - 1;
+ len = (endp - startp) + 1 /* last char */;
+out:
+ if (buf != NULL buflen != 0) {
+ buflen = MIN(len, buflen - 1);
+ memcpy(buf, startp, buflen);
+ buf[buflen] = '\0';
+ }
+ return len;
+}
+
+#if !HAVE_BASENAME
- memcpy(result, p, len);
- result[len] = '\0';
+char *
+basename(char *path) {
+ static char result[PATH_MAX];
- return (result);
+ (void)basename_r(path, result, sizeof(result));
+ return result;
}
+
#endif
Index: src/lib/libc/gen/dirname.c
diff -u src/lib/libc/gen/dirname.c:1.11 src/lib/libc/gen/dirname.c:1.12
--- src/lib/libc/gen/dirname.c:1.11 Tue Nov 24 08:34:20 2009
+++ src/lib/libc/gen/dirname.c Mon Jul 14 16:44:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dirname.c,v 1.11 2009/11/24 13:34:20 tnozaki Exp $ */
+/* $NetBSD: dirname.c,v 1.12 2014/07/14 20:44:45 christos Exp $ */
/*-
* Copyright (c) 1997, 2002 The NetBSD Foundation, Inc.
@@ -31,10 +31,11 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: dirname.c,v 1.11 2009/11/24 13:34:20 tnozaki Exp $);
+__RCSID($NetBSD: dirname.c,v 1.12 2014/07/14 20:44:45 christos Exp $);
#endif /* !LIBC_SCCS !lint */
#include namespace.h
+#include sys/param.h
#include libgen.h
#include limits.h
#include string.h
@@ -43,51 +44,57 @@ __RCSID($NetBSD: dirname.c,v 1.11 2009/
__weak_alias(dirname,_dirname)
#endif
-#if !HAVE_DIRNAME
-char *
-dirname(char *path)
+static size_t
+dirname_r(const char *path, char *buf, size_t buflen)
{
- static char result[PATH_MAX];
- const char *lastp;
+ const char *endp;
size_t len;
/*
* If `path' is a null pointer or points to an empty string,
* return a pointer to the string ..
*/
- if ((path == NULL) || (*path == '\0'))
- goto singledot;
-
+ if (path == NULL || *path == '\0') {
+ path = .;
+ len = 1;
+ goto out;
+ }
/* Strip trailing slashes, if any. */
- lastp = path + strlen(path) - 1;
- while (lastp != path *lastp == '/')
- lastp--;
-
- /* Terminate path at the last occurence of '/'. */
- do {
- if (*lastp == '/') {
- /* Strip trailing slashes, if any. */
- while (lastp != path *lastp == '/')
-lastp--;
-
- /* ...and copy the result into the result buffer. */
- len = (lastp - path) + 1 /* last char */;
- if (len (PATH_MAX - 1))
-len = PATH_MAX - 1;
-
-
CVS commit: src/usr.bin/grep
Module Name:src
Committed By: christos
Date: Mon Jul 14 21:56:03 UTC 2014
Modified Files:
src/usr.bin/grep: util.c
Log Message:
fix type, from enh at google dot com
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/grep/util.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.bin/grep/util.c
diff -u src/usr.bin/grep/util.c:1.17 src/usr.bin/grep/util.c:1.18
--- src/usr.bin/grep/util.c:1.17 Sun Jan 20 22:24:43 2013
+++ src/usr.bin/grep/util.c Mon Jul 14 17:56:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.17 2013/01/21 03:24:43 msaitoh Exp $ */
+/* $NetBSD: util.c,v 1.18 2014/07/14 21:56:03 christos Exp $ */
/* $FreeBSD: head/usr.bin/grep/util.c 211496 2010-08-19 09:28:59Z des $ */
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: util.c,v 1.17 2013/01/21 03:24:43 msaitoh Exp $);
+__RCSID($NetBSD: util.c,v 1.18 2014/07/14 21:56:03 christos Exp $);
#include sys/stat.h
#include sys/types.h
@@ -324,7 +324,7 @@ procline(struct str *l, int nottext)
continue;
/* Check for whole word match */
if (fg_pattern[i].word pmatch.rm_so != 0) {
-wint_t wbegin, wend;
+wchar_t wbegin, wend;
wbegin = wend = L' ';
if (pmatch.rm_so != 0
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: ozaki-r
Date: Tue Jul 15 02:25:46 UTC 2014
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
Suppress another debug output
It's output when DDB.
Fix previous: DEBUG = XHCI_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 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.17 src/sys/dev/usb/xhci.c:1.18
--- src/sys/dev/usb/xhci.c:1.17 Mon Jul 14 00:58:35 2014
+++ src/sys/dev/usb/xhci.c Tue Jul 15 02:25:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.17 2014/07/14 00:58:35 ozaki-r Exp $ */
+/* $NetBSD: xhci.c,v 1.18 2014/07/15 02:25:45 ozaki-r Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.17 2014/07/14 00:58:35 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.18 2014/07/15 02:25:45 ozaki-r Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2809,7 +2809,9 @@ xhci_device_intr_start(usbd_xfer_handle
xhci_db_write_4(sc, XHCI_DOORBELL(xs-xs_idx), dci);
if (sc-sc_bus.use_polling) {
+#ifdef XHCI_DEBUG
device_printf(sc-sc_dev, %s polling\n, __func__);
+#endif
//xhci_waitintr(sc, xfer);
}
@@ -2826,7 +2828,7 @@ xhci_device_intr_done(usbd_xfer_handle x
const bool isread = UE_GET_DIR(endpt) == UE_DIR_IN;
DPRINTF((%s\n, __func__));
-#ifdef DEBUG
+#ifdef XHCI_DEBUG
device_printf(sc-sc_dev, %s %p slot %u dci %u\n, __func__, xfer,
xs-xs_idx, dci);
#endif
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: ozaki-r
Date: Tue Jul 15 03:40:06 UTC 2014
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
Unbreak the build for i386
__debugused = XHCI_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 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.18 src/sys/dev/usb/xhci.c:1.19
--- src/sys/dev/usb/xhci.c:1.18 Tue Jul 15 02:25:45 2014
+++ src/sys/dev/usb/xhci.c Tue Jul 15 03:40:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.18 2014/07/15 02:25:45 ozaki-r Exp $ */
+/* $NetBSD: xhci.c,v 1.19 2014/07/15 03:40:06 ozaki-r Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.18 2014/07/15 02:25:45 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.19 2014/07/15 03:40:06 ozaki-r Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2822,8 +2822,10 @@ static void
xhci_device_intr_done(usbd_xfer_handle xfer)
{
struct xhci_softc * const sc = xfer-pipe-device-bus-hci_private;
- struct xhci_slot * const xs __debugused = xfer-pipe-device-hci_private;
- const u_int dci __debugused = xhci_ep_get_dci(xfer-pipe-endpoint-edesc);
+#ifdef XHCI_DEBUG
+ struct xhci_slot * const xs = xfer-pipe-device-hci_private;
+ const u_int dci = xhci_ep_get_dci(xfer-pipe-endpoint-edesc);
+#endif
const u_int endpt = xfer-pipe-endpoint-edesc-bEndpointAddress;
const bool isread = UE_GET_DIR(endpt) == UE_DIR_IN;
DPRINTF((%s\n, __func__));
CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:21:22 UTC 2014 Modified Files: src/sys/kern [netbsd-6]: kern_core.c Log Message: Pull up following revision(s) (requested by maxt in ticket #1097): sys/kern/kern_core.c: revision 1.23 Fix a read-beyond-end string read. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/kern/kern_core.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/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:24:17 UTC 2014 Modified Files: src/sys/kern [netbsd-6-1]: kern_core.c Log Message: Pull up following revision(s) (requested by maxt in ticket #1097): sys/kern/kern_core.c: revision 1.23 Fix a read-beyond-end string read. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.22.1 src/sys/kern/kern_core.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/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:26:02 UTC 2014 Modified Files: src/sys/kern [netbsd-6-0]: kern_core.c Log Message: Pull up following revision(s) (requested by maxt in ticket #1097): sys/kern/kern_core.c: revision 1.23 Fix a read-beyond-end string read. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.14.1 src/sys/kern/kern_core.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/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:32:31 UTC 2014 Modified Files: src/sys/kern [netbsd-6]: sys_module.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1098): sys/kern/sys_module.c: revision 1.15 Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system. ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/kern/sys_module.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/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:33:33 UTC 2014 Modified Files: src/sys/kern [netbsd-6-1]: sys_module.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1098): sys/kern/sys_module.c: revision 1.15 Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system. ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.14.1 src/sys/kern/sys_module.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/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:33:55 UTC 2014 Modified Files: src/sys/kern [netbsd-6-0]: sys_module.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1098): sys/kern/sys_module.c: revision 1.15 Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system. ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.12.1 src/sys/kern/sys_module.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
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:34:51 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.5 Log Message: Ticket 1097 and 1098. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.1.5 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
Module Name:src Committed By: msaitoh Date: Mon Jul 14 06:35:33 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.6 Log Message: Ticket 1097 and 1098. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.0.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/compiler_rt
Module Name:src Committed By: joerg Date: Mon Jul 14 07:55:27 UTC 2014 Modified Files: src/lib/libc/compiler_rt: Makefile.inc Log Message: Don't include atomic.c, we have aliases for it in src/common. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/compiler_rt/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 14 09:08:42 UTC 2014 Modified Files: src/sys/kern [netbsd-5]: sys_module.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1914): sys/kern/sys_module.c: revision 1.15 via patch Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system. ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.8.4.1 -r1.8.4.2 src/sys/kern/sys_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-2] src/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 14 09:09:37 UTC 2014 Modified Files: src/sys/kern [netbsd-5-2]: sys_module.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1914): sys/kern/sys_module.c: revision 1.15 via patch Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system. ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.8.4.1 -r1.8.4.1.6.1 src/sys/kern/sys_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/sys/kern
Module Name:src Committed By: msaitoh Date: Mon Jul 14 09:10:18 UTC 2014 Modified Files: src/sys/kern [netbsd-5-1]: sys_module.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1914): sys/kern/sys_module.c: revision 1.15 via patch Fix a user-controlled memory allocation. kmem_alloc(0) will panic the system. ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.8.4.1 -r1.8.4.1.2.1 src/sys/kern/sys_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 14 09:15:07 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1914. To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jul 14 09:17:04 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.5 Log Message: Ticket 1914. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.1.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: mbalmer Date: Mon Jul 14 10:05:24 UTC 2014 Modified Files: src/sys/dev/pckbport: wskbdmap_mfii.c src/sys/dev/usb: ukbdmap.c Log Message: Add a belgian keyboard layout, based on the french keyboard layout. Fixes PR install/46871. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pckbport/wskbdmap_mfii.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/ukbdmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumpuser
Module Name:src Committed By: alnsn Date: Mon Jul 14 10:36:33 UTC 2014 Removed Files: src/lib/librumpuser: rumpuser_cache.c Log Message: Remove unused file. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/lib/librumpuser/rumpuser_cache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libunwind
Module Name:src Committed By: joerg Date: Mon Jul 14 11:36:39 UTC 2014 Modified Files: src/sys/lib/libunwind: AddressSpace.hpp Log Message: Use static_cast for rb_tree_insert_node void * return value. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/lib/libunwind/AddressSpace.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jul 14 11:45:06 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13355 Log Message: Import dhcpcd-6.4.1 with the following changes: * If just given a domain and no search list, make the search list the domain * Skip arpping directives if we have a profile but not parsing one * Allow the request of a DHCPv6 address or prefix, a prefix length must be specified * Add the ability to dump DHCPv6 leases * Improve startup with regards to carrier checking and adding a link-local IPv6 address * Start the correct interface reference for added devices * Support http://datatracker.ietf.org/doc/draft-ietf-dhc-dhcpv6-stateful-issues-06 via the ia_pd_mix option * Fix link handling where kernel reported flags in LINK_UP may not be valid when we actually process them * Fix defining new options in dhcpcd.conf and requesting them * Fix a potential segfault when reloading configurations * Print user defined options via -V * Add support for RFC6603, Prefix Exclude option * When requesting a IA_PD and another IA type, create a psuedo interface to handle the IA_PD * Handle truncated DHCPv6 saved leases Status: Vendor Tag: roy Release Tags: dhcpcd-6-4-1 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if.c C src/external/bsd/dhcpcd/dist/if-options.c C src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c C src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in C src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/crypt/md5.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jul 14 11:49:48 UTC 2014 Modified Files: src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd.8.in dhcpcd.c dhcpcd.conf.5.in if-bsd.c if-options.c ipv6nd.c script.c Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/bsd/dhcpcd/dist/dhcp.c cvs rdiff -u -r1.28 -r1.29 src/external/bsd/dhcpcd/dist/dhcpcd.8.in cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcpcd/dist/dhcpcd.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in \ src/external/bsd/dhcpcd/dist/ipv6nd.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/if-bsd.c \ src/external/bsd/dhcpcd/dist/script.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/if-options.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jul 14 11:51:08 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.4.1 To generate a diff of this commit: cvs rdiff -u -r1.1134 -r1.1135 src/doc/3RDPARTY cvs rdiff -u -r1.1944 -r1.1945 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/sys/dev/usb
Module Name:src Committed By: ryoon Date: Mon Jul 14 12:02:59 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Sharp CE-175TU USB to Zaurus Option Port 16 cable. With this cable, you can login to NetBSD/zaurus on SL-C750 via serial console. To generate a diff of this commit: cvs rdiff -u -r1.673 -r1.674 src/sys/dev/usb/usbdevs 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
Module Name:src Committed By: ryoon Date: Mon Jul 14 12:03:42 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.665 -r1.666 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.666 -r1.667 src/sys/dev/usb/usbdevs_data.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/usb
Module Name:src Committed By: ryoon Date: Mon Jul 14 12:04:48 UTC 2014 Modified Files: src/sys/dev/usb: uplcom.c Log Message: Sharp CE-175TU USB to Zaurus Option Port 16 cable is uplcom(4) device. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/dev/usb/uplcom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: ryoon Date: Mon Jul 14 12:07:04 UTC 2014 Modified Files: src/share/man/man4: uplcom.4 Log Message: Add Sharp CE-175TU entry, and bump date. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/uplcom.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/wscons/keymaps
Module Name:src Committed By: mbalmer Date: Mon Jul 14 12:21:56 UTC 2014 Modified Files: src/share/wscons/keymaps: Makefile Log Message: Put them one file per line. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/wscons/keymaps/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: mbalmer Date: Mon Jul 14 12:29:48 UTC 2014 Modified Files: src/etc: rc.conf Log Message: Consistency changes only. Start sentences with a capital letter and end them with a full stop. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/etc/rc.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: mbalmer Date: Mon Jul 14 12:38:00 UTC 2014 Modified Files: src/doc: CHANGES Log Message: wskbd(4) has a belgian keyboard layout now. To generate a diff of this commit: cvs rdiff -u -r1.1945 -r1.1946 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/sys/arch/sparc64
Module Name:src Committed By: nakayama Date: Mon Jul 14 12:40:38 UTC 2014 Modified Files: src/sys/arch/sparc64/include: bus_funcs.h src/sys/arch/sparc64/sparc64: machdep.c Log Message: Make bus_space_barrier inline to avoid unnecessary argument handling. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/include/bus_funcs.h cvs rdiff -u -r1.277 -r1.278 src/sys/arch/sparc64/sparc64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: rtr Date: Mon Jul 14 13:20:41 UTC 2014 Modified Files: src/sys/netinet: tcp_usrreq.c Log Message: pr_generic() for req = PRU_RCVOOB is always called with control == NULL so don't bother with a conditional block that handles non-NULL, it doesn't happen. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/netinet/tcp_usrreq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: rtr Date: Mon Jul 14 13:39:18 UTC 2014 Modified Files: src/sys/netinet: raw_ip.c Log Message: fix fat fingered KASSERT(solocked(0)) - KASSERT(solocked(so)) mistake. spotted by Takahiro HAYASHI To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/sys/netinet/raw_ip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jul 14 14:02:02 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29618 Log Message: Import dhcpcd-6.4.2 to fix the building of 6.4.1 Status: Vendor Tag: roy Release Tags: dhcpcd-6-4-2 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind No conflicts created by this import
CVS commit: src/external/bsd/dhcpcd/dist/crypt
Module Name:src Committed By: roy Date: Mon Jul 14 14:07:02 UTC 2014 Removed Files: src/external/bsd/dhcpcd/dist/crypt: md5.h Log Message: Remove unused file. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/dhcpcd/dist/crypt/md5.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jul 14 14:08:41 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.4.2 To generate a diff of this commit: cvs rdiff -u -r1.1135 -r1.1136 src/doc/3RDPARTY cvs rdiff -u -r1.1946 -r1.1947 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/sys/dev/usb
Module Name:src Committed By: riastradh Date: Mon Jul 14 14:56:10 UTC 2014 Modified Files: src/sys/dev/usb: uatp.c Log Message: Convert uatp(4) to use usb_task instead of a workqueue. Compile-tested only; hardware not available right now. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/uatp.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
Module Name:src Committed By: riastradh Date: Mon Jul 14 14:58:32 UTC 2014 Modified Files: src/sys/dev/usb: uatp.c Log Message: Add module crud to uatp(4). Compile-tested only; hardware not available right now. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/uatp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Mon Jul 14 16:06:48 UTC 2014 Modified Files: src/sys/kern: kern_module.c Log Message: Tell which dependency has failed To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/kern/kern_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/smbfs
Module Name:src Committed By: maxv Date: Mon Jul 14 16:29:50 UTC 2014 Modified Files: src/sys/fs/smbfs: smbfs_vfsops.c Log Message: smbfs depends on nsmb, so add the dependency as appropriate. Fixes # modload smbfs on modular kernels, PR kern/40011, and probably system crashes. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/fs/smbfs/smbfs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: plunky Date: Mon Jul 14 18:50:22 UTC 2014 Modified Files: src/sys/sys: cdefs.h Log Message: remove PCC specific definitions for __packed, __aligned and __section which result in a _Pragma() usage. I don't think this ever worked, as you can't concatenate string literals in this way. A warning would have been produced, but until recently did not result in an error condition so this was overlooked. Use __attribute__ instead as this is supported by PCC. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/sys/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libbpfjit
Module Name:src Committed By: alnsn Date: Mon Jul 14 19:11:15 UTC 2014 Modified Files: src/tests/lib/libbpfjit: t_extmem.c Log Message: Add a link to ../../net/bpfjit/t_extmem.c. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libbpfjit/t_extmem.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
Module Name:src Committed By: joerg Date: Mon Jul 14 20:20:31 UTC 2014 Modified Files: src/sys/arch/arm/include: int_types.h Log Message: Do not explicitly undef __INT8_TYPE__, clang is handled specially below. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/int_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: christos Date: Mon Jul 14 20:44:45 UTC 2014 Modified Files: src/lib/libc/gen: basename.c dirname.c Log Message: Factor out the basename and dirname code into basename_r and dirname_r which are static for now. Inspired by similar changes to android(bionic). To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gen/basename.c cvs rdiff -u -r1.11 -r1.12 src/lib/libc/gen/dirname.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/grep
Module Name:src Committed By: christos Date: Mon Jul 14 21:56:03 UTC 2014 Modified Files: src/usr.bin/grep: util.c Log Message: fix type, from enh at google dot com To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/grep/util.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
Module Name:src Committed By: ozaki-r Date: Tue Jul 15 02:25:46 UTC 2014 Modified Files: src/sys/dev/usb: xhci.c Log Message: Suppress another debug output It's output when DDB. Fix previous: DEBUG = XHCI_DEBUG To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 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.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: ozaki-r Date: Tue Jul 15 03:40:06 UTC 2014 Modified Files: src/sys/dev/usb: xhci.c Log Message: Unbreak the build for i386 __debugused = XHCI_DEBUG To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 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.
