CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rin Date: Mon Jun 8 05:05:44 UTC 2020 Modified Files: src/distrib/sets/lists/debug: shl.mi Log Message: Remove t_proplib.debug from debug/shl.mi, which is built regardless of MKPIC, and has been moved into debug/mi. To generate a diff of this commit: cvs rdiff -u -r1.252 -r1.253 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.252 src/distrib/sets/lists/debug/shl.mi:1.253 --- src/distrib/sets/lists/debug/shl.mi:1.252 Sun Jun 7 10:24:50 2020 +++ src/distrib/sets/lists/debug/shl.mi Mon Jun 8 05:05:43 2020 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.252 2020/06/07 10:24:50 martin Exp $ +# $NetBSD: shl.mi,v 1.253 2020/06/08 05:05:43 rin Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -345,7 +345,6 @@ ./usr/libdata/debug/usr/tests/lib/libc/tls/libh_tls_dynamic.so.1.debug tests-lib-debug debug,compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dlopen.debug tests-lib-debug debug,compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dynamic.debug tests-lib-debug debug,compattestfile,atf -./usr/libdata/debug/usr/tests/lib/libprop/t_proplib.debug tests-lib-debug debug,compattestfile ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_helper_symver_dso0/libh_helper_symver_dso.so.1.debug tests-libexec-debug debug,compattestfile,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_helper_symver_dso1/libh_helper_symver_dso.so.1.debug tests-libexec-debug debug,compattestfile,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_helper_symver_dso2/libh_helper_symver_dso.so.1.debug tests-libexec-debug debug,compattestfile,atf
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rin Date: Mon Jun 8 02:54:41 UTC 2020 Modified Files: src/distrib/sets/lists/debug: mi Log Message: For /usr/libdata/debug/usr/tests/lib/libprop - Obsolete t_basic.debug and - Add t_proplib.debug To generate a diff of this commit: cvs rdiff -u -r1.313 -r1.314 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.313 src/distrib/sets/lists/debug/mi:1.314 --- src/distrib/sets/lists/debug/mi:1.313 Sat May 30 20:47:58 2020 +++ src/distrib/sets/lists/debug/mi Mon Jun 8 02:54:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.313 2020/05/30 20:47:58 christos Exp $ +# $NetBSD: mi,v 1.314 2020/06/08 02:54:41 rin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2266,7 +2266,8 @@ ./usr/libdata/debug/usr/tests/lib/libppath/t_ppath.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libproc/proc_test.debug tests-lib-debugq debug,atf,compattestfile,dtrace ./usr/libdata/debug/usr/tests/lib/libproc/target_prog.debug tests-lib-debugq debug,atf,compattestfile,dtrace -./usr/libdata/debug/usr/tests/lib/libprop/t_basic.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libprop/t_basic.debug tests-lib-debug obsolete +./usr/libdata/debug/usr/tests/lib/libprop/t_proplib.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libpthread/dlopen/h_pthread_dlopen.so.1.debug tests-lib-debug debug,atf,pic,compattestfile ./usr/libdata/debug/usr/tests/lib/libpthread/dlopen/t_dlopen.debug tests-lib-debug debug,atf,pic,compattestfile ./usr/libdata/debug/usr/tests/lib/libpthread/dlopen/t_dso_pthread_create.debug tests-lib-debug debug,atf,pic,compattestfile
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: mrg
Date: Mon Jun 8 02:27:08 UTC 2020
Modified Files:
src/sys/arch/sparc/sparc: autoconf.c
Log Message:
make find_cpus() static.
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/arch/sparc/sparc/autoconf.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/sparc/sparc/autoconf.c
diff -u src/sys/arch/sparc/sparc/autoconf.c:1.259 src/sys/arch/sparc/sparc/autoconf.c:1.260
--- src/sys/arch/sparc/sparc/autoconf.c:1.259 Sun Oct 4 08:15:46 2015
+++ src/sys/arch/sparc/sparc/autoconf.c Mon Jun 8 02:27:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.259 2015/10/04 08:15:46 joerg Exp $ */
+/* $NetBSD: autoconf.c,v 1.260 2020/06/08 02:27:08 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.259 2015/10/04 08:15:46 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.260 2020/06/08 02:27:08 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -144,7 +144,7 @@ static void bootpath_build(void);
static void bootpath_fake(struct bootpath *, const char *);
static void bootpath_print(struct bootpath *);
static struct bootpath *bootpath_store(int, struct bootpath *);
-int find_cpus(void);
+static int find_cpus(void);
char machine_model[100];
#ifdef DEBUG
@@ -172,7 +172,7 @@ matchbyname(device_t parent, cfdata_t cf
* Get the number of CPUs in the system and the CPUs' SPARC architecture
* version. We need this information early in the boot process.
*/
-int
+static int
find_cpus(void)
{
int n;
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: lukem
Date: Mon Jun 8 01:33:27 UTC 2020
Modified Files:
src/usr.bin/ftp: ftp.c util.c version.h
Log Message:
ftp: exit if lostpeer invoked by a signal
lostpeer() calls too many async-unsafe functions (both directly
and indirectly) to close and cleanup the remote connections,
so just exit after the cleanup if invoked by a signal.
Reported in private mail by Qi Hou.
May also resolve a crash reported by Thomas Klausner.
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/usr.bin/ftp/ftp.c
cvs rdiff -u -r1.160 -r1.161 src/usr.bin/ftp/util.c
cvs rdiff -u -r1.88 -r1.89 src/usr.bin/ftp/version.h
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/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.168 src/usr.bin/ftp/ftp.c:1.169
--- src/usr.bin/ftp/ftp.c:1.168 Mon Feb 4 04:09:13 2019
+++ src/usr.bin/ftp/ftp.c Mon Jun 8 01:33:27 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: ftp.c,v 1.168 2019/02/04 04:09:13 mrg Exp $ */
+/* $NetBSD: ftp.c,v 1.169 2020/06/08 01:33:27 lukem Exp $ */
/*-
- * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996-2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -92,7 +92,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-__RCSID("$NetBSD: ftp.c,v 1.168 2019/02/04 04:09:13 mrg Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.169 2020/06/08 01:33:27 lukem Exp $");
#endif
#endif /* not lint */
@@ -2047,7 +2047,7 @@ gunique(const char *local)
* needs to get back to a known state.
*/
static void
-abort_squared(int dummy)
+abort_squared(int signo)
{
char msgbuf[100];
size_t len;
@@ -2057,7 +2057,7 @@ abort_squared(int dummy)
len = strlcpy(msgbuf, "\nremote abort aborted; closing connection.\n",
sizeof(msgbuf));
write(fileno(ttyout), msgbuf, len);
- lostpeer(0);
+ lostpeer(signo);
siglongjmp(xferabort, 1);
}
Index: src/usr.bin/ftp/util.c
diff -u src/usr.bin/ftp/util.c:1.160 src/usr.bin/ftp/util.c:1.161
--- src/usr.bin/ftp/util.c:1.160 Sat Jun 22 23:40:53 2019
+++ src/usr.bin/ftp/util.c Mon Jun 8 01:33:27 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: util.c,v 1.160 2019/06/22 23:40:53 christos Exp $ */
+/* $NetBSD: util.c,v 1.161 2020/06/08 01:33:27 lukem Exp $ */
/*-
- * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997-2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -64,7 +64,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.160 2019/06/22 23:40:53 christos Exp $");
+__RCSID("$NetBSD: util.c,v 1.161 2020/06/08 01:33:27 lukem Exp $");
#endif /* not lint */
/*
@@ -324,9 +324,10 @@ intr(int signo)
/*
* Signal handler for lost connections; cleanup various elements of
* the connection state, and call cleanuppeer() to finish it off.
+ * This function is not signal safe, so exit if called by a signal.
*/
void
-lostpeer(int dummy)
+lostpeer(int signo)
{
int oerrno = errno;
@@ -356,6 +357,9 @@ lostpeer(int dummy)
proxflag = 0;
pswitch(0);
cleanuppeer();
+ if (signo) {
+ errx(1, "lostpeer due to signal %d", signo);
+ }
errno = oerrno;
}
Index: src/usr.bin/ftp/version.h
diff -u src/usr.bin/ftp/version.h:1.88 src/usr.bin/ftp/version.h:1.89
--- src/usr.bin/ftp/version.h:1.88 Wed Feb 26 05:55:27 2020
+++ src/usr.bin/ftp/version.h Mon Jun 8 01:33:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.88 2020/02/26 05:55:27 lukem Exp $ */
+/* $NetBSD: version.h,v 1.89 2020/06/08 01:33:27 lukem Exp $ */
/*-
* Copyright (c) 1999-2020 The NetBSD Foundation, Inc.
@@ -34,5 +34,5 @@
#endif
#ifndef FTP_VERSION
-#define FTP_VERSION "20190622"
+#define FTP_VERSION "20200608"
#endif
CVS commit: src/sys/arch/mips/cavium/dev
Module Name:src Committed By: simonb Date: Mon Jun 8 01:17:05 UTC 2020 Modified Files: src/sys/arch/mips/cavium/dev: octeon_rnm.c Log Message: Fix tyop in a comment. Thanks riastradh@. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/cavium/dev/octeon_rnm.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/mips/cavium/dev/octeon_rnm.c diff -u src/sys/arch/mips/cavium/dev/octeon_rnm.c:1.10 src/sys/arch/mips/cavium/dev/octeon_rnm.c:1.11 --- src/sys/arch/mips/cavium/dev/octeon_rnm.c:1.10 Fri Jun 5 09:18:35 2020 +++ src/sys/arch/mips/cavium/dev/octeon_rnm.c Mon Jun 8 01:17:05 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: octeon_rnm.c,v 1.10 2020/06/05 09:18:35 simonb Exp $ */ +/* $NetBSD: octeon_rnm.c,v 1.11 2020/06/08 01:17:05 simonb Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -99,7 +99,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: octeon_rnm.c,v 1.10 2020/06/05 09:18:35 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: octeon_rnm.c,v 1.11 2020/06/08 01:17:05 simonb Exp $"); #include #include @@ -369,7 +369,7 @@ octrnm_iobdma(struct octrnm_softc *sc, u __SHIFTIN(RNM_IOBDMA_SUBDID, IOBDMA_SUBDID); KASSERT(nwords < 128); /* iobdma address restriction */ - KASSERT(nwords <= CVMSEG_LM_RNM_SIZE); /* size of CVMSEM LM buffer */ + KASSERT(nwords <= CVMSEG_LM_RNM_SIZE); /* size of CVMSEG LM buffer */ octeon_iobdma_write_8(iobdma); OCTEON_SYNCIOBDMA;
CVS commit: src/libexec/httpd
Module Name:src Committed By: fox Date: Sun Jun 7 23:33:02 UTC 2020 Modified Files: src/libexec/httpd: bozohttpd.c Log Message: libexec/httpd: Fix the possible -Werror=stringop-truncation Error was reported when build.sh was run with MKLIBCSANITIZER=yes flag. Reviewed by: kamil@, mrg@ To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/libexec/httpd/bozohttpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/bozohttpd.c diff -u src/libexec/httpd/bozohttpd.c:1.113 src/libexec/httpd/bozohttpd.c:1.114 --- src/libexec/httpd/bozohttpd.c:1.113 Thu Feb 28 09:16:42 2019 +++ src/libexec/httpd/bozohttpd.c Sun Jun 7 23:33:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: bozohttpd.c,v 1.113 2019/02/28 09:16:42 mrg Exp $ */ +/* $NetBSD: bozohttpd.c,v 1.114 2020/06/07 23:33:02 fox Exp $ */ /* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */ @@ -496,7 +496,7 @@ got_proto_09: if (strncasecmp(proto, "HTTP/", 5) != 0) goto bad; - strncpy(majorstr, proto + 5, sizeof majorstr); + strncpy(majorstr, proto + 5, sizeof(majorstr)-1); majorstr[sizeof(majorstr)-1] = 0; minorstr = strchr(majorstr, '.'); if (minorstr == NULL)
CVS commit: src/external/mpl/dhcp/bin/server
Module Name:src
Committed By: fox
Date: Sun Jun 7 23:29:16 UTC 2020
Modified Files:
src/external/mpl/dhcp/bin/server: Makefile
Log Message:
external/mpl/dhcp: Suppress -Werror=stringop-truncation error
This logic correctly uses strncpy(3) to fully initialize a fixed-width field,
and also ensures
NUL-termination on the next line as other users of the field expect.
Add -Werror=stringop-truncation to prevent build failure, when run with
MKSANITIZER=yes.
Error was reported when build.sh was run with MKSANITIZER=yes flag.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/dhcp/bin/server/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/bin/server/Makefile
diff -u src/external/mpl/dhcp/bin/server/Makefile:1.5 src/external/mpl/dhcp/bin/server/Makefile:1.6
--- src/external/mpl/dhcp/bin/server/Makefile:1.5 Sat May 23 00:32:42 2020
+++ src/external/mpl/dhcp/bin/server/Makefile Sun Jun 7 23:29:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/05/23 00:32:42 rin Exp $
+# $NetBSD: Makefile,v 1.6 2020/06/07 23:29:16 fox Exp $
.include
@@ -21,5 +21,6 @@ COPTS.ddns.c +=-Wno-stringop-overflow
COPTS.mdb6.c += ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
COPTS.omapi.c += -Wno-stack-protector
+COPTS.confpars.c+= ${GCC_NO_STRINGOP_TRUNCATION}
.include
CVS commit: src/external/cddl/osnet/usr.bin/ctfmerge
Module Name:src
Committed By: fox
Date: Sun Jun 7 23:26:54 UTC 2020
Modified Files:
src/external/cddl/osnet/usr.bin/ctfmerge: Makefile
Log Message:
external/cddl/osnet: Suppress -Werror=stringop-truncation error
This logic correctly uses strncpy(3) to fully initialize a fixed-width field,
and also ensures
NUL-termination on the next line as other users of the field expect.
Add -Werror=stringop-truncation to prevent build failure, when run with
MKSANITIZER=yes.
Error was reported when build.sh was run with MKSANITIZER=yes flag.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.10 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.11
--- src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.10 Mon May 28 21:05:11 2018
+++ src/external/cddl/osnet/usr.bin/ctfmerge/Makefile Sun Jun 7 23:26:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/05/28 21:05:11 chs Exp $
+# $NetBSD: Makefile,v 1.11 2020/06/07 23:26:54 fox Exp $
# $FreeBSD: head/cddl/usr.bin/ctfmerge/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -36,4 +36,6 @@ LDADD+=-lpthread
DPADD+=${LIBPTHREAD}
.endif
+COPTS.ctfmerge.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include
CVS commit: src/tests/lib/libarchive
Module Name:src
Committed By: fox
Date: Sun Jun 7 23:20:52 UTC 2020
Modified Files:
src/tests/lib/libarchive: Makefile
Log Message:
tests/lib/libarchive: Suppress -Werror=stringop-truncation error
This logic correctly uses strncpy(3) to fully initialize a fixed-width field,
and also ensures
NUL-termination on the next line as other users of the field expect.
Add -Werror=stringop-truncation to prevent build failure, when run with
MKSANITIZER=yes.
Error was reported when build.sh was run with MKSANITIZER=yes flag.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libarchive/Makefile
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/libarchive/Makefile
diff -u src/tests/lib/libarchive/Makefile:1.4 src/tests/lib/libarchive/Makefile:1.5
--- src/tests/lib/libarchive/Makefile:1.4 Sun Jan 19 17:36:57 2020
+++ src/tests/lib/libarchive/Makefile Sun Jun 7 23:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/19 17:36:57 christos Exp $
+# $NetBSD: Makefile,v 1.5 2020/06/07 23:20:52 fox Exp $
NOMAN=
@@ -609,4 +609,5 @@ list.h: ${SRCS.h_libarchive} Makefile
${TOOL_GREP} -v _truncated_filter_ | \
${TOOL_GREP} -v test_compat_pax_libarchive_2x > ${.TARGET}
+COPTS.test_archive_string_conversion.c+= ${GCC_NO_STRINGOP_TRUNCATION}
CVS commit: src/sys/arch/amd64/include
Module Name:src Committed By: christos Date: Sun Jun 7 23:15:51 UTC 2020 Modified Files: src/sys/arch/amd64/include: msan.h Log Message: make this compile. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/include/msan.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/amd64/include/msan.h diff -u src/sys/arch/amd64/include/msan.h:1.3 src/sys/arch/amd64/include/msan.h:1.4 --- src/sys/arch/amd64/include/msan.h:1.3 Sat Apr 25 11:26:16 2020 +++ src/sys/arch/amd64/include/msan.h Sun Jun 7 19:15:51 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: msan.h,v 1.3 2020/04/25 15:26:16 bouyer Exp $ */ +/* $NetBSD: msan.h,v 1.4 2020/06/07 23:15:51 christos Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -142,7 +142,7 @@ kmsan_md_shadow_map_page(vaddr_t va) L2_BASE[pl2_i(va)] = pa | pteflags | PTE_PS | pmap_pg_g; __insn_barrier(); - __builtin_memset(va, 0, NBPD_L2); + __builtin_memset((void *)va, 0, NBPD_L2); return; } pa = __md_palloc();
CVS commit: src/libexec/lfs_cleanerd
Module Name:src
Committed By: fox
Date: Sun Jun 7 23:15:53 UTC 2020
Modified Files:
src/libexec/lfs_cleanerd: Makefile.inc
Log Message:
libexec/lfs_cleanerd: Suppress -Werror=stringop-truncation error
This logic correctly uses strncpy(3) to fully initialize a fixed-width field,
and also ensures
NUL-termination on the next line as other users of the field expect.
Add -Werror=stringop-truncation to prevent build failure, when run with
MKSANITIZER=yes.
Error was reported when build.sh was run with MKSANITIZER=yes flag.
Reviewed by: kamil@, riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/libexec/lfs_cleanerd/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/libexec/lfs_cleanerd/Makefile.inc
diff -u src/libexec/lfs_cleanerd/Makefile.inc:1.6 src/libexec/lfs_cleanerd/Makefile.inc:1.7
--- src/libexec/lfs_cleanerd/Makefile.inc:1.6 Sat Jun 8 21:15:29 2013
+++ src/libexec/lfs_cleanerd/Makefile.inc Sun Jun 7 23:15:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2013/06/08 21:15:29 dholland Exp $
+# $NetBSD: Makefile.inc,v 1.7 2020/06/07 23:15:53 fox Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
WARNS?=3 # XXX: too many sign-compare issues
@@ -11,6 +11,8 @@ SRCS+= bufcache.c vnode.c lfs.c kernelop
.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs ${NETBSDSRCDIR}/sbin/fsck_lfs \
${NETBSDSRCDIR}/libexec/lfs_cleanerd
+COPTS.lfs_cleanerd.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
FSCK_LFS= ${NETBSDSRCDIR}/sbin/fsck_lfs
DPADD+= ${LIBUTIL}
LDADD+= -lutil
CVS commit: src/external/bsd/atf/lib/libatf-c
Module Name:src
Committed By: fox
Date: Sun Jun 7 23:09:34 UTC 2020
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile
Log Message:
external/bsd/atf: Suppress -Werror=stringop-truncation error
This logic correctly uses strncpy(3) to fully initialize a fixed-width field,
and also ensures
NUL-termination on the next line as other users of the field expect.
Add -Werror=stringop-truncation to prevent build failure, when run with
MKSANITIZER=yes.
Error was reported when build.sh was run with MKSANITIZER=yes flag.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/atf/lib/libatf-c/Makefile
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/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.22 src/external/bsd/atf/lib/libatf-c/Makefile:1.23
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.22 Wed Jan 29 22:40:44 2020
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sun Jun 7 23:09:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/01/29 22:40:44 christos Exp $
+# $NetBSD: Makefile,v 1.23 2020/06/07 23:09:34 fox Exp $
NOLINT= # defined
@@ -54,6 +54,7 @@ INCSDIR_atf-c.h=/usr/include
MAN= atf-c-api.3
COPTS.tc.c+= ${${ACTIVE_CC} == "clang" && ${MACHINE_ARCH} == "powerpc":? -O0 :}
+COPTS.fs.c+= ${GCC_NO_STRINGOP_TRUNCATION}
.if ${MKSHARE} != "no"
FILES+= atf-c.pc
CVS commit: src/sbin/tunefs
Module Name:src Committed By: wiz Date: Sun Jun 7 19:35:15 UTC 2020 Modified Files: src/sbin/tunefs: tunefs.8 Log Message: Sort option descriptions. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sbin/tunefs/tunefs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/tunefs/tunefs.8 diff -u src/sbin/tunefs/tunefs.8:1.45 src/sbin/tunefs/tunefs.8:1.46 --- src/sbin/tunefs/tunefs.8:1.45 Sat May 16 18:31:47 2020 +++ src/sbin/tunefs/tunefs.8 Sun Jun 7 19:35:15 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: tunefs.8,v 1.45 2020/05/16 18:31:47 christos Exp $ +.\" $NetBSD: tunefs.8,v 1.46 2020/06/07 19:35:15 wiz Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -69,17 +69,6 @@ will lose anything changed by is ignored when .Fl N is specified. -.It Fl F -Indicates that -.Ar special -is a file system image, rather than a device name or file system mount point. -.Ar special -will be accessed -.Sq as-is . -.It Fl N -Display all the settable options -(after any changes from the tuning options) -but do not cause any of them to be changed. .It Fl a Cm enable | disable Turn on/off the administrative NFSv4 ACL enable flag. .It Fl e Ar maxbpg @@ -97,6 +86,13 @@ more frequently than if they were allowe in a cylinder group before seeking elsewhere. For file systems with exclusively large files, this parameter should be set higher. +.It Fl F +Indicates that +.Ar special +is a file system image, rather than a device name or file system mount point. +.Ar special +will be accessed +.Sq as-is . .It Fl g Ar avgfilesize This specifies the expected average file size. .It Fl h Ar avgfpdir @@ -124,6 +120,10 @@ threshold. Note that if the value is raised above the current usage level, users will be unable to allocate files until enough files have been deleted to get under the higher threshold. +.It Fl N +Display all the settable options +(after any changes from the tuning options) +but do not cause any of them to be changed. .It Fl o Ar optimize_preference The file system can either try to minimize the time spent allocating blocks, or it can attempt to minimize the space
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Jun 7 19:08:12 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #938 - #951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.63 src/doc/CHANGES-9.1:1.1.2.64 --- src/doc/CHANGES-9.1:1.1.2.63 Sun May 31 10:46:21 2020 +++ src/doc/CHANGES-9.1 Sun Jun 7 19:08:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.63 2020/05/31 10:46:21 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.64 2020/06/07 19:08:12 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -2786,3 +2786,103 @@ usr.sbin/bta2dpd/bta2dpd/bta2dpd.c 1.7 Avoid running of the end of the array if a file cannot be opened. [nat, ticket #937] +sys/arch/powerpc/oea/pmap.c 1.96 + + Fix inconsistent KERNEL_LOCK state in pmap for powerpc/oea. + [rin, ticket #938] + +distrib/arc/ramdisk/Makefile 1.28,1.29 +distrib/arc/ramdisk/list 1.24 +sys/arch/arc/arc/arcbios.c 1.18 +sys/arch/arc/conf/GENERIC 1.198 +sys/arch/arc/conf/RAMDISK 1.83 + + Shrink ARC ramdisk to work around ARC BIOS / bootloader + restrictions. + Preserver the curlwp register (t8) accross ARC BIOS calls. + [tsutsui, ticket #939] + +bin/sh/expand.c 1.134-1.137 +bin/sh/expand.h 1.25 + + Fix a few bugs in shell variable expansion. + [kre, ticket #940] + +sys/arch/x86/x86/pmap.c(apply patch) + + Fix Xen dom0 kernel build with options DIAGNOSTIC. + [bouyer, ticket #941] + +external/public-domain/tz/dist/Makefile up to 1.1.1.26 +external/public-domain/tz/dist/NEWS up to 1.1.1.29 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.19 +external/public-domain/tz/dist/africa up to 1.1.1.22 +external/public-domain/tz/dist/asia up to 1.1.1.25 +external/public-domain/tz/dist/backward up to 1.1.1.11 +external/public-domain/tz/dist/backzone up to 1.1.1.18 +external/public-domain/tz/dist/europe up to 1.1.1.26 +external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.13 +external/public-domain/tz/dist/leapseconds up to 1.1.1.15 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.10 +external/public-domain/tz/dist/northamerica up to 1.1.1.25 +external/public-domain/tz/dist/theory.html up to 1.1.1.10 +external/public-domain/tz/dist/version up to 1.1.1.16 +external/public-domain/tz/dist/zone.tab up to 1.1.1.18 +external/public-domain/tz/dist/zone1970.tab up to 1.1.1.20 +doc/3RDPARTY (apply patch) +distrib/sets/lists/base/mi (apply patch) + + Updated tzdata to 2020a. + [kre, ticket #942] + +sys/arch/arm/ti/ti_cpufreq.c 1.3 + + Fix SoC revision detection. + [jmcneill, ticket #943] + +sys/arch/arm/ti/ti_dpll_clock.c 1.3 + + Fix dpll clock setting on am335x. + [jmcneill, ticket #944] + +sys/arch/arm/ti/ti_motg.c 1.2 + + PR 55263: fix handling of vbus errors. + [jmcneill, ticket #945] + +sys/dev/sysmon/sysmon_envsys.c 1.145 + + Do not queue sysmon refresh until the rndsource is attached. + [riastradh, ticket #946] + +sys/arch/arc/stand/boot/Makefile 1.18 + + Explicitly strip debug info before converting boot binaries + to ecoff format. + [tsutsui, ticket #947] + +sys/dev/usb/u3g.c1.41 +sys/dev/usb/ugensa.c1.42 + + PR 55329 and 55330: remove duplicate device entry, use correct + interface indices and skip Direct IP interfaces. + [skrll, ticket #948] + +sys/kern/subr_pcu.c1.22 + + Relax KASSERT() in pcu_discard_all() to allow new LWPs to + gracefully exit when an error occurs in _lwp_create(2). + [thorpej, ticket #949] + +sys/dev/audio/audio.c1.71,1.73-1.75 +sys/dev/audio/audiovar.h 1.12 + + Fix audio suspend/resume. + [isaki, ticket #950] + +sys/arch/arm/include/arm32/param.h 1.30 + + Bump the amount of KMEM allowed to 1/3rd of KVM. + _ARCH_ARM_6 has a split of 2:2 and others have a split of 3:1. + [skrll, ticket #951] +
CVS commit: [netbsd-9] src/sys/arch/arm/include/arm32
Module Name:src Committed By: martin Date: Sun Jun 7 19:06:22 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32 [netbsd-9]: param.h Log Message: Pull up following revision(s) (requested by skrll in ticket #951): sys/arch/arm/include/arm32/param.h: revision 1.30 Bump the amount of KMEM allowed to 1/3rd of KVM. _ARCH_ARM_6 has a split of 2:2 and others have a split of 3:1. Tested by martin@ Thanks To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.27.2.1 src/sys/arch/arm/include/arm32/param.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/arm32/param.h diff -u src/sys/arch/arm/include/arm32/param.h:1.27 src/sys/arch/arm/include/arm32/param.h:1.27.2.1 --- src/sys/arch/arm/include/arm32/param.h:1.27 Wed Jun 19 09:53:39 2019 +++ src/sys/arch/arm/include/arm32/param.h Sun Jun 7 19:06:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.27 2019/06/19 09:53:39 skrll Exp $ */ +/* $NetBSD: param.h,v 1.27.2.1 2020/06/07 19:06:22 martin Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -70,7 +70,12 @@ * logical pages. */ #define NKMEMPAGES_MIN_DEFAULT ((8 * 1024 * 1024) >> PAGE_SHIFT) -#define NKMEMPAGES_MAX_DEFAULT ((128 * 1024 * 1024) >> PAGE_SHIFT) + +#if defined(_ARM_ARCH_6) +#define NKMEMPAGES_MAX_DEFAULT ((768 * 1024 * 1024) >> PAGE_SHIFT) +#else +#define NKMEMPAGES_MAX_DEFAULT ((256 * 1024 * 1024) >> PAGE_SHIFT) +#endif /* Constants used to divide the USPACE area */
CVS commit: [netbsd-9] src/sys/dev/audio
Module Name:src
Committed By: martin
Date: Sun Jun 7 19:04:00 UTC 2020
Modified Files:
src/sys/dev/audio [netbsd-9]: audio.c audiovar.h
Log Message:
Pull up following revision(s) (requested by isaki in ticket #950):
sys/dev/audio/audio.c: revision 1.71
sys/dev/audio/audio.c: revision 1.73
sys/dev/audio/audio.c: revision 1.74
sys/dev/audio/audio.c: revision 1.75
sys/dev/audio/audiovar.h: revision 1.12
audio: Fix logic for resuming when the device is in use.
audio_[r/p]mixer_start should never be called when the device is
marked busy.
Resolves a panic on resume when audio is playing, PR kern/55301
audio: remove comment that is no longer valid
audio: Only restart recording mixer on resume if it's already been started
Fix suspend/resume.
- Revert temporary usage of sc_[pr]busy during suspend. These indicate
whether the mixer needs to be restarted or not.
- Avoid timeout error when about to suspend.
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.15 -r1.28.2.16 src/sys/dev/audio/audio.c
cvs rdiff -u -r1.4.2.3 -r1.4.2.4 src/sys/dev/audio/audiovar.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/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.28.2.15 src/sys/dev/audio/audio.c:1.28.2.16
--- src/sys/dev/audio/audio.c:1.28.2.15 Mon May 18 18:12:24 2020
+++ src/sys/dev/audio/audio.c Sun Jun 7 19:04:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.28.2.15 2020/05/18 18:12:24 martin Exp $ */
+/* $NetBSD: audio.c,v 1.28.2.16 2020/06/07 19:04:00 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.28.2.15 2020/05/18 18:12:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.28.2.16 2020/06/07 19:04:00 martin Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -1561,6 +1561,13 @@ audio_track_waitio(struct audio_softc *s
/* Wait for pending I/O to complete. */
error = cv_timedwait_sig(>mixer->outcv, sc->sc_lock,
mstohz(AUDIO_TIMEOUT));
+ if (sc->sc_suspending) {
+ /* If it's about to suspend, ignore timeout error. */
+ if (error == EWOULDBLOCK) {
+ TRACET(2, track, "timeout (suspending)");
+ return 0;
+ }
+ }
if (sc->sc_dying) {
error = EIO;
}
@@ -7748,15 +7755,17 @@ audio_suspend(device_t dv, const pmf_qua
error = audio_exlock_mutex_enter(sc);
if (error)
return error;
+ sc->sc_suspending = true;
audio_mixer_capture(sc);
- /* Halts mixers but don't clear busy flag for resume */
if (sc->sc_pbusy) {
audio_pmixer_halt(sc);
+ /* Reuse this as need-to-restart flag while suspending */
sc->sc_pbusy = true;
}
if (sc->sc_rbusy) {
audio_rmixer_halt(sc);
+ /* Reuse this as need-to-restart flag while suspending */
sc->sc_rbusy = true;
}
@@ -7779,15 +7788,28 @@ audio_resume(device_t dv, const pmf_qual
if (error)
return error;
+ sc->sc_suspending = false;
audio_mixer_restore(sc);
/* XXX ? */
AUDIO_INITINFO();
audio_hw_setinfo(sc, , NULL);
- if (sc->sc_pbusy)
+ /*
+ * During from suspend to resume here, sc_[pr]busy is used as
+ * need-to-restart flag temporarily. After this point,
+ * sc_[pr]busy is returned to its original usage (busy flag).
+ * And note that sc_[pr]busy must be false to call [pr]mixer_start().
+ */
+ if (sc->sc_pbusy) {
+ /* pmixer_start() requires pbusy is false */
+ sc->sc_pbusy = false;
audio_pmixer_start(sc, true);
- if (sc->sc_rbusy)
+ }
+ if (sc->sc_rbusy) {
+ /* rmixer_start() requires rbusy is false */
+ sc->sc_rbusy = false;
audio_rmixer_start(sc);
+ }
audio_exlock_mutex_exit(sc);
Index: src/sys/dev/audio/audiovar.h
diff -u src/sys/dev/audio/audiovar.h:1.4.2.3 src/sys/dev/audio/audiovar.h:1.4.2.4
--- src/sys/dev/audio/audiovar.h:1.4.2.3 Thu Apr 30 16:05:18 2020
+++ src/sys/dev/audio/audiovar.h Sun Jun 7 19:04:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audiovar.h,v 1.4.2.3 2020/04/30 16:05:18 martin Exp $ */
+/* $NetBSD: audiovar.h,v 1.4.2.4 2020/06/07 19:04:00 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -243,6 +243,12 @@ struct audio_softc {
bool sc_dying;
/*
+ * Indicates that about to suspend.
+ * Must be protected by sc_lock.
+ */
+ bool sc_suspending;
+
+ /*
* If multiuser is false, other users who have different euid
* than the first user cannot open this device.
* Must be protected by sc_exlock.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Jun 7 17:09:33 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1554 - #1556 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-8.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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.12 src/doc/CHANGES-8.3:1.1.2.13 --- src/doc/CHANGES-8.3:1.1.2.12 Sun May 31 10:48:27 2020 +++ src/doc/CHANGES-8.3 Sun Jun 7 17:09:33 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.12 2020/05/31 10:48:27 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.13 2020/06/07 17:09:33 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -168,3 +168,19 @@ usr.sbin/bta2dpd/bta2dpd/bta2dpd.c 1.7 Avoid running of the end of the array if a file cannot be opened. [nat, ticket #1553] +sys/arch/powerpc/oea/pmap.c 1.96 + + Fix inconsistent KERNEL_LOCK state in pmap for powerpc/oea. + [rin, ticket #1554] + +sys/dev/sysmon/sysmon_envsys.c 1.145 + + Do not queue sysmon refresh until the rndsource is attached. + [riastradh, ticket #1555] + +sys/kern/subr_pcu.c1.22 + + Relax KASSERT() in pcu_discard_all() to allow new LWPs to + gracefully exit when an error occurs in _lwp_create(2). + [thorpej, ticket #1556] +
CVS commit: [netbsd-8] src/sys/kern
Module Name:src
Committed By: martin
Date: Sun Jun 7 17:08:12 UTC 2020
Modified Files:
src/sys/kern [netbsd-8]: subr_pcu.c
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #949):
sys/kern/subr_pcu.c: revision 1.22
Relax the KASSERT() in pcu_discard_all() to allow non-curlwp if it is
in LSIDL state, which can happen if the new LWP is exiting before it's
ever run, e.g. if an error occurs in _lwp_create(2).
To generate a diff of this commit:
cvs rdiff -u -r1.20.6.1 -r1.20.6.2 src/sys/kern/subr_pcu.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/subr_pcu.c
diff -u src/sys/kern/subr_pcu.c:1.20.6.1 src/sys/kern/subr_pcu.c:1.20.6.2
--- src/sys/kern/subr_pcu.c:1.20.6.1 Tue Oct 24 09:14:59 2017
+++ src/sys/kern/subr_pcu.c Sun Jun 7 17:08:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pcu.c,v 1.20.6.1 2017/10/24 09:14:59 snj Exp $ */
+/* $NetBSD: subr_pcu.c,v 1.20.6.2 2020/06/07 17:08:12 martin Exp $ */
/*-
* Copyright (c) 2011, 2014 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_pcu.c,v 1.20.6.1 2017/10/24 09:14:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pcu.c,v 1.20.6.2 2020/06/07 17:08:12 martin Exp $");
#include
#include
@@ -130,7 +130,12 @@ pcu_discard_all(lwp_t *l)
{
const uint32_t pcu_valid = l->l_pcu_valid;
- KASSERT(l == curlwp || ((l->l_flag & LW_SYSTEM) && pcu_valid == 0));
+ /*
+ * The check for LSIDL here is to catch the case where the LWP exits
+ * due to an error in the LWP creation path before it ever runs.
+ */
+ KASSERT(l == curlwp || l->l_stat == LSIDL ||
+ ((l->l_flag & LW_SYSTEM) && pcu_valid == 0));
if (__predict_true(pcu_valid == 0)) {
/* PCUs are not in use. */
CVS commit: [netbsd-9] src/sys/kern
Module Name:src
Committed By: martin
Date: Sun Jun 7 17:07:07 UTC 2020
Modified Files:
src/sys/kern [netbsd-9]: subr_pcu.c
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #949):
sys/kern/subr_pcu.c: revision 1.22
Relax the KASSERT() in pcu_discard_all() to allow non-curlwp if it is
in LSIDL state, which can happen if the new LWP is exiting before it's
ever run, e.g. if an error occurs in _lwp_create(2).
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/kern/subr_pcu.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/subr_pcu.c
diff -u src/sys/kern/subr_pcu.c:1.21 src/sys/kern/subr_pcu.c:1.21.8.1
--- src/sys/kern/subr_pcu.c:1.21 Mon Oct 16 15:03:57 2017
+++ src/sys/kern/subr_pcu.c Sun Jun 7 17:07:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pcu.c,v 1.21 2017/10/16 15:03:57 bouyer Exp $ */
+/* $NetBSD: subr_pcu.c,v 1.21.8.1 2020/06/07 17:07:07 martin Exp $ */
/*-
* Copyright (c) 2011, 2014 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_pcu.c,v 1.21 2017/10/16 15:03:57 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pcu.c,v 1.21.8.1 2020/06/07 17:07:07 martin Exp $");
#include
#include
@@ -130,7 +130,12 @@ pcu_discard_all(lwp_t *l)
{
const uint32_t pcu_valid = l->l_pcu_valid;
- KASSERT(l == curlwp || ((l->l_flag & LW_SYSTEM) && pcu_valid == 0));
+ /*
+ * The check for LSIDL here is to catch the case where the LWP exits
+ * due to an error in the LWP creation path before it ever runs.
+ */
+ KASSERT(l == curlwp || l->l_stat == LSIDL ||
+ ((l->l_flag & LW_SYSTEM) && pcu_valid == 0));
if (__predict_true(pcu_valid == 0)) {
/* PCUs are not in use. */
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sun Jun 7 17:03:11 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-9]: u3g.c ugensa.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #948):
sys/dev/usb/ugensa.c: revision 1.42
sys/dev/usb/u3g.c: revision 1.41
Remove duplicated USB_VENDOR_SIERRA USB_PRODUCT_SIERRA_USB305 entry
PR kern/55329
Replace calls to usbd_device2interface_handle in u3g_match() and
u3g_attach() with the interface already passed in uiaa->uiaa_iface and
store the interface in sc->sc_iface for later use by u3g_open()/
Also skip Direct IP interfaces in u3g_match() to avoid potential side
effects.
PR kern/55330
To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/dev/usb/ugensa.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/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.37.2.1 src/sys/dev/usb/u3g.c:1.37.2.2
--- src/sys/dev/usb/u3g.c:1.37.2.1 Thu Feb 27 17:22:56 2020
+++ src/sys/dev/usb/u3g.c Sun Jun 7 17:03:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.37.2.1 2020/02/27 17:22:56 martin Exp $ */
+/* $NetBSD: u3g.c,v 1.37.2.2 2020/06/07 17:03:11 martin Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.37.2.1 2020/02/27 17:22:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.37.2.2 2020/06/07 17:03:11 martin Exp $");
#include
#include
@@ -114,6 +114,7 @@ struct u3g_softc {
struct usbd_device * sc_udev;
bool sc_dying; /* We're going away */
int sc_ifaceno; /* Device interface number */
+ struct usbd_interface *sc_iface; /* Device interface */
struct u3g_com {
device_t c_dev; /* Child ucom(4) handle */
@@ -271,21 +272,12 @@ static int
u3g_match(device_t parent, cfdata_t match, void *aux)
{
struct usbif_attach_arg *uiaa = aux;
- struct usbd_interface *iface;
+ struct usbd_interface *iface = uiaa->uiaa_iface;
usb_interface_descriptor_t *id;
- usbd_status error;
if (!usb_lookup(u3g_devs, uiaa->uiaa_vendor, uiaa->uiaa_product))
return UMATCH_NONE;
- error = usbd_device2interface_handle(uiaa->uiaa_device,
- uiaa->uiaa_ifaceno, );
- if (error) {
- printf("u3g_match: failed to get interface, err=%s\n",
- usbd_errstr(error));
- return UMATCH_NONE;
- }
-
id = usbd_get_interface_descriptor(iface);
if (id == NULL) {
printf("u3g_match: failed to get interface descriptor\n");
@@ -302,6 +294,16 @@ u3g_match(device_t parent, cfdata_t matc
return UMATCH_NONE;
/*
+ * Sierra Wireless modems use the vendor-specific class also for
+ * Direct IP or QMI interfaces, which we should avoid attaching to.
+ */
+ if (uiaa->uiaa_vendor == USB_VENDOR_SIERRA &&
+ id->bInterfaceClass == UICLASS_VENDOR &&
+ uiaa->uiaa_product == USB_PRODUCT_SIERRA_USB305 &&
+ uiaa->uiaa_ifaceno >= 7)
+ return UMATCH_NONE;
+
+ /*
* 3G modems generally report vendor-specific class
*
* XXX: this may be too generalised.
@@ -316,7 +318,7 @@ u3g_attach(device_t parent, device_t sel
struct u3g_softc *sc = device_private(self);
struct usbif_attach_arg *uiaa = aux;
struct usbd_device *dev = uiaa->uiaa_device;
- struct usbd_interface *iface;
+ struct usbd_interface *iface = uiaa->uiaa_iface;
usb_interface_descriptor_t *id;
usb_endpoint_descriptor_t *ed;
struct ucom_attach_args ucaa;
@@ -330,13 +332,6 @@ u3g_attach(device_t parent, device_t sel
sc->sc_dying = false;
sc->sc_udev = dev;
- error = usbd_device2interface_handle(dev, uiaa->uiaa_ifaceno, );
- if (error) {
- aprint_error_dev(self, "failed to get interface, err=%s\n",
- usbd_errstr(error));
- return;
- }
-
id = usbd_get_interface_descriptor(iface);
ucaa.ucaa_info = "3G Modem";
@@ -352,6 +347,7 @@ u3g_attach(device_t parent, device_t sel
ucaa.ucaa_bulkin = ucaa.ucaa_bulkout = -1;
sc->sc_ifaceno = uiaa->uiaa_ifaceno;
+ sc->sc_iface = uiaa->uiaa_iface;
intr_address = -1;
intr_size = 0;
@@ -578,7 +574,6 @@ u3g_open(void *arg, int portno)
usb_device_request_t req;
usb_endpoint_descriptor_t *ed;
usb_interface_descriptor_t *id;
- struct usbd_interface *ih;
usbd_status err;
struct u3g_com *com = >sc_com[portno];
int i, nin;
@@ -586,14 +581,10 @@ u3g_open(void *arg, int portno)
if (sc->sc_dying)
return EIO;
- err = usbd_device2interface_handle(sc->sc_udev, sc->sc_ifaceno, );
- if (err)
- return EIO;
-
- id = usbd_get_interface_descriptor(ih);
+ id = usbd_get_interface_descriptor(sc->sc_iface);
for (nin = i = 0; i < id->bNumEndpoints; i++) {
- ed = usbd_interface2endpoint_descriptor(ih, i);
+ ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
if (ed == NULL)
return EIO;
Index: src/sys/dev/usb/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.39 src/sys/dev/usb/ugensa.c:1.39.2.1
---
CVS commit: [netbsd-9] src/sys/arch/arc/stand/boot
Module Name:src
Committed By: martin
Date: Sun Jun 7 16:59:04 UTC 2020
Modified Files:
src/sys/arch/arc/stand/boot [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #947):
sys/arch/arc/stand/boot/Makefile: revision 1.18
Explicitly strip debug info on calling objdump for ecoff boot binaries.
As noted by martin@ on tech-toolchain@, release binaries are built
with MKDEBUG=yes so standalone binaries should explicitly remove
debug info generated by -g option.
https://mail-index.netbsd.org/tech-toolchain/2020/06/02/msg003809.html
Should be pulled up to netbsd-9.
(ARC BIOS gets confused by debug info sections in ecoff binaries
and boot binary in 9.0 doesn't work)
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.18.1 src/sys/arch/arc/stand/boot/Makefile
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/arc/stand/boot/Makefile
diff -u src/sys/arch/arc/stand/boot/Makefile:1.17 src/sys/arch/arc/stand/boot/Makefile:1.17.18.1
--- src/sys/arch/arc/stand/boot/Makefile:1.17 Sat Apr 8 19:53:20 2017
+++ src/sys/arch/arc/stand/boot/Makefile Sun Jun 7 16:59:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/04/08 19:53:20 christos Exp $
+# $NetBSD: Makefile,v 1.17.18.1 2020/06/07 16:59:04 martin Exp $
.include
@@ -62,7 +62,7 @@ ${PROG}: ${OBJS} ${LIBS}
-e start -o ${PROG}.elf ${OBJS} ${LIBS}
@${SIZE} ${PROG}.elf
${OBJCOPY} --impure -O ecoff-littlemips \
- -R .pdr -R .mdebug.abi32 -R .comment -R .ident \
+ -R .pdr -R .mdebug.abi32 -R .comment -R .ident --strip-debug \
${PROG}.elf ${.TARGET}
CLEANFILES+= ${PROG}.elf ${PROG}.map
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sun Jun 7 16:46:01 UTC 2020 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Tickets #1732 and #1733 To generate a diff of this commit: cvs rdiff -u -r1.1.2.84 -r1.1.2.85 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.84 src/doc/CHANGES-7.3:1.1.2.85 --- src/doc/CHANGES-7.3:1.1.2.84 Thu May 7 12:09:26 2020 +++ src/doc/CHANGES-7.3 Sun Jun 7 16:46:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.84 2020/05/07 12:09:26 sborrill Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.85 2020/06/07 16:46:01 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -857,3 +857,13 @@ bin/rcp/rcp.c 1.50 further files or directories to be ignored or corrupted. [aymeric, ticket #1731] +sys/arch/powerpc/oea/pmap.c 1.96 + + Fix inconsistent KERNEL_LOCK state in pmap for powerpc/oea. + [rin, ticket #1732] + +sys/dev/sysmon/sysmon_envsys.c 1.145 + + Do not queue sysmon refresh until the rndsource is attached. + [riastradh, ticket #1733] +
CVS commit: [netbsd-7] src/sys/dev/sysmon
Module Name:src
Committed By: martin
Date: Sun Jun 7 16:43:40 UTC 2020
Modified Files:
src/sys/dev/sysmon [netbsd-7]: sysmon_envsys.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1733):
sys/dev/sysmon/sysmon_envsys.c: revision 1.145
Don't queue sysmon refresh until the rndsource is attached.
Using the rndsource, as refreshing the sensors will do, is not
allowed until _after_ rnd_source_attach.
XXX pullup-7
XXX pullup-8
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.127.2.3 -r1.127.2.4 src/sys/dev/sysmon/sysmon_envsys.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/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.127.2.3 src/sys/dev/sysmon/sysmon_envsys.c:1.127.2.4
--- src/sys/dev/sysmon/sysmon_envsys.c:1.127.2.3 Tue Oct 24 09:25:26 2017
+++ src/sys/dev/sysmon/sysmon_envsys.c Sun Jun 7 16:43:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.127.2.3 2017/10/24 09:25:26 snj Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.127.2.4 2020/06/07 16:43:40 martin Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.127.2.3 2017/10/24 09:25:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.127.2.4 2020/06/07 16:43:40 martin Exp $");
#include
#include
@@ -765,16 +765,6 @@ out:
nevent = 0;
sysmon_task_queue_init();
- if (sme->sme_flags & SME_INIT_REFRESH) {
- sysmon_task_queue_sched(0, sme_initial_refresh, sme);
- DPRINTF(("%s: scheduled initial refresh for '%s'\n",
-__func__, sme->sme_name));
- }
- SLIST_FOREACH(evdv, _evdrv_list, evdrv_head) {
- sysmon_task_queue_sched(0,
- sme_event_drvadd, evdv->evdrv);
- nevent++;
- }
/*
* Hook the sensor into rnd(4) entropy pool if requested
*/
@@ -830,6 +820,17 @@ out:
rnd_type, rnd_flag);
}
}
+
+ if (sme->sme_flags & SME_INIT_REFRESH) {
+ sysmon_task_queue_sched(0, sme_initial_refresh, sme);
+ DPRINTF(("%s: scheduled initial refresh for '%s'\n",
+__func__, sme->sme_name));
+ }
+ SLIST_FOREACH(evdv, _evdrv_list, evdrv_head) {
+ sysmon_task_queue_sched(0,
+ sme_event_drvadd, evdv->evdrv);
+ nevent++;
+ }
DPRINTF(("%s: driver '%s' registered (nsens=%d nevent=%d)\n",
__func__, sme->sme_name, sme->sme_nsensors, nevent));
}
CVS commit: [netbsd-8] src/sys/dev/sysmon
Module Name:src
Committed By: martin
Date: Sun Jun 7 16:41:24 UTC 2020
Modified Files:
src/sys/dev/sysmon [netbsd-8]: sysmon_envsys.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1555):
sys/dev/sysmon/sysmon_envsys.c: revision 1.145
Don't queue sysmon refresh until the rndsource is attached.
Using the rndsource, as refreshing the sensors will do, is not
allowed until _after_ rnd_source_attach.
XXX pullup-7
XXX pullup-8
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.139.10.1 -r1.139.10.2 src/sys/dev/sysmon/sysmon_envsys.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/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.139.10.1 src/sys/dev/sysmon/sysmon_envsys.c:1.139.10.2
--- src/sys/dev/sysmon/sysmon_envsys.c:1.139.10.1 Sat Sep 23 17:22:48 2017
+++ src/sys/dev/sysmon/sysmon_envsys.c Sun Jun 7 16:41:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.139.10.1 2017/09/23 17:22:48 snj Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.139.10.2 2020/06/07 16:41:24 martin Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.139.10.1 2017/09/23 17:22:48 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.139.10.2 2020/06/07 16:41:24 martin Exp $");
#include
#include
@@ -824,16 +824,6 @@ out:
if (error == 0) {
nevent = 0;
- if (sme->sme_flags & SME_INIT_REFRESH) {
- sysmon_task_queue_sched(0, sme_initial_refresh, sme);
- DPRINTF(("%s: scheduled initial refresh for '%s'\n",
-__func__, sme->sme_name));
- }
- SLIST_FOREACH(evdv, _evdrv_list, evdrv_head) {
- sysmon_task_queue_sched(0,
- sme_event_drvadd, evdv->evdrv);
- nevent++;
- }
/*
* Hook the sensor into rnd(4) entropy pool if requested
*/
@@ -889,6 +879,17 @@ out:
rnd_type, rnd_flag);
}
}
+
+ if (sme->sme_flags & SME_INIT_REFRESH) {
+ sysmon_task_queue_sched(0, sme_initial_refresh, sme);
+ DPRINTF(("%s: scheduled initial refresh for '%s'\n",
+__func__, sme->sme_name));
+ }
+ SLIST_FOREACH(evdv, _evdrv_list, evdrv_head) {
+ sysmon_task_queue_sched(0,
+ sme_event_drvadd, evdv->evdrv);
+ nevent++;
+ }
DPRINTF(("%s: driver '%s' registered (nsens=%d nevent=%d)\n",
__func__, sme->sme_name, sme->sme_nsensors, nevent));
}
CVS commit: [netbsd-9] src/sys/dev/sysmon
Module Name:src
Committed By: martin
Date: Sun Jun 7 16:40:00 UTC 2020
Modified Files:
src/sys/dev/sysmon [netbsd-9]: sysmon_envsys.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #946):
sys/dev/sysmon/sysmon_envsys.c: revision 1.145
Don't queue sysmon refresh until the rndsource is attached.
Using the rndsource, as refreshing the sensors will do, is not
allowed until _after_ rnd_source_attach.
XXX pullup-7
XXX pullup-8
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.144.4.1 src/sys/dev/sysmon/sysmon_envsys.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/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.144 src/sys/dev/sysmon/sysmon_envsys.c:1.144.4.1
--- src/sys/dev/sysmon/sysmon_envsys.c:1.144 Tue Mar 26 15:50:23 2019
+++ src/sys/dev/sysmon/sysmon_envsys.c Sun Jun 7 16:40:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.144 2019/03/26 15:50:23 bad Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.144.4.1 2020/06/07 16:40:00 martin Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.144 2019/03/26 15:50:23 bad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.144.4.1 2020/06/07 16:40:00 martin Exp $");
#include
#include
@@ -824,16 +824,6 @@ out:
if (error == 0) {
nevent = 0;
- if (sme->sme_flags & SME_INIT_REFRESH) {
- sysmon_task_queue_sched(0, sme_initial_refresh, sme);
- DPRINTF(("%s: scheduled initial refresh for '%s'\n",
-__func__, sme->sme_name));
- }
- SLIST_FOREACH(evdv, _evdrv_list, evdrv_head) {
- sysmon_task_queue_sched(0,
- sme_event_drvadd, evdv->evdrv);
- nevent++;
- }
/*
* Hook the sensor into rnd(4) entropy pool if requested
*/
@@ -889,6 +879,17 @@ out:
rnd_type, rnd_flag);
}
}
+
+ if (sme->sme_flags & SME_INIT_REFRESH) {
+ sysmon_task_queue_sched(0, sme_initial_refresh, sme);
+ DPRINTF(("%s: scheduled initial refresh for '%s'\n",
+__func__, sme->sme_name));
+ }
+ SLIST_FOREACH(evdv, _evdrv_list, evdrv_head) {
+ sysmon_task_queue_sched(0,
+ sme_event_drvadd, evdv->evdrv);
+ nevent++;
+ }
DPRINTF(("%s: driver '%s' registered (nsens=%d nevent=%d)\n",
__func__, sme->sme_name, sme->sme_nsensors, nevent));
}
CVS commit: [netbsd-9] src/sys/arch/arm/ti
Module Name:src
Committed By: martin
Date: Sun Jun 7 16:37:53 UTC 2020
Modified Files:
src/sys/arch/arm/ti [netbsd-9]: ti_motg.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #945):
sys/arch/arm/ti/ti_motg.c: revision 1.2
PR# port-evbarm/55263: BeagleBone Black too many interrupts on CPU when
using 5V DC power cable
Handle vbus status change events, and don't busy spin in the hard intr
handler when we see a vbus error (this will always be set when VBUS is not
present).
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/ti/ti_motg.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/arm/ti/ti_motg.c
diff -u src/sys/arch/arm/ti/ti_motg.c:1.1.2.2 src/sys/arch/arm/ti/ti_motg.c:1.1.2.3
--- src/sys/arch/arm/ti/ti_motg.c:1.1.2.2 Wed Nov 27 13:46:44 2019
+++ src/sys/arch/arm/ti/ti_motg.c Sun Jun 7 16:37:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_motg.c,v 1.1.2.2 2019/11/27 13:46:44 martin Exp $ */
+/* $NetBSD: ti_motg.c,v 1.1.2.3 2020/06/07 16:37:53 martin Exp $ */
/*
* Copyright (c) 2013 Manuel Bouyer. All rights reserved.
*
@@ -24,7 +24,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ti_motg.c,v 1.1.2.2 2019/11/27 13:46:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_motg.c,v 1.1.2.3 2020/06/07 16:37:53 martin Exp $");
#include
#include
@@ -187,8 +187,7 @@ ti_motg_intr(void *v)
{
struct ti_motg_softc *sc = v;
uint32_t stat, stat0, stat1;
- int rv = 0;
- int i;
+ int rv;
MOTGHIST_FUNC(); MOTGHIST_CALLED();
@@ -198,34 +197,18 @@ ti_motg_intr(void *v)
stat1 = TIOTG_USBC_READ4(sc, USBCTRL_IRQ_STAT1);
DPRINTF("USB %jd 0x%jx 0x%jx stat %jd",
sc->sc_ctrlport, stat0, stat1, stat);
- /* try to deal with vbus errors */
- if (stat1 & MUSB2_MASK_IVBUSERR ) {
- stat1 &= ~MUSB2_MASK_IVBUSERR;
- for (i = 0; i < 1000; i++) {
- TIOTG_USBC_WRITE4(sc, USBCTRL_IRQ_STAT1,
- MUSB2_MASK_IVBUSERR);
- motg_intr_vbus(>sc_motg, stat & 0x1);
- delay(1000);
- stat = TIOTG_USBC_READ4(sc, USBCTRL_STAT);
- if (stat & 0x1)
-break;
- }
- }
+
if (stat0) {
TIOTG_USBC_WRITE4(sc, USBCTRL_IRQ_STAT0, stat0);
}
if (stat1) {
TIOTG_USBC_WRITE4(sc, USBCTRL_IRQ_STAT1, stat1);
}
- if ((stat & 0x1) == 0) {
- mutex_spin_exit(>sc_motg.sc_intr_lock);
- aprint_error_dev(sc->sc_motg.sc_dev, ": vbus error\n");
- return 1;
- }
- if (stat0 != 0 || stat1 != 0) {
- rv = motg_intr(>sc_motg, ((stat0 >> 16) & 0x),
- stat0 & 0x, stat1 & 0xff);
+ if (stat1 & USBCTRL_IRQ_STAT1_DRVVBUS) {
+ motg_intr_vbus(>sc_motg, stat & 0x1);
}
+ rv = motg_intr(>sc_motg, ((stat0 >> 16) & 0x),
+ stat0 & 0x, stat1 & 0xff);
mutex_spin_exit(>sc_motg.sc_intr_lock);
return rv;
}
CVS commit: src/games/fortune/datfiles
Module Name:src
Committed By: leot
Date: Sun Jun 7 15:41:03 UTC 2020
Modified Files:
src/games/fortune/datfiles: netbsd-tips
Log Message:
Recommend using `pkg_admin {fetch-pkg-vulnerabilities,audit}' instead of
{download-vulnerability-list,audit-packages}.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/games/fortune/datfiles/netbsd-tips
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/datfiles/netbsd-tips
diff -u src/games/fortune/datfiles/netbsd-tips:1.7 src/games/fortune/datfiles/netbsd-tips:1.8
--- src/games/fortune/datfiles/netbsd-tips:1.7 Sun Jun 7 15:37:04 2020
+++ src/games/fortune/datfiles/netbsd-tips Sun Jun 7 15:41:03 2020
@@ -35,11 +35,11 @@ You can view your non-default Postfix se
To report about installed packages with known vulnerabilities,
fetch the latest pkg-vulnerabilities file as the superuser with:
- download-vulnerability-list
+ pkg_admin fetch-pkg-vulnerabilities
And then run:
- audit-packages
+ pkg_admin audit
%
The following shows an example of temporarily adding 10MB more swap
space for virtual memory:
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: leot Date: Sun Jun 7 15:37:04 UTC 2020 Modified Files: src/games/fortune/datfiles: netbsd-tips Log Message: Properly quote printf string Noticed by Ottavio Caruso on #netbsd@Freenode, thanks! To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/games/fortune/datfiles/netbsd-tips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/netbsd-tips diff -u src/games/fortune/datfiles/netbsd-tips:1.6 src/games/fortune/datfiles/netbsd-tips:1.7 --- src/games/fortune/datfiles/netbsd-tips:1.6 Sun Sep 2 16:08:12 2018 +++ src/games/fortune/datfiles/netbsd-tips Sun Jun 7 15:37:04 2020 @@ -51,7 +51,7 @@ space for virtual memory: If your console ever gets broken, you can try resetting it to its initial state with: - printf "\033c + printf "\033c" % If you installed a package, but don't know what the software is called or what executables to run, use pkg_info with the -L switch
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Sun Jun 7 15:19:05 UTC 2020
Modified Files:
src/sys/kern: uipc_socket.c
Log Message:
Fix bohr bug triggered only once by syzkaller 2,5 months ago.
In sockopt_alloc(), 'sopt' may already have been initialized with
'sopt->sopt_data = sopt->sopt_buf'. If the allocation fails, we
end up with 'sopt->sopt_data = NULL', and later try to free this
NULL pointer in sockopt_destroy().
Fix that by not modifying 'sopt_data' if the allocation failed.
Difficult to reproduce in normal times, but fault(4) makes it
easy.
Reported-by: syzbot+380cb5d518742f063...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.290 src/sys/kern/uipc_socket.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/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.289 src/sys/kern/uipc_socket.c:1.290
--- src/sys/kern/uipc_socket.c:1.289 Sun Apr 26 14:21:14 2020
+++ src/sys/kern/uipc_socket.c Sun Jun 7 15:19:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.289 2020/04/26 14:21:14 jakllsch Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.290 2020/06/07 15:19:05 maxv Exp $ */
/*
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.289 2020/04/26 14:21:14 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.290 2020/06/07 15:19:05 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2039,13 +2039,15 @@ sogetopt(struct socket *so, struct socko
static int
sockopt_alloc(struct sockopt *sopt, size_t len, km_flag_t kmflag)
{
+ void *data;
KASSERT(sopt->sopt_size == 0);
if (len > sizeof(sopt->sopt_buf)) {
- sopt->sopt_data = kmem_zalloc(len, kmflag);
- if (sopt->sopt_data == NULL)
+ data = kmem_zalloc(len, kmflag);
+ if (data == NULL)
return ENOMEM;
+ sopt->sopt_data = data;
} else
sopt->sopt_data = sopt->sopt_buf;
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: thorpej Date: Sun Jun 7 14:55:13 UTC 2020 Modified Files: src/distrib/sets/lists/comp: mi Log Message: One more libprop-related cat pages fixup. To generate a diff of this commit: cvs rdiff -u -r1.2332 -r1.2333 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2332 src/distrib/sets/lists/comp/mi:1.2333 --- src/distrib/sets/lists/comp/mi:1.2332 Sat Jun 6 21:25:59 2020 +++ src/distrib/sets/lists/comp/mi Sun Jun 7 14:55:13 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2332 2020/06/06 21:25:59 thorpej Exp $ +# $NetBSD: mi,v 1.2333 2020/06/07 14:55:13 thorpej Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -9175,7 +9175,7 @@ ./usr/share/man/cat3/prop_dictionary_get.0 comp-c-catman .cat ./usr/share/man/cat3/prop_dictionary_get_bool.0 comp-c-catman .cat ./usr/share/man/cat3/prop_dictionary_get_cstring.0 comp-obsolete obsolete -./usr/share/man/cat3/prop_dictionary_get_cstring_nocopy.0 comp-c-catman .cat +./usr/share/man/cat3/prop_dictionary_get_cstring_nocopy.0 comp-obsolete obsolete ./usr/share/man/cat3/prop_dictionary_get_int.0 comp-c-catman .cat ./usr/share/man/cat3/prop_dictionary_get_int16.0 comp-c-catman .cat ./usr/share/man/cat3/prop_dictionary_get_int32.0 comp-c-catman .cat
CVS commit: [netbsd-9] src/sys/arch/arm/ti
Module Name:src Committed By: martin Date: Sun Jun 7 13:28:03 UTC 2020 Modified Files: src/sys/arch/arm/ti [netbsd-9]: ti_dpll_clock.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #944): sys/arch/arm/ti/ti_dpll_clock.c: revision 1.3 Fix dpll clock setting on am335x To generate a diff of this commit: cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/arm/ti/ti_dpll_clock.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/arm/ti/ti_dpll_clock.c diff -u src/sys/arch/arm/ti/ti_dpll_clock.c:1.2.2.2 src/sys/arch/arm/ti/ti_dpll_clock.c:1.2.2.3 --- src/sys/arch/arm/ti/ti_dpll_clock.c:1.2.2.2 Wed Nov 27 13:46:44 2019 +++ src/sys/arch/arm/ti/ti_dpll_clock.c Sun Jun 7 13:28:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ti_dpll_clock.c,v 1.2.2.2 2019/11/27 13:46:44 martin Exp $ */ +/* $NetBSD: ti_dpll_clock.c,v 1.2.2.3 2020/06/07 13:28:02 martin Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ti_dpll_clock.c,v 1.2.2.2 2019/11/27 13:46:44 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ti_dpll_clock.c,v 1.2.2.3 2020/06/07 13:28:02 martin Exp $"); #include #include @@ -267,7 +267,7 @@ am3_dpll_clock_set_rate(void *priv, stru control |= __SHIFTIN(AM3_DPLL_EN_NM_BYPASS, AM3_DPLL_EN); WR4(sc, REG_CONTROL, control); - while ((RD4(sc, REG_IDLEST) & AM3_ST_MN_BYPASS) != 0) + while (RD4(sc, REG_IDLEST) != AM3_ST_MN_BYPASS) ; mult_div1 = __SHIFTIN(mult, DPLL_MULT); @@ -278,7 +278,7 @@ am3_dpll_clock_set_rate(void *priv, stru control |= __SHIFTIN(AM3_DPLL_EN_LOCK, AM3_DPLL_EN); WR4(sc, REG_CONTROL, control); - while ((RD4(sc, REG_IDLEST) & AM3_ST_DPLL_CLK) != 0) + while (RD4(sc, REG_IDLEST) != AM3_ST_DPLL_CLK) ; return 0;
CVS commit: [netbsd-9] src/sys/arch/arm/ti
Module Name:src Committed By: martin Date: Sun Jun 7 13:20:01 UTC 2020 Modified Files: src/sys/arch/arm/ti [netbsd-9]: ti_cpufreq.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #943): sys/arch/arm/ti/ti_cpufreq.c: revision 1.3 Fix SoC revision detection. BeagleBone Black reports 1GHz as a supported frequency again. To generate a diff of this commit: cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/arm/ti/ti_cpufreq.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/arm/ti/ti_cpufreq.c diff -u src/sys/arch/arm/ti/ti_cpufreq.c:1.2.2.2 src/sys/arch/arm/ti/ti_cpufreq.c:1.2.2.3 --- src/sys/arch/arm/ti/ti_cpufreq.c:1.2.2.2 Wed Nov 27 13:46:44 2019 +++ src/sys/arch/arm/ti/ti_cpufreq.c Sun Jun 7 13:20:01 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ti_cpufreq.c,v 1.2.2.2 2019/11/27 13:46:44 martin Exp $ */ +/* $NetBSD: ti_cpufreq.c,v 1.2.2.3 2020/06/07 13:20:01 martin Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -29,7 +29,7 @@ #include "opt_soc.h" #include -__KERNEL_RCSID(0, "$NetBSD: ti_cpufreq.c,v 1.2.2.2 2019/11/27 13:46:44 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ti_cpufreq.c,v 1.2.2.3 2020/06/07 13:20:01 martin Exp $"); #include #include @@ -62,7 +62,7 @@ am33xx_opp_supported(const int opp_table int len; syscon_lock(ti_opp_syscon); - rev = __SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_REV_OFFSET), AM33XX_REV_MASK); + rev = __BIT(__SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_REV_OFFSET), AM33XX_REV_MASK)); efuse = __SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_EFUSE_OFFSET), AM33XX_EFUSE_MASK); syscon_unlock(ti_opp_syscon);
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sun Jun 7 13:15:06 UTC 2020 Modified Files: src/distrib/sets/lists/base [netbsd-9]: mi src/doc [netbsd-9]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-9]: Makefile NEWS TZDATA_VERSION africa asia backward backzone europe leap-seconds.list leapseconds leapseconds.awk northamerica theory.html version zone.tab zone1970.tab Log Message: Pull up the following, requested by kre in ticket #942: external/public-domain/tz/dist/Makefile up to 1.1.1.26 external/public-domain/tz/dist/NEWS up to 1.1.1.29 external/public-domain/tz/dist/TZDATA_VERSION up to 1.19 external/public-domain/tz/dist/africa up to 1.1.1.22 external/public-domain/tz/dist/asia up to 1.1.1.25 external/public-domain/tz/dist/backward up to 1.1.1.11 external/public-domain/tz/dist/backzone up to 1.1.1.18 external/public-domain/tz/dist/europe up to 1.1.1.26 external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.13 external/public-domain/tz/dist/leapseconds up to 1.1.1.15 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.10 external/public-domain/tz/dist/northamerica up to 1.1.1.25 external/public-domain/tz/dist/theory.html up to 1.1.1.10 external/public-domain/tz/dist/version up to 1.1.1.16 external/public-domain/tz/dist/zone.tab up to 1.1.1.18 external/public-domain/tz/dist/zone1970.tab up to 1.1.1.20 doc/3RDPARTY(apply patch) distrib/sets/lists/base/mi (apply patch) Import tzdata2020a from ftp://ftp.iana.org/tz/releases/tzdata2020a.tar.gz Summary of changes in tzdata2020a (2020-04-23 16:03:47 -0700): Morocco resumes summer time on 2020-05-31, not 2020-05-24. Canada's Yukon advanced to -07 year-round on 2020-03-08 (summer time will not end this year).. America/Nuuk renamed from America/Godthab (both names now exist). To generate a diff of this commit: cvs rdiff -u -r1.1209.2.4 -r1.1209.2.5 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1640.2.16 -r1.1640.2.17 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.24.2.1 -r1.1.1.24.2.2 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.1.1.27.2.1 -r1.1.1.27.2.2 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.17.2.1 -r1.17.2.2 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.20.2.1 -r1.1.1.20.2.2 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.1.1.23.2.1 -r1.1.1.23.2.2 \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.10 -r1.1.1.10.2.1 \ src/external/public-domain/tz/dist/backward cvs rdiff -u -r1.1.1.16.2.1 -r1.1.1.16.2.2 \ src/external/public-domain/tz/dist/backzone \ src/external/public-domain/tz/dist/zone.tab cvs rdiff -u -r1.1.1.11.2.1 -r1.1.1.11.2.2 \ src/external/public-domain/tz/dist/leap-seconds.list cvs rdiff -u -r1.1.1.13.2.1 -r1.1.1.13.2.2 \ src/external/public-domain/tz/dist/leapseconds cvs rdiff -u -r1.1.1.8.2.1 -r1.1.1.8.2.2 \ src/external/public-domain/tz/dist/leapseconds.awk \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.14.2.1 -r1.1.1.14.2.2 \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.1.1.18.2.1 -r1.1.1.18.2.2 \ src/external/public-domain/tz/dist/zone1970.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1209.2.4 src/distrib/sets/lists/base/mi:1.1209.2.5 --- src/distrib/sets/lists/base/mi:1.1209.2.4 Fri Sep 27 09:18:37 2019 +++ src/distrib/sets/lists/base/mi Sun Jun 7 13:15:05 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1209.2.4 2019/09/27 09:18:37 martin Exp $ +# $NetBSD: mi,v 1.1209.2.5 2020/06/07 13:15:05 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -5486,6 +5486,7 @@ ./usr/share/zoneinfo/America/North_Dakota/Beulah base-sys-share share ./usr/share/zoneinfo/America/North_Dakota/Center base-sys-share share ./usr/share/zoneinfo/America/North_Dakota/New_Salem base-sys-share share +./usr/share/zoneinfo/America/Nuuk base-sys-share share ./usr/share/zoneinfo/America/Ojinaga base-sys-share share ./usr/share/zoneinfo/America/Panama base-sys-share share ./usr/share/zoneinfo/America/Pangnirtung base-sys-share share Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1640.2.16 src/doc/3RDPARTY:1.1640.2.17 --- src/doc/3RDPARTY:1.1640.2.16 Mon Apr 27 14:52:47 2020 +++ src/doc/3RDPARTY Sun Jun 7 13:15:05 2020 @@ -1,4 +1,4 @@ -#
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Sun Jun 7 12:54:39 UTC 2020 Modified Files: src/sys/arch/x86/x86 [netbsd-9]: pmap.c Log Message: Apply patch, requested by bouyer in ticket #941: sys/arch/x86/x86/pmap.c (apply patch) Fix Xen dom0 kernel build with options DIAGNOSTIC. To generate a diff of this commit: cvs rdiff -u -r1.334.2.2 -r1.334.2.3 src/sys/arch/x86/x86/pmap.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/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.334.2.2 src/sys/arch/x86/x86/pmap.c:1.334.2.3 --- src/sys/arch/x86/x86/pmap.c:1.334.2.2 Sun May 31 10:39:35 2020 +++ src/sys/arch/x86/x86/pmap.c Sun Jun 7 12:54:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.334.2.2 2020/05/31 10:39:35 martin Exp $ */ +/* $NetBSD: pmap.c,v 1.334.2.3 2020/06/07 12:54:39 martin Exp $ */ /* * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc. @@ -130,7 +130,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334.2.2 2020/05/31 10:39:35 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334.2.3 2020/06/07 12:54:39 martin Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h" @@ -4461,7 +4461,7 @@ pmap_free_gnt(struct pmap *pmap, struct struct pmap_data_gnt_head *headp = pmap->pm_data; int nentries = (pgnt->pd_gnt_eva - pgnt->pd_gnt_sva) / PAGE_SIZE; KASSERT(nentries >= 1); - KASSERT(mutex_owned(>pm_lock)); + KASSERT(mutex_owned(pmap->pm_lock)); KASSERT(pgnt->pd_gnt_refs == 0); SLIST_REMOVE(headp, pgnt, pmap_data_gnt, pd_gnt_list); kmem_free(pgnt, sizeof(*pgnt) +
CVS commit: [netbsd-9] src/bin/sh
Module Name:src
Committed By: martin
Date: Sun Jun 7 12:50:17 UTC 2020
Modified Files:
src/bin/sh [netbsd-9]: expand.c expand.h
Log Message:
Pull up following revision(s) (requested by kre in ticket #940):
bin/sh/expand.h: revision 1.25
bin/sh/expand.c: revision 1.134
bin/sh/expand.c: revision 1.135
bin/sh/expand.c: revision 1.136
bin/sh/expand.c: revision 1.137
Remove a (completely harmless) duplicate assignment introduced in a
code merge from FreeBSD in 2017. NFC.
Pointed out by Roland Illig.
prevent sign extension from making expression always false.
remove masking and cast (requested by kre@)
When expanding a here-doc (NXHERE - the type with an unquoted end delim)
the output will not be further processed (at all) so there is no need
to escape magic chars in the output, and doing so leaves stray CTLESC
chars in the here doc text. Not good. So don't do that...
To save a strlen() of the result, to determine the size of the here doc,
make rmescapes() return the length of the resulting string (this isn't
needed for other uses, so didn't happen previously).
Reported on current-users@ (2020-02-06) by Jun Ebihara
XXX pullup -9
To generate a diff of this commit:
cvs rdiff -u -r1.132.2.1 -r1.132.2.2 src/bin/sh/expand.c
cvs rdiff -u -r1.24 -r1.24.2.1 src/bin/sh/expand.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.132.2.1 src/bin/sh/expand.c:1.132.2.2
--- src/bin/sh/expand.c:1.132.2.1 Sun Nov 24 08:24:06 2019
+++ src/bin/sh/expand.c Sun Jun 7 12:50:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.132.2.1 2019/11/24 08:24:06 martin Exp $ */
+/* $NetBSD: expand.c,v 1.132.2.2 2020/06/07 12:50:17 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else
-__RCSID("$NetBSD: expand.c,v 1.132.2.1 2019/11/24 08:24:06 martin Exp $");
+__RCSID("$NetBSD: expand.c,v 1.132.2.2 2020/06/07 12:50:17 martin Exp $");
#endif
#endif /* not lint */
@@ -146,10 +146,12 @@ STATIC void rmescapes_nl(char *);
void
expandhere(union node *arg, int fd)
{
+ int len;
herefd = fd;
expandarg(arg, NULL, 0);
- xwrite(fd, stackblock(), expdest - stackblock());
+ len = rmescapes(stackblock());
+ xwrite(fd, stackblock(), len);
}
@@ -268,12 +270,12 @@ argstr(const char *p, int flag)
return p - 1;
case CTLENDVAR: /* end of expanding yyy in ${xxx-yyy} */
case CTLENDARI: /* end of a $(( )) string */
- if (had_dol_at && (*p&0xFF) == CTLQUOTEEND)
+ if (had_dol_at && *p == CTLQUOTEEND)
p++;
NULLTERM_4_TRACE(expdest);
VTRACE(DBG_EXPAND, ("argstr returning at \"%.6s\"..."
" after %2.2X; added \"%s\" to expdest\n",
- p, (c&0xff), stackblock()));
+ p, (c & 0xff), stackblock()));
return p;
case CTLQUOTEMARK:
/* "$@" syntax adherence hack */
@@ -307,7 +309,7 @@ argstr(const char *p, int flag)
had_dol_at = 0;
break;
case CTLESC:
- if (quotes || ISCTL(*p))
+ if ((quotes || ISCTL(*p)))
STPUTC(c, expdest);
c = *p++;
STPUTC(c, expdest);
@@ -1955,7 +1957,6 @@ patmatch(const char *pattern, const char
}
/* end shortcut */
- invert = 0;
savep = p, saveq = q;
invert = 0;
if (*p == '!' || *p == '^') {
@@ -2038,9 +2039,11 @@ patmatch(const char *pattern, const char
/*
* Remove any CTLESC or CTLNONL characters from a string.
+ *
+ * String is modified in place, and we return the length of the result
*/
-void
+int
rmescapes(char *str)
{
char *p, *q;
@@ -2048,7 +2051,7 @@ rmescapes(char *str)
p = str;
while (!ISCTL(*p)) {
if (*p++ == '\0')
- return;
+ return ((int)(p - str) - 1);
}
q = p;
while (*p) {
@@ -2070,6 +2073,8 @@ rmescapes(char *str)
*q++ = *p++;
}
*q = '\0';
+
+ return ((int)(q - str));
}
/*
Index: src/bin/sh/expand.h
diff -u src/bin/sh/expand.h:1.24 src/bin/sh/expand.h:1.24.2.1
--- src/bin/sh/expand.h:1.24 Sun Nov 18 17:23:37 2018
+++ src/bin/sh/expand.h Sun Jun 7 12:50:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.h,v 1.24 2018/11/18 17:23:37 kre Exp $ */
+/* $NetBSD: expand.h,v 1.24.2.1 2020/06/07 12:50:17 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -67,5 +67,5 @@ union node;
void expandhere(union node *, int);
void expandarg(union node *, struct arglist *, int);
-void rmescapes(char *);
+int rmescapes(char *);
int casematch(union node *, char *);
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Sun Jun 7 12:35:01 UTC 2020
Modified Files:
src/distrib/arc/ramdisk [netbsd-9]: Makefile list
src/sys/arch/arc/arc [netbsd-9]: arcbios.c
src/sys/arch/arc/conf [netbsd-9]: GENERIC RAMDISK
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #939):
distrib/arc/ramdisk/Makefile: revision 1.29
sys/arch/arc/arc/arcbios.c: revision 1.18
distrib/arc/ramdisk/list: revision 1.24
sys/arch/arc/conf/GENERIC: revision 1.198
sys/arch/arc/conf/RAMDISK: revision 1.83
distrib/arc/ramdisk/Makefile: revision 1.28
bump ramdisk size to 3200k for gcc 8. yay!
-
Make sure to preserve MIPS_CURLWP (t8) register from ARC BIOS calls.
Fixes silent hangup right after starting a kernel on my
Express5800/230 R4400 PCI (finally I've repaired its PSU and RTC).
Reviewed by soda@. Maybe other ARC machines are also affected.
Note GXemul was not affected by this problem because it doesn't
have actual ARC BIOS ROM and emulates ARC functions internally.
Should be pulled up to at least netbsd-9.
-
Shrink ramdisk to make RAMDISK kernel smaller for ARC BIOS restriction.
Try to shrink kernels to smaller than ~6MB due to ARC BIOS restriction.
Currently NetBSD/arc kernels are loaded at 0x8020
(on some machines ARC BIOS uses regions before it) and
ARC BIOS also uses around 0x807f, so bootloader fails
on loading >6MB kernels.
Note GXemul doesn't have this restriction because it loads
a kernel directly via a command line argument.
Tested by installing using sysinst on RAMDISK kernel on netbsd-9.
Should be pulled up to netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.12.1 src/distrib/arc/ramdisk/Makefile
cvs rdiff -u -r1.23 -r1.23.46.1 src/distrib/arc/ramdisk/list
cvs rdiff -u -r1.17 -r1.17.68.1 src/sys/arch/arc/arc/arcbios.c
cvs rdiff -u -r1.193 -r1.193.2.1 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.82 -r1.82.22.1 src/sys/arch/arc/conf/RAMDISK
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/arc/ramdisk/Makefile
diff -u src/distrib/arc/ramdisk/Makefile:1.26 src/distrib/arc/ramdisk/Makefile:1.26.12.1
--- src/distrib/arc/ramdisk/Makefile:1.26 Fri May 12 07:26:35 2017
+++ src/distrib/arc/ramdisk/Makefile Sun Jun 7 12:35:01 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2017/05/12 07:26:35 martin Exp $
+# $NetBSD: Makefile,v 1.26.12.1 2020/06/07 12:35:01 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 3060k
+IMAGESIZE= 2880k
MAKEFS_FLAGS+= -f 15
WARNS= 1
Index: src/distrib/arc/ramdisk/list
diff -u src/distrib/arc/ramdisk/list:1.23 src/distrib/arc/ramdisk/list:1.23.46.1
--- src/distrib/arc/ramdisk/list:1.23 Wed Aug 3 13:59:14 2011
+++ src/distrib/arc/ramdisk/list Sun Jun 7 12:35:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.23 2011/08/03 13:59:14 tsutsui Exp $
+# $NetBSD: list,v 1.23.46.1 2020/06/07 12:35:01 martin Exp $
#SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin
@@ -8,16 +8,16 @@ PROG bin/chmod
PROG bin/cp
PROG bin/dd
PROG bin/df
-PROG bin/ed
+#PROG bin/ed
PROG bin/ln
PROG bin/ls
PROG bin/mkdir
-PROG bin/mt
+#PROG bin/mt
PROG bin/mv
PROG bin/pax usr/bin/tar
PROG bin/pwd
-PROG bin/rcmd
-PROG bin/rcp
+#PROG bin/rcmd
+#PROG bin/rcp
PROG bin/rm
PROG bin/sh
PROG bin/stty
@@ -31,22 +31,22 @@ PROG sbin/fsck
PROG sbin/fsck_ffs
PROG sbin/ifconfig
PROG sbin/init
-PROG sbin/mbrlabel
+#PROG sbin/mbrlabel
PROG sbin/mknod
PROG sbin/mount
PROG sbin/mount_cd9660
PROG sbin/mount_ffs
PROG sbin/mount_msdos
PROG sbin/mount_nfs
-PROG sbin/mount_ntfs
+#PROG sbin/mount_ntfs
PROG sbin/newfs sbin/mount_mfs
PROG sbin/newfs_msdos
PROG sbin/ping
PROG sbin/reboot sbin/halt
-PROG sbin/restore sbin/rrestore
+#PROG sbin/restore sbin/rrestore
PROG sbin/route
PROG sbin/shutdown
-PROG sbin/slattach
+#PROG sbin/slattach
PROG sbin/swapctl sbin/swapon
PROG sbin/umount
@@ -62,10 +62,13 @@ PROG usr/sbin/chroot
# init invokes the shell as -sh
ARGVLN sh -sh
-SPECIAL ed srcdir distrib/utils/x_ed
+SPECIAL disklabel srcdir distrib/utils/x_disklabel
+#SPECIAL ed srcdir distrib/utils/x_ed
+SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL more srcdir distrib/utils/more
+SPECIAL newfs srcdir distrib/utils/x_newfs
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
SPECIAL umount srcdir distrib/utils/x_umount
Index: src/sys/arch/arc/arc/arcbios.c
diff -u src/sys/arch/arc/arc/arcbios.c:1.17 src/sys/arch/arc/arc/arcbios.c:1.17.68.1
--- src/sys/arch/arc/arc/arcbios.c:1.17 Fri Nov 27 03:23:04 2009
+++ src/sys/arch/arc/arc/arcbios.c Sun Jun 7 12:35:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbios.c,v 1.17 2009/11/27 03:23:04
CVS commit: [netbsd-7] src/sys/arch/powerpc/oea
Module Name:src
Committed By: martin
Date: Sun Jun 7 12:26:22 UTC 2020
Modified Files:
src/sys/arch/powerpc/oea [netbsd-7]: pmap.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #1732):
sys/arch/powerpc/oea/pmap.c: revision 1.96
Stop returning while PMAP_LOCK() (= KERNEL_LOCK(1, NULL)) is held.
Kernel freeze with heavy load is significantly mitigated (fixed?),
in which I could not even enter DDB from console.
XXX
There is still inconsistency in usage of two PVO pools.
I will send-pr later.
XXX
pullup to netbsd-[987]
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.92.2.1 src/sys/arch/powerpc/oea/pmap.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/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.92 src/sys/arch/powerpc/oea/pmap.c:1.92.2.1
--- src/sys/arch/powerpc/oea/pmap.c:1.92 Sun Aug 10 17:49:04 2014
+++ src/sys/arch/powerpc/oea/pmap.c Sun Jun 7 12:26:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.92 2014/08/10 17:49:04 joerg Exp $ */
+/* $NetBSD: pmap.c,v 1.92.2.1 2020/06/07 12:26:22 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.92 2014/08/10 17:49:04 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.92.2.1 2020/06/07 12:26:22 martin Exp $");
#define PMAP_NOOPNAMES
@@ -990,6 +990,7 @@ pmap_pte_spill(struct pmap *pm, vaddr_t
}
source_pvo = pvo;
if (exec && !PVO_EXECUTABLE_P(source_pvo)) {
+PMAP_UNLOCK();
return 0;
}
if (victim_pvo != NULL)
@@ -2153,6 +2154,7 @@ pmap_extract(pmap_t pm, vaddr_t va, padd
return true;
}
}
+ PMAP_UNLOCK();
return false;
#elif defined (PMAP_OEA64_BRIDGE)
if (va >= SEGMENT_LENGTH)
CVS commit: [netbsd-8] src/sys/arch/powerpc/oea
Module Name:src
Committed By: martin
Date: Sun Jun 7 12:23:43 UTC 2020
Modified Files:
src/sys/arch/powerpc/oea [netbsd-8]: pmap.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #1554):
sys/arch/powerpc/oea/pmap.c: revision 1.96
Stop returning while PMAP_LOCK() (= KERNEL_LOCK(1, NULL)) is held.
Kernel freeze with heavy load is significantly mitigated (fixed?),
in which I could not even enter DDB from console.
XXX
There is still inconsistency in usage of two PVO pools.
I will send-pr later.
XXX
pullup to netbsd-[987]
To generate a diff of this commit:
cvs rdiff -u -r1.94.8.1 -r1.94.8.2 src/sys/arch/powerpc/oea/pmap.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/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.94.8.1 src/sys/arch/powerpc/oea/pmap.c:1.94.8.2
--- src/sys/arch/powerpc/oea/pmap.c:1.94.8.1 Tue Feb 27 09:07:33 2018
+++ src/sys/arch/powerpc/oea/pmap.c Sun Jun 7 12:23:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.94.8.1 2018/02/27 09:07:33 martin Exp $ */
+/* $NetBSD: pmap.c,v 1.94.8.2 2020/06/07 12:23:43 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.94.8.1 2018/02/27 09:07:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.94.8.2 2020/06/07 12:23:43 martin Exp $");
#define PMAP_NOOPNAMES
@@ -991,6 +991,7 @@ pmap_pte_spill(struct pmap *pm, vaddr_t
}
source_pvo = pvo;
if (exec && !PVO_EXECUTABLE_P(source_pvo)) {
+PMAP_UNLOCK();
return 0;
}
if (victim_pvo != NULL)
@@ -2162,6 +2163,7 @@ pmap_extract(pmap_t pm, vaddr_t va, padd
return true;
}
}
+ PMAP_UNLOCK();
return false;
#elif defined (PMAP_OEA64_BRIDGE)
if (va >= SEGMENT_LENGTH)
CVS commit: [netbsd-9] src/sys/arch/powerpc/oea
Module Name:src
Committed By: martin
Date: Sun Jun 7 12:21:36 UTC 2020
Modified Files:
src/sys/arch/powerpc/oea [netbsd-9]: pmap.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #938):
sys/arch/powerpc/oea/pmap.c: revision 1.96
Stop returning while PMAP_LOCK() (= KERNEL_LOCK(1, NULL)) is held.
Kernel freeze with heavy load is significantly mitigated (fixed?),
in which I could not even enter DDB from console.
XXX
There is still inconsistency in usage of two PVO pools.
I will send-pr later.
XXX
pullup to netbsd-[987]
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.95.8.1 src/sys/arch/powerpc/oea/pmap.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/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.95 src/sys/arch/powerpc/oea/pmap.c:1.95.8.1
--- src/sys/arch/powerpc/oea/pmap.c:1.95 Sat Jan 27 23:07:36 2018
+++ src/sys/arch/powerpc/oea/pmap.c Sun Jun 7 12:21:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.95 2018/01/27 23:07:36 chs Exp $ */
+/* $NetBSD: pmap.c,v 1.95.8.1 2020/06/07 12:21:35 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.95 2018/01/27 23:07:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.95.8.1 2020/06/07 12:21:35 martin Exp $");
#define PMAP_NOOPNAMES
@@ -991,6 +991,7 @@ pmap_pte_spill(struct pmap *pm, vaddr_t
}
source_pvo = pvo;
if (exec && !PVO_EXECUTABLE_P(source_pvo)) {
+PMAP_UNLOCK();
return 0;
}
if (victim_pvo != NULL)
@@ -2162,6 +2163,7 @@ pmap_extract(pmap_t pm, vaddr_t va, padd
return true;
}
}
+ PMAP_UNLOCK();
return false;
#elif defined (PMAP_OEA64_BRIDGE)
if (va >= SEGMENT_LENGTH)
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Sun Jun 7 10:24:50 UTC 2020 Modified Files: src/distrib/sets/lists/debug: shl.mi Log Message: Fix debug sets for libprop changes To generate a diff of this commit: cvs rdiff -u -r1.251 -r1.252 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.251 src/distrib/sets/lists/debug/shl.mi:1.252 --- src/distrib/sets/lists/debug/shl.mi:1.251 Sat May 30 20:47:58 2020 +++ src/distrib/sets/lists/debug/shl.mi Sun Jun 7 10:24:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.251 2020/05/30 20:47:58 christos Exp $ +# $NetBSD: shl.mi,v 1.252 2020/06/07 10:24:50 martin Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -21,7 +21,7 @@ ./usr/libdata/debug/lib/libnvpair.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs ./usr/libdata/debug/lib/libpcap.so.8.1.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libppath.so.0.0.debug comp-sys-debug debug,dynamicroot -./usr/libdata/debug/lib/libprop.so.1.1.debug comp-sys-debug debug,dynamicroot +./usr/libdata/debug/lib/libprop.so.1.2.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libpthread.so.1.4.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libradius.so.4.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/librumpclient.so.0.0.debug comp-rump-debug debug,dynamicroot,rump @@ -189,7 +189,7 @@ ./usr/libdata/debug/usr/lib/libposix.so.0.1.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libppath.so.0.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libproc.so.1.0.debug comp-sys-debug debug,dtrace -./usr/libdata/debug/usr/lib/libprop.so.1.1.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libprop.so.1.2.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libpthread.so.1.4.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libpthread_dbg.so.2.0.debug comp-obsolete obsolete ./usr/libdata/debug/usr/lib/libpuffs.so.2.0.debug comp-puffs-debug debug,compatfile @@ -345,6 +345,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/tls/libh_tls_dynamic.so.1.debug tests-lib-debug debug,compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dlopen.debug tests-lib-debug debug,compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dynamic.debug tests-lib-debug debug,compattestfile,atf +./usr/libdata/debug/usr/tests/lib/libprop/t_proplib.debug tests-lib-debug debug,compattestfile ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_helper_symver_dso0/libh_helper_symver_dso.so.1.debug tests-libexec-debug debug,compattestfile,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_helper_symver_dso1/libh_helper_symver_dso.so.1.debug tests-libexec-debug debug,compattestfile,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_helper_symver_dso2/libh_helper_symver_dso.so.1.debug tests-libexec-debug debug,compattestfile,atf
CVS commit: src
Module Name:src Committed By: maxv Date: Sun Jun 7 09:45:20 UTC 2020 Modified Files: src/etc: MAKEDEV.tmpl src/sys/arch/amd64/conf: ALL GENERIC src/sys/conf: files majors src/sys/kern: files.kern subr_pool.c Added Files: src/sys/kern: subr_fault.c src/sys/sys: fault.h Log Message: Add fault(4). To generate a diff of this commit: cvs rdiff -u -r1.219 -r1.220 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.152 -r1.153 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.568 -r1.569 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1267 -r1.1268 src/sys/conf/files cvs rdiff -u -r1.93 -r1.94 src/sys/conf/majors cvs rdiff -u -r1.48 -r1.49 src/sys/kern/files.kern cvs rdiff -u -r0 -r1.1 src/sys/kern/subr_fault.c cvs rdiff -u -r1.269 -r1.270 src/sys/kern/subr_pool.c cvs rdiff -u -r0 -r1.1 src/sys/sys/fault.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.219 src/etc/MAKEDEV.tmpl:1.220 --- src/etc/MAKEDEV.tmpl:1.219 Fri Jun 5 17:20:56 2020 +++ src/etc/MAKEDEV.tmpl Sun Jun 7 09:45:19 2020 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.219 2020/06/05 17:20:56 maxv Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.220 2020/06/07 09:45:19 maxv Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -1761,6 +1761,10 @@ vio9p[0-9]*) mkdev vio9p$unit c %vio9p_chr% $unit 660 ;; +fault) + mkdev fault c %fault_chr% 0 + ;; + nvram) mkdev nvram c %nvram_chr% 0 644 ;; Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.152 src/sys/arch/amd64/conf/ALL:1.153 --- src/sys/arch/amd64/conf/ALL:1.152 Sat May 30 13:35:31 2020 +++ src/sys/arch/amd64/conf/ALL Sun Jun 7 09:45:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.152 2020/05/30 13:35:31 jdolecek Exp $ +# $NetBSD: ALL,v 1.153 2020/06/07 09:45:19 maxv Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.152 $" +#ident "ALL-$Revision: 1.153 $" maxusers 64 # estimated number of users @@ -137,6 +137,9 @@ options KASAN makeoptions KCOV=1 options KCOV +# Fault Injection Driver. +options FAULT + # Compatibility options options EXEC_AOUT # required by binaries from before 1.5 options COMPAT_386BSD_MBRPART # recognize old partition ID Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.568 src/sys/arch/amd64/conf/GENERIC:1.569 --- src/sys/arch/amd64/conf/GENERIC:1.568 Sat May 16 18:31:48 2020 +++ src/sys/arch/amd64/conf/GENERIC Sun Jun 7 09:45:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.568 2020/05/16 18:31:48 christos Exp $ +# $NetBSD: GENERIC,v 1.569 2020/06/07 09:45:19 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.568 $" +#ident "GENERIC-$Revision: 1.569 $" maxusers 64 # estimated number of users @@ -158,6 +158,9 @@ options KDTRACE_HOOKS # kernel DTrace h #makeoptions KCOV=1 #options KCOV +# Fault Injection Driver. +#options FAULT + # Compatibility options # x86_64 never shipped with a.out binaries; the two options below are # only relevant to 32-bit i386 binaries Index: src/sys/conf/files diff -u src/sys/conf/files:1.1267 src/sys/conf/files:1.1268 --- src/sys/conf/files:1.1267 Wed May 20 09:18:25 2020 +++ src/sys/conf/files Sun Jun 7 09:45:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1267 2020/05/20 09:18:25 hkenken Exp $ +# $NetBSD: files,v 1.1268 2020/06/07 09:45:19 maxv Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -38,6 +38,7 @@ defflag opt_kmsan.h KMSAN_PANIC defflagKCOV defflag opt_pool.h POOL_QUARANTINE defflag opt_pool.h POOL_NOCACHE +defflagFAULT defparam opt_copy_symtab.h makeoptions_COPY_SYMTAB Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.93 src/sys/conf/majors:1.94 --- src/sys/conf/majors:1.93 Sun Jan 19 20:41:18 2020 +++ src/sys/conf/majors Sun Jun 7 09:45:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.93 2020/01/19 20:41:18 riastradh Exp $ +# $NetBSD: majors,v 1.94 2020/06/07 09:45:19 maxv Exp $ # # Device majors for Machine-Independent drivers. # @@ -88,3 +88,4 @@ device-major spi char 347 spi device-major ipmi char 354 ipmi device-major vhci char 355vhci device-major vio9p char 356 vio9p +device-major fault char 357 fault Index: src/sys/kern/files.kern diff -u src/sys/kern/files.kern:1.48 src/sys/kern/files.kern:1.49 --- src/sys/kern/files.kern:1.48 Sat May 16 18:31:50 2020 +++ src/sys/kern/files.kern Sun Jun 7 09:45:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD:
CVS commit: src/sys/sys
Module Name:src Committed By: thorpej Date: Sun Jun 7 06:08:20 UTC 2020 Modified Files: src/sys/sys: param.h Log Message: NetBSD 9.99.65 -- proplib(3) API additions also impact the kernel ABI. To generate a diff of this commit: cvs rdiff -u -r1.667 -r1.668 src/sys/sys/param.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/param.h diff -u src/sys/sys/param.h:1.667 src/sys/sys/param.h:1.668 --- src/sys/sys/param.h:1.667 Sat May 23 21:49:43 2020 +++ src/sys/sys/param.h Sun Jun 7 06:08:20 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.667 2020/05/23 21:49:43 ad Exp $ */ +/* $NetBSD: param.h,v 1.668 2020/06/07 06:08:20 thorpej Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 999006400 /* NetBSD 9.99.64 */ +#define __NetBSD_Version__ 999006500 /* NetBSD 9.99.65 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: thorpej
Date: Sun Jun 7 06:02:58 UTC 2020
Modified Files:
src/sbin/ifconfig: af_atalk.c af_inetany.c carp.c env.c ether.c
ifconfig.c media.c parse.c pfsync.c tunnel.c
Log Message:
Update for proplib(3) API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sbin/ifconfig/af_atalk.c
cvs rdiff -u -r1.18 -r1.19 src/sbin/ifconfig/af_inetany.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/ifconfig/carp.c
cvs rdiff -u -r1.12 -r1.13 src/sbin/ifconfig/env.c
cvs rdiff -u -r1.8 -r1.9 src/sbin/ifconfig/ether.c src/sbin/ifconfig/media.c
cvs rdiff -u -r1.241 -r1.242 src/sbin/ifconfig/ifconfig.c
cvs rdiff -u -r1.19 -r1.20 src/sbin/ifconfig/parse.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/ifconfig/pfsync.c
cvs rdiff -u -r1.21 -r1.22 src/sbin/ifconfig/tunnel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_atalk.c
diff -u src/sbin/ifconfig/af_atalk.c:1.20 src/sbin/ifconfig/af_atalk.c:1.21
--- src/sbin/ifconfig/af_atalk.c:1.20 Fri Aug 16 10:33:17 2019
+++ src/sbin/ifconfig/af_atalk.c Sun Jun 7 06:02:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: af_atalk.c,v 1.20 2019/08/16 10:33:17 msaitoh Exp $ */
+/* $NetBSD: af_atalk.c,v 1.21 2020/06/07 06:02:58 thorpej Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_atalk.c,v 1.20 2019/08/16 10:33:17 msaitoh Exp $");
+__RCSID("$NetBSD: af_atalk.c,v 1.21 2020/06/07 06:02:58 thorpej Exp $");
#endif /* not lint */
#include
@@ -138,7 +138,13 @@ at_commit_address(prop_dictionary_t env,
if ((d0 = (prop_data_t)prop_dictionary_get(env, "address")) == NULL)
return;
- addr = prop_data_data(d0);
+ addr = malloc(prop_data_size(d0));
+ if (addr == NULL)
+ return;
+ if (!prop_data_copy_value(d0, addr, prop_data_size(d0))) {
+ free(addr);
+ return;
+ }
sat = (struct sockaddr_at *)>pfx_addr;
@@ -154,11 +160,13 @@ at_commit_address(prop_dictionary_t env,
/* Copy the new address to a temporary input environment */
- d = prop_data_create_data_nocopy(addr, paddr_prefix_size(addr));
+ d = prop_data_create_copy(addr, paddr_prefix_size(addr));
+ free(addr);
+
ienv = prop_dictionary_copy_mutable(env);
if (d == NULL)
- err(EXIT_FAILURE, "%s: prop_data_create_data", __func__);
+ err(EXIT_FAILURE, "%s: prop_data_create_copy", __func__);
if (ienv == NULL)
err(EXIT_FAILURE, "%s: prop_dictionary_copy_mutable", __func__);
Index: src/sbin/ifconfig/af_inetany.c
diff -u src/sbin/ifconfig/af_inetany.c:1.18 src/sbin/ifconfig/af_inetany.c:1.19
--- src/sbin/ifconfig/af_inetany.c:1.18 Fri Aug 16 10:33:17 2019
+++ src/sbin/ifconfig/af_inetany.c Sun Jun 7 06:02:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inetany.c,v 1.18 2019/08/16 10:33:17 msaitoh Exp $ */
+/* $NetBSD: af_inetany.c,v 1.19 2020/06/07 06:02:58 thorpej Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_inetany.c,v 1.18 2019/08/16 10:33:17 msaitoh Exp $");
+__RCSID("$NetBSD: af_inetany.c,v 1.19 2020/06/07 06:02:58 thorpej Exp $");
#endif /* not lint */
#include
@@ -87,7 +87,7 @@ commit_address(prop_dictionary_t env, pr
strlcpy(param->name[1].buf, ifname, param->name[1].buflen);
if ((d = (prop_data_t)prop_dictionary_get(env, "address")) != NULL)
- addr = prop_data_data_nocopy(d);
+ addr = prop_data_value(d);
else if (!prop_dictionary_get_bool(env, "alias", ) || alias ||
param->gifaddr.cmd == 0)
return;
@@ -99,17 +99,17 @@ commit_address(prop_dictionary_t env, pr
return;
if ((d = (prop_data_t)prop_dictionary_get(env, "dst")) != NULL)
- dst = prop_data_data_nocopy(d);
+ dst = prop_data_value(d);
else
dst = NULL;
if ((d = (prop_data_t)prop_dictionary_get(env, "netmask")) != NULL)
- mask = prop_data_data_nocopy(d);
+ mask = prop_data_value(d);
else
mask = NULL;
if ((d = (prop_data_t)prop_dictionary_get(env, "broadcast")) != NULL)
- brd = prop_data_data_nocopy(d);
+ brd = prop_data_value(d);
else
brd = NULL;
Index: src/sbin/ifconfig/carp.c
diff -u src/sbin/ifconfig/carp.c:1.13 src/sbin/ifconfig/carp.c:1.14
--- src/sbin/ifconfig/carp.c:1.13 Fri Sep 11 23:22:28 2009
+++ src/sbin/ifconfig/carp.c Sun Jun 7 06:02:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: carp.c,v 1.13 2009/09/11 23:22:28 dyoung Exp $ */
+/* $NetBSD: carp.c,v 1.14 2020/06/07 06:02:58 thorpej Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: carp.c,v 1.13 2009/09/11 23:22:28 dyoung Exp $");
+__RCSID("$NetBSD: carp.c,v 1.14 2020/06/07 06:02:58 thorpej Exp $");
#endif /* not lint */
#include
@@ -167,7 +167,7 @@ setcarp_passwd(prop_dictionary_t env, pr
memset(carpr.carpr_key, 0, sizeof(carpr.carpr_key));
/* XXX Should hash the password into the key here, perhaps? */
- strlcpy((char
