CVS commit: src/tests/rump/modautoload
Module Name:src Committed By: kamil Date: Sat Aug 17 04:04:29 UTC 2019 Modified Files: src/tests/rump/modautoload: Makefile Log Message: Avoid symbol clashes in test/rump/modautoload/t_modautoload with sanitizers Set SANITIZER_RENAME_SYMBOL.t_modautoload to: * sysctlbyname * sysctlgetmibinfo To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tests/rump/modautoload/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/rump/modautoload
Module Name:src
Committed By: kamil
Date: Sat Aug 17 04:04:29 UTC 2019
Modified Files:
src/tests/rump/modautoload: Makefile
Log Message:
Avoid symbol clashes in test/rump/modautoload/t_modautoload with sanitizers
Set SANITIZER_RENAME_SYMBOL.t_modautoload to:
* sysctlbyname
* sysctlgetmibinfo
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/rump/modautoload/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/rump/modautoload/Makefile
diff -u src/tests/rump/modautoload/Makefile:1.8 src/tests/rump/modautoload/Makefile:1.9
--- src/tests/rump/modautoload/Makefile:1.8 Fri Oct 14 16:02:35 2016
+++ src/tests/rump/modautoload/Makefile Sat Aug 17 04:04:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/10/14 16:02:35 christos Exp $
+# $NetBSD: Makefile,v 1.9 2019/08/17 04:04:28 kamil Exp $
#
.include
@@ -29,4 +29,9 @@ SRCS.t_modautoload+= sysctlbyname.c
SRCS.t_modautoload+= sysctlgetmibinfo.c
CPPFLAGS+= -DRUMP_ACTION
+SANITIZER_RENAME_CLASSES+= t_modautoload
+SANITIZER_RENAME_FILES.t_modautoload+= ${SRCS.t_modautoload}
+SANITIZER_RENAME_SYMBOL.t_modautoload+= sysctlbyname
+SANITIZER_RENAME_SYMBOL.t_modautoload+= sysctlgetmibinfo
+
.include
CVS commit: src/share/mk
Module Name:src
Committed By: kamil
Date: Sat Aug 17 00:14:48 UTC 2019
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Add PAXCTL_FLAG rules for MKSANITIZER
Add per-program rules to disable ASLR for ASan, TSan and MSan in all
sanitized programs. This flag is not needed for other supported sanitizers.
Without this change, sanitized init(8) dies early on startup.
Approach originally suggested by
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.321 src/share/mk/bsd.prog.mk:1.322
--- src/share/mk/bsd.prog.mk:1.321 Thu Aug 15 08:42:59 2019
+++ src/share/mk/bsd.prog.mk Sat Aug 17 00:14:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.321 2019/08/15 08:42:59 kamil Exp $
+# $NetBSD: bsd.prog.mk,v 1.322 2019/08/17 00:14:48 kamil Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -452,10 +452,18 @@ PROGNAME.${_P}?= ${_P}
_PROGDEBUG.${_P}:= ${PROGNAME.${_P}}.debug
.endif
+# paxctl specific arguments
+
.if defined(PAXCTL_FLAGS)
PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
.endif
+.if ${MKSANITIZER:Uno} == "yes" && \
+ (${USE_SANITIZER} == "address" || ${USE_SANITIZER} == "thread" || \
+ ${USE_SANITIZER} == "memory")
+PAXCTL_FLAGS.${_P}= +a
+.endif
+
# PROG specific flags.
_DPADD.${_P}= ${DPADD}${DPADD.${_P}}
CVS commit: src/share/mk
Module Name:src Committed By: kamil Date: Sat Aug 17 00:14:48 UTC 2019 Modified Files: src/share/mk: bsd.prog.mk Log Message: Add PAXCTL_FLAG rules for MKSANITIZER Add per-program rules to disable ASLR for ASan, TSan and MSan in all sanitized programs. This flag is not needed for other supported sanitizers. Without this change, sanitized init(8) dies early on startup. Approach originally suggested by To generate a diff of this commit: cvs rdiff -u -r1.321 -r1.322 src/share/mk/bsd.prog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/compiler_rt/lib/clang/lib/netbsd
Module Name:src Committed By: kamil Date: Fri Aug 16 23:07:20 UTC 2019 Modified Files: src/external/bsd/compiler_rt/lib/clang/lib/netbsd: common.mk Log Message: Set NODEBUG for LLVM sanitizers The sanitizers are special purpose piece of software that needs customized build rules. Do not bother with generating debuginfo files for them. Fixes MKDEBUG=yes build To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/compiler_rt/lib/clang/lib/netbsd
Module Name:src Committed By: kamil Date: Fri Aug 16 23:07:20 UTC 2019 Modified Files: src/external/bsd/compiler_rt/lib/clang/lib/netbsd: common.mk Log Message: Set NODEBUG for LLVM sanitizers The sanitizers are special purpose piece of software that needs customized build rules. Do not bother with generating debuginfo files for them. Fixes MKDEBUG=yes build To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk 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/compiler_rt/lib/clang/lib/netbsd/common.mk diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk:1.2 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk:1.1 Thu Aug 8 14:00:28 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk Fri Aug 16 23:07:20 2019 @@ -1 +1,2 @@ CLANG_VER= 7.0.0 +NODEBUG= # defined
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Aug 16 19:31:28 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #73 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Aug 16 19:31:28 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #73 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.20 src/doc/CHANGES-9.0:1.1.2.21 --- src/doc/CHANGES-9.0:1.1.2.20 Fri Aug 16 19:29:16 2019 +++ src/doc/CHANGES-9.0 Fri Aug 16 19:31:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.20 2019/08/16 19:29:16 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.21 2019/08/16 19:31:27 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -1906,3 +1906,10 @@ external/gpl3/gcc/usr.bin/include/saniti Ship with sanitizer/lsan_interface.h for GCC 7. [kamil, ticket #72] +sbin/fsck_ext2fs/main.c1.40 +sbin/fsck_ffs/main.c1.86 +sbin/fsck_lfs/main.c1.54 + + fsck: Stop defining the same variable concurrently in bss and data. + [kamil, ticket #73] +
CVS commit: [netbsd-9] src/sbin
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:30:42 UTC 2019
Modified Files:
src/sbin/fsck_ext2fs [netbsd-9]: main.c
src/sbin/fsck_ffs [netbsd-9]: main.c
src/sbin/fsck_lfs [netbsd-9]: main.c
Log Message:
Pull up following revision(s) (requested by kamil in ticket #73):
sbin/fsck_lfs/main.c: revision 1.54
sbin/fsck_ext2fs/main.c: revision 1.40
sbin/fsck_ffs/main.c: revision 1.86
fsck: Stop defining the same variable concurrently in bss and data
returntosingle was defined in multiple places:
- fsck_lfs/main.c
- fsck_ffs/main.c
- fsck_ext2fs/main.c
- fsck/fsutil.c
Keep the fsutil.c definition as the only one.
Detected during the build of telned with Address Sanitizer (MKSANITIZER).
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.2.1 src/sbin/fsck_ext2fs/main.c
cvs rdiff -u -r1.85 -r1.85.2.1 src/sbin/fsck_ffs/main.c
cvs rdiff -u -r1.53 -r1.53.2.1 src/sbin/fsck_lfs/main.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/fsck_ext2fs/main.c
diff -u src/sbin/fsck_ext2fs/main.c:1.39 src/sbin/fsck_ext2fs/main.c:1.39.2.1
--- src/sbin/fsck_ext2fs/main.c:1.39 Sun Feb 3 03:19:26 2019
+++ src/sbin/fsck_ext2fs/main.c Fri Aug 16 19:30:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.39 2019/02/03 03:19:26 mrg Exp $ */
+/* $NetBSD: main.c,v 1.39.2.1 2019/08/16 19:30:41 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -63,7 +63,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94";
#else
-__RCSID("$NetBSD: main.c,v 1.39 2019/02/03 03:19:26 mrg Exp $");
+__RCSID("$NetBSD: main.c,v 1.39.2.1 2019/08/16 19:30:41 martin Exp $");
#endif
#endif /* not lint */
@@ -87,7 +87,6 @@ __RCSID("$NetBSD: main.c,v 1.39 2019/02/
#include "fsutil.h"
#include "exitvalues.h"
-volatile sig_atomic_t returntosingle = 0;
static int argtoi(int, const char *, const char *, int);
@@ -354,4 +353,3 @@ usage(void)
getprogname());
exit(FSCK_EXIT_USAGE);
}
-
Index: src/sbin/fsck_ffs/main.c
diff -u src/sbin/fsck_ffs/main.c:1.85 src/sbin/fsck_ffs/main.c:1.85.2.1
--- src/sbin/fsck_ffs/main.c:1.85 Sun May 5 14:59:06 2019
+++ src/sbin/fsck_ffs/main.c Fri Aug 16 19:30:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.85 2019/05/05 14:59:06 christos Exp $ */
+/* $NetBSD: main.c,v 1.85.2.1 2019/08/16 19:30:42 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#else
-__RCSID("$NetBSD: main.c,v 1.85 2019/05/05 14:59:06 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.85.2.1 2019/08/16 19:30:42 martin Exp $");
#endif
#endif /* not lint */
@@ -71,7 +71,6 @@ __RCSID("$NetBSD: main.c,v 1.85 2019/05/
#include "snapshot.h"
int progress = 0;
-volatile sig_atomic_t returntosingle = 0;
static int argtoi(int, const char *, const char *, int);
static int checkfilesys(const char *, const char *, int);
Index: src/sbin/fsck_lfs/main.c
diff -u src/sbin/fsck_lfs/main.c:1.53 src/sbin/fsck_lfs/main.c:1.53.2.1
--- src/sbin/fsck_lfs/main.c:1.53 Sun Feb 3 03:19:26 2019
+++ src/sbin/fsck_lfs/main.c Fri Aug 16 19:30:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.53 2019/02/03 03:19:26 mrg Exp $ */
+/* $NetBSD: main.c,v 1.53.2.1 2019/08/16 19:30:41 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -53,7 +53,6 @@
#include "fsutil.h"
#include "exitvalues.h"
-volatile sig_atomic_t returntosingle = 0;
static int argtoi(int, const char *, const char *, int);
static int checkfilesys(const char *, char *, long, int);
CVS commit: [netbsd-9] src/sbin
Module Name:src Committed By: martin Date: Fri Aug 16 19:30:42 UTC 2019 Modified Files: src/sbin/fsck_ext2fs [netbsd-9]: main.c src/sbin/fsck_ffs [netbsd-9]: main.c src/sbin/fsck_lfs [netbsd-9]: main.c Log Message: Pull up following revision(s) (requested by kamil in ticket #73): sbin/fsck_lfs/main.c: revision 1.54 sbin/fsck_ext2fs/main.c: revision 1.40 sbin/fsck_ffs/main.c: revision 1.86 fsck: Stop defining the same variable concurrently in bss and data returntosingle was defined in multiple places: - fsck_lfs/main.c - fsck_ffs/main.c - fsck_ext2fs/main.c - fsck/fsutil.c Keep the fsutil.c definition as the only one. Detected during the build of telned with Address Sanitizer (MKSANITIZER). To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.2.1 src/sbin/fsck_ext2fs/main.c cvs rdiff -u -r1.85 -r1.85.2.1 src/sbin/fsck_ffs/main.c cvs rdiff -u -r1.53 -r1.53.2.1 src/sbin/fsck_lfs/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Aug 16 19:29:16 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #58 - #72 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.19 src/doc/CHANGES-9.0:1.1.2.20 --- src/doc/CHANGES-9.0:1.1.2.19 Fri Aug 16 02:09:21 2019 +++ src/doc/CHANGES-9.0 Fri Aug 16 19:29:16 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.19 2019/08/16 02:09:21 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.20 2019/08/16 19:29:16 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -1764,3 +1764,145 @@ sys/dev/wsfb/genfb.c1.68-1.70 depths. A lot of bug fixes, both major and minor. Dedup more than 20% of lines, or 50% of characters. [rin, ticket #56] +external/bsd/compiler_rt/Makefile 1.1 +external/bsd/compiler_rt/lib/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/include/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/include/xray/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/shlib_version 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/shlib_version 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64/shlib_version 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/gen_dynamic_list.sh 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/m32.mk 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/m64.mk 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/shared_deps.mk 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m32/shlib_version 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m64/shlib_version 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m32/shlib_version 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m64/shlib_version 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m32/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-basic-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-fdr-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile 1.1 +external/bsd/compiler_rt/lib/clang/sha
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Aug 16 19:29:16 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #58 - #72 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Aug 16 19:28:26 UTC 2019 Modified Files: src/distrib/sets/lists/comp [netbsd-9]: mi src/external/gpl3/gcc/usr.bin/include/sanitizer [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #72): distrib/sets/lists/comp/mi: revision 1.2281 external/gpl3/gcc/usr.bin/include/sanitizer/Makefile: revision 1.4 Ship with sanitizer/lsan_interface.h for GCC 7 Leak Sanitizer is there. To generate a diff of this commit: cvs rdiff -u -r1.2278.2.2 -r1.2278.2.3 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.3 -r1.3.2.1 \ src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile 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.2278.2.2 src/distrib/sets/lists/comp/mi:1.2278.2.3 --- src/distrib/sets/lists/comp/mi:1.2278.2.2 Fri Aug 16 19:23:52 2019 +++ src/distrib/sets/lists/comp/mi Fri Aug 16 19:28:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2278.2.2 2019/08/16 19:23:52 martin Exp $ +# $NetBSD: mi,v 1.2278.2.3 2019/08/16 19:28:26 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -2094,6 +2094,7 @@ ./usr/include/gcc-7/sanitizer/allocator_interface.h comp-gcc-include gcc=7 ./usr/include/gcc-7/sanitizer/asan_interface.h comp-gcc-include gcc=7 ./usr/include/gcc-7/sanitizer/common_interface_defs.h comp-gcc-include gcc=7 +./usr/include/gcc-7/sanitizer/lsan_interface.h comp-gcc-include gcc=7 ./usr/include/gcc-7/sanitizer/tsan_interface_atomic.h comp-gcc-include gcc=7 ./usr/include/gcc-7/stdatomic.h comp-gcc-include gcc=7 ./usr/include/gelf.hcomp-c-include Index: src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile diff -u src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile:1.3 src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile:1.3.2.1 --- src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile:1.3 Sun Aug 12 21:48:57 2018 +++ src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile Fri Aug 16 19:28:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/08/12 21:48:57 mrg Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2019/08/16 19:28:26 martin Exp $ .include "../../../Makefile.gcc_path" @@ -13,7 +13,7 @@ INCS+= allocator_interface.h INCS+= asan_interface.h INCS+= common_interface_defs.h #INCS+= dfsan_interface.h # not supported -#INCS+= lsan_interface.h # not supported +INCS+= lsan_interface.h #INCS+= msan_interface.h # not ready in GCC INCS+= tsan_interface_atomic.h
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Aug 16 19:28:26 UTC 2019 Modified Files: src/distrib/sets/lists/comp [netbsd-9]: mi src/external/gpl3/gcc/usr.bin/include/sanitizer [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #72): distrib/sets/lists/comp/mi: revision 1.2281 external/gpl3/gcc/usr.bin/include/sanitizer/Makefile: revision 1.4 Ship with sanitizer/lsan_interface.h for GCC 7 Leak Sanitizer is there. To generate a diff of this commit: cvs rdiff -u -r1.2278.2.2 -r1.2278.2.3 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.3 -r1.3.2.1 \ src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/tests/kernel
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:26:48 UTC 2019
Modified Files:
src/tests/kernel [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by kamil in ticket #71):
tests/kernel/Makefile: revision 1.61
Adapt tests/kernel/t_subr_prf for MKSANITIZER
Allow to rename snprintf-like functions to avoid clashes with a sanitizer.
This tests needs a fixup to remove 'undef symbol' from the test code
generator.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.60.2.1 src/tests/kernel/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/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.60 src/tests/kernel/Makefile:1.60.2.1
--- src/tests/kernel/Makefile:1.60 Fri Jun 7 21:18:16 2019
+++ src/tests/kernel/Makefile Fri Aug 16 19:26:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2019/06/07 21:18:16 christos Exp $
+# $NetBSD: Makefile,v 1.60.2.1 2019/08/16 19:26:48 martin Exp $
NOMAN= # defined
@@ -66,6 +66,11 @@ CPPFLAGS.subr_extent.c= -D_EXTENT_TESTIN
t_subr_prf.c: gen_t_subr_prf ${NETBSDSRCDIR}/sys/kern/subr_prf.c
${HOST_SH} ${.ALLSRC} ${.TARGET}
+.if ${MKSANITIZER:Uno} == "yes"
+ # These symbols will be redefined by MKSANITIZER
+ ${TOOL_SED} -i '/undef .*printf/d' ${.TARGET}
+.endif
+
CPPFLAGS.t_subr_prf.c= -Wno-pointer-sign # XXX platform vs kernel SHA2
.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
@@ -73,6 +78,14 @@ CPPFLAGS.t_subr_prf.c= -Wno-pointer-sign
CPPFLAGS.t_subr_prf.c+= -Wno-error=format-truncation
.endif
+SANITIZER_RENAME_CLASSES+= t_subr_prf
+SANITIZER_RENAME_FILES.t_subr_prf+= t_subr_prf.c
+SANITIZER_RENAME_SYMBOL.t_subr_prf+= snprintf
+SANITIZER_RENAME_SYMBOL.t_subr_prf+= vsnprintf
+SANITIZER_RENAME_SYMBOL.t_subr_prf+= sprintf
+SANITIZER_RENAME_SYMBOL.t_subr_prf+= vsnprintf
+SANITIZER_RENAME_SYMBOL.t_subr_prf+= vasprintf
+
CLEANFILES+= t_subr_prf.c
LDADD.h_segv+= -lm
CVS commit: [netbsd-9] src/tests/kernel
Module Name:src Committed By: martin Date: Fri Aug 16 19:26:48 UTC 2019 Modified Files: src/tests/kernel [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #71): tests/kernel/Makefile: revision 1.61 Adapt tests/kernel/t_subr_prf for MKSANITIZER Allow to rename snprintf-like functions to avoid clashes with a sanitizer. This tests needs a fixup to remove 'undef symbol' from the test code generator. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.60.2.1 src/tests/kernel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.sbin
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:25:32 UTC 2019
Modified Files:
src/usr.sbin/rpc.bootparamd [netbsd-9]: bootparamd.c
src/usr.sbin/rpc.lockd [netbsd-9]: lockd.c
src/usr.sbin/rpc.statd [netbsd-9]: statd.c
Log Message:
Pull up following revision(s) (requested by kamil in ticket #70):
usr.sbin/rpc.statd/statd.c: revision 1.33
usr.sbin/rpc.lockd/lockd.c: revision 1.13
usr.sbin/rpc.bootparamd/bootparamd.c: revision 1.47
Stop defining _rpcsvcdirty in bss and data
_rpcsvcdirty is already defined in the generated code from rpcgen(1).
Detected during the build with Address Sanitizer (MKSANITIZER).
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.44.1 src/usr.sbin/rpc.bootparamd/bootparamd.c
cvs rdiff -u -r1.12 -r1.12.34.1 src/usr.sbin/rpc.lockd/lockd.c
cvs rdiff -u -r1.32 -r1.32.6.1 src/usr.sbin/rpc.statd/statd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rpc.bootparamd/bootparamd.c
diff -u src/usr.sbin/rpc.bootparamd/bootparamd.c:1.46 src/usr.sbin/rpc.bootparamd/bootparamd.c:1.46.44.1
--- src/usr.sbin/rpc.bootparamd/bootparamd.c:1.46 Tue Aug 30 20:29:41 2011
+++ src/usr.sbin/rpc.bootparamd/bootparamd.c Fri Aug 16 19:25:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bootparamd.c,v 1.46 2011/08/30 20:29:41 joerg Exp $ */
+/* $NetBSD: bootparamd.c,v 1.46.44.1 2019/08/16 19:25:31 martin Exp $ */
/*
* This code is not copyright, and is placed in the public domain.
@@ -11,7 +11,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: bootparamd.c,v 1.46 2011/08/30 20:29:41 joerg Exp $");
+__RCSID("$NetBSD: bootparamd.c,v 1.46.44.1 2019/08/16 19:25:31 martin Exp $");
#endif
#include
@@ -55,7 +55,7 @@ static char domain_name[MAX_MACHINE_NAME
extern void bootparamprog_1(struct svc_req *, SVCXPRT *);
-int _rpcsvcdirty = 0;
+extern int _rpcsvcdirty;
int _rpcpmstart = 0;
int debug = 0;
int dolog = 0;
Index: src/usr.sbin/rpc.lockd/lockd.c
diff -u src/usr.sbin/rpc.lockd/lockd.c:1.12 src/usr.sbin/rpc.lockd/lockd.c:1.12.34.1
--- src/usr.sbin/rpc.lockd/lockd.c:1.12 Mon Aug 13 12:37:18 2012
+++ src/usr.sbin/rpc.lockd/lockd.c Fri Aug 16 19:25:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lockd.c,v 1.12 2012/08/13 12:37:18 wiz Exp $ */
+/* $NetBSD: lockd.c,v 1.12.34.1 2019/08/16 19:25:31 martin Exp $ */
/*
* Copyright (c) 1995
@@ -35,7 +35,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: lockd.c,v 1.12 2012/08/13 12:37:18 wiz Exp $");
+__RCSID("$NetBSD: lockd.c,v 1.12.34.1 2019/08/16 19:25:31 martin Exp $");
#endif
/*
@@ -67,7 +67,7 @@ __RCSID("$NetBSD: lockd.c,v 1.12 2012/08
#include
int debug_level = 0; /* 0 = no debugging syslog() calls */
-int _rpcsvcdirty = 0;
+extern int _rpcsvcdirty;
int grace_expired;
Index: src/usr.sbin/rpc.statd/statd.c
diff -u src/usr.sbin/rpc.statd/statd.c:1.32 src/usr.sbin/rpc.statd/statd.c:1.32.6.1
--- src/usr.sbin/rpc.statd/statd.c:1.32 Tue Jan 23 21:06:26 2018
+++ src/usr.sbin/rpc.statd/statd.c Fri Aug 16 19:25:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: statd.c,v 1.32 2018/01/23 21:06:26 sevan Exp $ */
+/* $NetBSD: statd.c,v 1.32.6.1 2019/08/16 19:25:31 martin Exp $ */
/*
* Copyright (c) 1995
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: statd.c,v 1.32 2018/01/23 21:06:26 sevan Exp $");
+__RCSID("$NetBSD: statd.c,v 1.32.6.1 2019/08/16 19:25:31 martin Exp $");
#endif
/* main() function for status monitor daemon. Some of the code in this */
@@ -66,7 +66,7 @@ __RCSID("$NetBSD: statd.c,v 1.32 2018/01
struct sigaction sa;
int debug = 0; /* Controls syslog() for debug msgs */
-int _rpcsvcdirty = 0; /* XXX ??? */
+extern int _rpcsvcdirty;
static DB *db; /* Database file */
Header status_info;
CVS commit: [netbsd-9] src/usr.sbin
Module Name:src Committed By: martin Date: Fri Aug 16 19:25:32 UTC 2019 Modified Files: src/usr.sbin/rpc.bootparamd [netbsd-9]: bootparamd.c src/usr.sbin/rpc.lockd [netbsd-9]: lockd.c src/usr.sbin/rpc.statd [netbsd-9]: statd.c Log Message: Pull up following revision(s) (requested by kamil in ticket #70): usr.sbin/rpc.statd/statd.c: revision 1.33 usr.sbin/rpc.lockd/lockd.c: revision 1.13 usr.sbin/rpc.bootparamd/bootparamd.c: revision 1.47 Stop defining _rpcsvcdirty in bss and data _rpcsvcdirty is already defined in the generated code from rpcgen(1). Detected during the build with Address Sanitizer (MKSANITIZER). To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.46.44.1 src/usr.sbin/rpc.bootparamd/bootparamd.c cvs rdiff -u -r1.12 -r1.12.34.1 src/usr.sbin/rpc.lockd/lockd.c cvs rdiff -u -r1.32 -r1.32.6.1 src/usr.sbin/rpc.statd/statd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:23:53 UTC 2019
Modified Files:
src/distrib/sets/lists/comp [netbsd-9]: mi
src/external/bsd/compiler_rt/lib/clang/include/sanitizer [netbsd-9]:
Makefile
Log Message:
Pull up following revision(s) (requested by kamil in ticket #69):
distrib/sets/lists/comp/mi: revision 1.2282
external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile: revision
1.2
Ship with sanitizer/lsan_interface.h for LLVM 7
Leak Sanitizer header is already needed in the distribution for built with
Address Sanitizer (MKSANITIZER):
- dist/llvm/utils/TableGen/TableGen.cpp
- dist/clang/utils/TableGen/TableGen.cpp
Next version of LLVM (9.0) will ship with LSan.
To generate a diff of this commit:
cvs rdiff -u -r1.2278.2.1 -r1.2278.2.2 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile
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.2278.2.1 src/distrib/sets/lists/comp/mi:1.2278.2.2
--- src/distrib/sets/lists/comp/mi:1.2278.2.1 Fri Aug 16 19:10:42 2019
+++ src/distrib/sets/lists/comp/mi Fri Aug 16 19:23:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2278.2.1 2019/08/16 19:10:42 martin Exp $
+# $NetBSD: mi,v 1.2278.2.2 2019/08/16 19:23:52 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.compcomp-sys-root
@@ -3301,6 +3301,7 @@
./usr/lib/clang/7.0.0/include/sanitizer/asan_interface.h comp-cxx-include llvm
./usr/lib/clang/7.0.0/include/sanitizer/common_interface_defs.h comp-cxx-include llvm
./usr/lib/clang/7.0.0/include/sanitizer/coverage_interface.h comp-cxx-include llvm
+./usr/lib/clang/7.0.0/include/sanitizer/lsan_interface.h comp-cxx-include llvm
./usr/lib/clang/7.0.0/include/sanitizer/msan_interface.h comp-cxx-include llvm
./usr/lib/clang/7.0.0/include/sanitizer/netbsd_syscall_hooks.h comp-cxx-include llvm
./usr/lib/clang/7.0.0/include/sanitizer/tsan_interface.h comp-cxx-include llvm
Index: src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile:1.2.2.2 src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile:1.2.2.3
--- src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile:1.2.2.2 Fri Aug 16 18:44:09 2019
+++ src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile Fri Aug 16 19:23:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.2.2 2019/08/16 18:44:09 martin Exp $
+# $NetBSD: Makefile,v 1.2.2.3 2019/08/16 19:23:53 martin Exp $
TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -13,7 +13,7 @@ INCS+= coverage_interface.h
#INCS+= dfsan_interface.h # not supported
#INCS+= esan_interface.h # not supported
#INCS+= hwasan_interface.h # not supported
-#INCS+= lsan_interface.h # not supported
+INCS+= lsan_interface.h
INCS+= msan_interface.h
INCS+= netbsd_syscall_hooks.h
#INCS+= scudo_interface.h # not ready
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Aug 16 19:23:53 UTC 2019 Modified Files: src/distrib/sets/lists/comp [netbsd-9]: mi src/external/bsd/compiler_rt/lib/clang/include/sanitizer [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #69): distrib/sets/lists/comp/mi: revision 1.2282 external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile: revision 1.2 Ship with sanitizer/lsan_interface.h for LLVM 7 Leak Sanitizer header is already needed in the distribution for built with Address Sanitizer (MKSANITIZER): - dist/llvm/utils/TableGen/TableGen.cpp - dist/clang/utils/TableGen/TableGen.cpp Next version of LLVM (9.0) will ship with LSan. To generate a diff of this commit: cvs rdiff -u -r1.2278.2.1 -r1.2278.2.2 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \ src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/mk
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:22:08 UTC 2019
Modified Files:
src/share/mk [netbsd-9]: bsd.prog.mk
Log Message:
Pull up following revision(s) (requested by kamil in ticket #68):
share/mk/bsd.prog.mk: revision 1.321
Add SANITIZER_RENAME_CLASSES in bsd.prog.mk
This adds a more flexible version of SANITIZER_RENAME_SYMBOL.
New symbol allows to specify MKSANITIZER specific renames on per-file and
per-symbol basis.
To generate a diff of this commit:
cvs rdiff -u -r1.319 -r1.319.2.1 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.319 src/share/mk/bsd.prog.mk:1.319.2.1
--- src/share/mk/bsd.prog.mk:1.319 Mon Jan 21 21:11:54 2019
+++ src/share/mk/bsd.prog.mk Fri Aug 16 19:22:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.319 2019/01/21 21:11:54 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.319.2.1 2019/08/16 19:22:08 martin Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -20,6 +20,16 @@ CPPFLAGS+= -D${_symbol}=__mksanitizer_${
. endfor
.endif
+.if ${MKSANITIZER:Uno} == "yes" && defined(SANITIZER_RENAME_CLASSES)
+. for _class in ${SANITIZER_RENAME_CLASSES}
+. for _file in ${SANITIZER_RENAME_FILES.${_class}}
+. for _symbol in ${SANITIZER_RENAME_SYMBOL.${_class}}
+COPTS.${_file}+= -D${_symbol}=__mksanitizer_${_symbol}
+. endfor
+. endfor
+. endfor
+.endif
+
#
# Definitions and targets shared among all programs built by a single
# Makefile.
CVS commit: [netbsd-9] src/share/mk
Module Name:src Committed By: martin Date: Fri Aug 16 19:22:08 UTC 2019 Modified Files: src/share/mk [netbsd-9]: bsd.prog.mk Log Message: Pull up following revision(s) (requested by kamil in ticket #68): share/mk/bsd.prog.mk: revision 1.321 Add SANITIZER_RENAME_CLASSES in bsd.prog.mk This adds a more flexible version of SANITIZER_RENAME_SYMBOL. New symbol allows to specify MKSANITIZER specific renames on per-file and per-symbol basis. To generate a diff of this commit: cvs rdiff -u -r1.319 -r1.319.2.1 src/share/mk/bsd.prog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.sbin/installboot
Module Name:src Committed By: martin Date: Fri Aug 16 19:20:46 UTC 2019 Modified Files: src/usr.sbin/installboot [netbsd-9]: installboot.h Log Message: Pull up following revision(s) (requested by kamil in ticket #67): usr.sbin/installboot/installboot.h: revision 1.41 Add missing extern declaration of ib_mach_emips in installboot Change added for the consistency with the existing code. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.2.1 src/usr.sbin/installboot/installboot.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.sbin/installboot
Module Name:src Committed By: martin Date: Fri Aug 16 19:20:46 UTC 2019 Modified Files: src/usr.sbin/installboot [netbsd-9]: installboot.h Log Message: Pull up following revision(s) (requested by kamil in ticket #67): usr.sbin/installboot/installboot.h: revision 1.41 Add missing extern declaration of ib_mach_emips in installboot Change added for the consistency with the existing code. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.2.1 src/usr.sbin/installboot/installboot.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.sbin/installboot/installboot.h diff -u src/usr.sbin/installboot/installboot.h:1.40 src/usr.sbin/installboot/installboot.h:1.40.2.1 --- src/usr.sbin/installboot/installboot.h:1.40 Tue May 7 05:02:42 2019 +++ src/usr.sbin/installboot/installboot.h Fri Aug 16 19:20:46 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: installboot.h,v 1.40 2019/05/07 05:02:42 thorpej Exp $ */ +/* $NetBSD: installboot.h,v 1.40.2.1 2019/08/16 19:20:46 martin Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -184,6 +184,7 @@ int ext2fs_findstage2(ib_params *, uint extern struct ib_mach ib_mach_alpha; extern struct ib_mach ib_mach_amd64; extern struct ib_mach ib_mach_amiga; +extern struct ib_mach ib_mach_emips; extern struct ib_mach ib_mach_evbarm; extern struct ib_mach ib_mach_ews4800mips; extern struct ib_mach ib_mach_hp300;
CVS commit: [netbsd-9] src/usr.sbin/ypserv/ypserv
Module Name:src Committed By: martin Date: Fri Aug 16 19:19:27 UTC 2019 Modified Files: src/usr.sbin/ypserv/ypserv [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #66): usr.sbin/ypserv/ypserv/Makefile: revision 1.19 Avoid symbol clashes in usr.sbin/ypserv/ypserv under MKSANITIZER Remove symbol conflicts for: gethostbyname2 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.48.1 src/usr.sbin/ypserv/ypserv/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.sbin/ypserv/ypserv
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:19:27 UTC 2019
Modified Files:
src/usr.sbin/ypserv/ypserv [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by kamil in ticket #66):
usr.sbin/ypserv/ypserv/Makefile: revision 1.19
Avoid symbol clashes in usr.sbin/ypserv/ypserv under MKSANITIZER
Remove symbol conflicts for: gethostbyname2
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.48.1 src/usr.sbin/ypserv/ypserv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ypserv/ypserv/Makefile
diff -u src/usr.sbin/ypserv/ypserv/Makefile:1.18 src/usr.sbin/ypserv/ypserv/Makefile:1.18.48.1
--- src/usr.sbin/ypserv/ypserv/Makefile:1.18 Thu Oct 29 14:41:02 2009
+++ src/usr.sbin/ypserv/ypserv/Makefile Fri Aug 16 19:19:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/10/29 14:41:02 christos Exp $
+# $NetBSD: Makefile,v 1.18.48.1 2019/08/16 19:19:27 martin Exp $
.include
@@ -18,4 +18,6 @@ DPADD+= ${LIBWRAP} ${LIBUTIL}
CPPFLAGS.gethnamaddr.c= -UYP -D_LIBC
CPPFLAGS.getnetnamadr.c=-UYP -D_LIBC
+SANITIZER_RENAME_SYMBOL+= gethostbyname2
+
.include
CVS commit: [netbsd-9] src/tests/bin/df
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:18:07 UTC 2019
Modified Files:
src/tests/bin/df [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by kamil in ticket #65):
tests/bin/df/Makefile: revision 1.2
Avoid symbol clashes in bin/df under MKSANITIZER
Remove symbol conflicts for: __getmntinfo13
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.36.1 src/tests/bin/df/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/bin/df/Makefile
diff -u src/tests/bin/df/Makefile:1.1 src/tests/bin/df/Makefile:1.1.36.1
--- src/tests/bin/df/Makefile:1.1 Sat Mar 17 16:33:11 2012
+++ src/tests/bin/df/Makefile Fri Aug 16 19:18:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+# $NetBSD: Makefile,v 1.1.36.1 2019/08/16 19:18:07 martin Exp $
NOMAN= # defined
@@ -24,4 +24,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/in
SRCS+= humanize_number.c
.endif
+SANITIZER_RENAME_SYMBOL+= __getmntinfo13
+
.include
CVS commit: [netbsd-9] src/tests/bin/df
Module Name:src Committed By: martin Date: Fri Aug 16 19:18:07 UTC 2019 Modified Files: src/tests/bin/df [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #65): tests/bin/df/Makefile: revision 1.2 Avoid symbol clashes in bin/df under MKSANITIZER Remove symbol conflicts for: __getmntinfo13 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.36.1 src/tests/bin/df/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/tests/fs/nfs/nfsservice
Module Name:src Committed By: martin Date: Fri Aug 16 19:16:59 UTC 2019 Modified Files: src/tests/fs/nfs/nfsservice [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #64): tests/fs/nfs/nfsservice/Makefile: revision 1.13 Avoid symbol clashes in fs/nfs/nfsservice under MKSANITIZER Remove symbol conflicts for: __getmntinfo13 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.16.1 src/tests/fs/nfs/nfsservice/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/tests/fs/nfs/nfsservice
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:16:59 UTC 2019
Modified Files:
src/tests/fs/nfs/nfsservice [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by kamil in ticket #64):
tests/fs/nfs/nfsservice/Makefile: revision 1.13
Avoid symbol clashes in fs/nfs/nfsservice under MKSANITIZER
Remove symbol conflicts for: __getmntinfo13
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.16.1 src/tests/fs/nfs/nfsservice/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/fs/nfs/nfsservice/Makefile
diff -u src/tests/fs/nfs/nfsservice/Makefile:1.12 src/tests/fs/nfs/nfsservice/Makefile:1.12.16.1
--- src/tests/fs/nfs/nfsservice/Makefile:1.12 Sat Aug 13 11:20:00 2016
+++ src/tests/fs/nfs/nfsservice/Makefile Fri Aug 16 19:16:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/13 11:20:00 christos Exp $
+# $NetBSD: Makefile,v 1.12.16.1 2019/08/16 19:16:59 martin Exp $
#
NOMAN= 1
@@ -48,4 +48,6 @@ CPPFLAGS+= -I${LIBRPCDIR} -DPORTMAP -DLI
LDADD+= -lwrap -lutil
DPADD+= ${LIBWRAP} ${LIBUTIL}
+SANITIZER_RENAME_SYMBOL+= __getmntinfo13
+
.include
CVS commit: [netbsd-9] src/tests/usr.bin/id
Module Name:src Committed By: martin Date: Fri Aug 16 19:15:45 UTC 2019 Modified Files: src/tests/usr.bin/id [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #63): tests/usr.bin/id/Makefile: revision 1.2 Avoid symbol clashes in tests/usr.bin/id under MKSANITIZER Remove symbol conflicts for: - __getpwnam50 - __getpwuid50 - getgrgid - getgrouplist - getgroups To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.36.1 src/tests/usr.bin/id/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/usr.bin/id/Makefile diff -u src/tests/usr.bin/id/Makefile:1.1 src/tests/usr.bin/id/Makefile:1.1.36.1 --- src/tests/usr.bin/id/Makefile:1.1 Sat Mar 17 16:33:14 2012 +++ src/tests/usr.bin/id/Makefile Fri Aug 16 19:15:45 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:14 jruoho Exp $ +# $NetBSD: Makefile,v 1.1.36.1 2019/08/16 19:15:45 martin Exp $ NOMAN= # defined @@ -17,4 +17,10 @@ SRCS= id.c pwgr.c COPTS.id.c += -Wno-format-nonliteral +SANITIZER_RENAME_SYMBOL+= __getpwnam50 +SANITIZER_RENAME_SYMBOL+= __getpwuid50 +SANITIZER_RENAME_SYMBOL+= getgrgid +SANITIZER_RENAME_SYMBOL+= getgrouplist +SANITIZER_RENAME_SYMBOL+= getgroups + .include
CVS commit: [netbsd-9] src/tests/usr.bin/id
Module Name:src Committed By: martin Date: Fri Aug 16 19:15:45 UTC 2019 Modified Files: src/tests/usr.bin/id [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #63): tests/usr.bin/id/Makefile: revision 1.2 Avoid symbol clashes in tests/usr.bin/id under MKSANITIZER Remove symbol conflicts for: - __getpwnam50 - __getpwuid50 - getgrgid - getgrouplist - getgroups To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.36.1 src/tests/usr.bin/id/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/tests/lib/libc/misc
Module Name:src Committed By: martin Date: Fri Aug 16 19:14:29 UTC 2019 Modified Files: src/tests/lib/libc/misc [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #62): tests/lib/libc/misc/Makefile: revision 1.4 Fix build of t_ubsan/t_ubsanxx under MKSANITIZER Do not link micro-ubsan runtime for disabled tests. This avoids double symbols linked into a single binary. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 src/tests/lib/libc/misc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/tests/lib/libc/misc
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:14:29 UTC 2019
Modified Files:
src/tests/lib/libc/misc [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by kamil in ticket #62):
tests/lib/libc/misc/Makefile: revision 1.4
Fix build of t_ubsan/t_ubsanxx under MKSANITIZER
Do not link micro-ubsan runtime for disabled tests.
This avoids double symbols linked into a single binary.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 src/tests/lib/libc/misc/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/libc/misc/Makefile
diff -u src/tests/lib/libc/misc/Makefile:1.3 src/tests/lib/libc/misc/Makefile:1.3.4.1
--- src/tests/lib/libc/misc/Makefile:1.3 Mon Feb 4 03:10:33 2019
+++ src/tests/lib/libc/misc/Makefile Fri Aug 16 19:14:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/02/04 03:10:33 mrg Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2019/08/16 19:14:29 martin Exp $
.include
@@ -8,13 +8,15 @@ TESTS_C+= t_ubsan
TESTS_CXX+= t_ubsanxx
.PATH: ${NETBSDSRCDIR}/common/lib/libc/misc
-SRCS.t_ubsan= t_ubsan.c ubsan.c
-SRCS.t_ubsanxx= t_ubsanxx.cpp ubsan.c
+SRCS.t_ubsan= t_ubsan.c
+SRCS.t_ubsanxx= t_ubsanxx.cpp
.if ${MKSANITIZER:Uno} != "yes" && ${MKLIBCSANITIZER:Uno} != "yes"
# These tests are designed to be used against micro-UBSan only.
# micro-UBSan is used in these tests as a standalone libary only.
CPPFLAGS+= -DENABLE_TESTS
+SRCS.t_ubsan+= ubsan.c
+SRCS.t_ubsanxx+= ubsan.c
UBSAN_FLAGS= -fsanitize=undefined
UBSAN_FLAGS+= ${${ACTIVE_CC} == "clang" :? -fsanitize=integer :}
UBSAN_FLAGS+= ${${ACTIVE_CC} == "clang" :? -fsanitize=nullability :}
CVS commit: [netbsd-9] src/libexec/telnetd
Module Name:src Committed By: martin Date: Fri Aug 16 19:12:46 UTC 2019 Modified Files: src/libexec/telnetd [netbsd-9]: sys_term.c telnetd.c Log Message: Pull up following revision(s) (requested by kamil in ticket #61): libexec/telnetd/telnetd.c: revision 1.56 libexec/telnetd/sys_term.c: revision 1.49 telnetd: Stop defining the same variables concurrently in bss and data auth_level and require_secure_login were defined in two places: - global.c that picked it from headers and removed 'extern' - telnetd.c that initialized it to 0 line was defined twice: in global.c and sys_term.c with a non-zero value. Remove the definition and initialization from sys_term.c and initialize the variable early in main(). Detected during the build of telned with Address Sanitizer (MKSANITIZER). Reviewed by To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.48.2.1 src/libexec/telnetd/sys_term.c cvs rdiff -u -r1.55 -r1.55.28.1 src/libexec/telnetd/telnetd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/libexec/telnetd
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:12:46 UTC 2019
Modified Files:
src/libexec/telnetd [netbsd-9]: sys_term.c telnetd.c
Log Message:
Pull up following revision(s) (requested by kamil in ticket #61):
libexec/telnetd/telnetd.c: revision 1.56
libexec/telnetd/sys_term.c: revision 1.49
telnetd: Stop defining the same variables concurrently in bss and data
auth_level and require_secure_login were defined in two places:
- global.c that picked it from headers and removed 'extern'
- telnetd.c that initialized it to 0
line was defined twice: in global.c and sys_term.c with a non-zero value.
Remove the definition and initialization from sys_term.c and initialize
the variable early in main().
Detected during the build of telned with Address Sanitizer (MKSANITIZER).
Reviewed by
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.2.1 src/libexec/telnetd/sys_term.c
cvs rdiff -u -r1.55 -r1.55.28.1 src/libexec/telnetd/telnetd.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/telnetd/sys_term.c
diff -u src/libexec/telnetd/sys_term.c:1.48 src/libexec/telnetd/sys_term.c:1.48.2.1
--- src/libexec/telnetd/sys_term.c:1.48 Thu Dec 13 04:29:18 2018
+++ src/libexec/telnetd/sys_term.c Fri Aug 16 19:12:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_term.c,v 1.48 2018/12/13 04:29:18 maya Exp $ */
+/* $NetBSD: sys_term.c,v 1.48.2.1 2019/08/16 19:12:46 martin Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: sys_term.c,v 1.48 2018/12/13 04:29:18 maya Exp $");
+__RCSID("$NetBSD: sys_term.c,v 1.48.2.1 2019/08/16 19:12:46 martin Exp $");
#endif
#endif /* not lint */
@@ -177,13 +177,6 @@ spcset(int func, cc_t *valp, cc_t **valp
*
* Returns the file descriptor of the opened pty.
*/
-#ifndef __GNUC__
-char *line = NULL16STR;
-#else
-static char Xline[] = NULL16STR;
-char *line = Xline;
-#endif
-
static int ptyslavefd; /* for cleanopen() */
Index: src/libexec/telnetd/telnetd.c
diff -u src/libexec/telnetd/telnetd.c:1.55 src/libexec/telnetd/telnetd.c:1.55.28.1
--- src/libexec/telnetd/telnetd.c:1.55 Thu Feb 27 18:20:21 2014
+++ src/libexec/telnetd/telnetd.c Fri Aug 16 19:12:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: telnetd.c,v 1.55 2014/02/27 18:20:21 joerg Exp $ */
+/* $NetBSD: telnetd.c,v 1.55.28.1 2019/08/16 19:12:46 martin Exp $ */
/*
* Copyright (C) 1997 and 1998 WIDE Project.
@@ -65,7 +65,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: telnetd.c,v 1.55 2014/02/27 18:20:21 joerg Exp $");
+__RCSID("$NetBSD: telnetd.c,v 1.55.28.1 2019/08/16 19:12:46 martin Exp $");
#endif
#endif /* not lint */
@@ -86,18 +86,10 @@ __RCSID("$NetBSD: telnetd.c,v 1.55 2014/
#include
#endif
-#ifdef AUTHENTICATION
-int auth_level = 0;
-#endif
-
#if defined(AUTHENTICATION) || defined(ENCRYPTION)
#include
#endif
-#ifdef SECURELOGIN
-int require_secure_login = 0;
-#endif
-
extern int require_hwpreauth;
#ifdef KRB5
extern krb5_context telnet_context;
@@ -164,6 +156,8 @@ struct sockaddr_storage from;
int
main(int argc, char *argv[])
{
+ static char Xline[] = NULL16STR;
+
socklen_t fromlen;
int on = 1;
int ch;
@@ -171,6 +165,8 @@ main(int argc, char *argv[])
int tos = -1;
#endif
+ line = Xline;
+
pfrontp = pbackp = ptyobuf;
netip = netibuf;
nfrontp = nbackp = netobuf;
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Aug 16 19:10:43 UTC 2019 Modified Files: src/distrib/sets/lists/base [netbsd-9]: md.amd64 mi src/distrib/sets/lists/comp [netbsd-9]: mi src/etc/mtree [netbsd-9]: NetBSD.dist.base src/external/bsd [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #60): distrib/sets/lists/comp/mi: revision 1.2280 external/bsd/Makefile: revision 1.64 distrib/sets/lists/base/mi: revision 1.1210 distrib/sets/lists/base/md.amd64: revision 1.278 etc/mtree/NetBSD.dist.base: revision 1.202 Add LLVM sanitizers in the MKLLVM=yes build Enable in all the supported variations for NetBSD/amd64: - Address Sanitizer - Thread Sanitizer - Memory Sanitizer - Undefined Behavior Sanitizer - SafeStack - libFuzzer - XRay This change enables the features on amd64 for start. To generate a diff of this commit: cvs rdiff -u -r1.277 -r1.277.2.1 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.1209 -r1.1209.2.1 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.2278 -r1.2278.2.1 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.200.2.1 -r1.200.2.2 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.63 -r1.63.2.1 src/external/bsd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Aug 16 19:10:43 UTC 2019 Modified Files: src/distrib/sets/lists/base [netbsd-9]: md.amd64 mi src/distrib/sets/lists/comp [netbsd-9]: mi src/etc/mtree [netbsd-9]: NetBSD.dist.base src/external/bsd [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #60): distrib/sets/lists/comp/mi: revision 1.2280 external/bsd/Makefile: revision 1.64 distrib/sets/lists/base/mi: revision 1.1210 distrib/sets/lists/base/md.amd64: revision 1.278 etc/mtree/NetBSD.dist.base: revision 1.202 Add LLVM sanitizers in the MKLLVM=yes build Enable in all the supported variations for NetBSD/amd64: - Address Sanitizer - Thread Sanitizer - Memory Sanitizer - Undefined Behavior Sanitizer - SafeStack - libFuzzer - XRay This change enables the features on amd64 for start. To generate a diff of this commit: cvs rdiff -u -r1.277 -r1.277.2.1 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.1209 -r1.1209.2.1 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.2278 -r1.2278.2.1 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.200.2.1 -r1.200.2.2 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.63 -r1.63.2.1 src/external/bsd/Makefile 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/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.277 src/distrib/sets/lists/base/md.amd64:1.277.2.1 --- src/distrib/sets/lists/base/md.amd64:1.277 Sun Nov 11 12:03:08 2018 +++ src/distrib/sets/lists/base/md.amd64 Fri Aug 16 19:10:42 2019 @@ -1,10 +1,56 @@ -# $NetBSD: md.amd64,v 1.277 2018/11/11 12:03:08 maxv Exp $ +# $NetBSD: md.amd64,v 1.277.2.1 2019/08/16 19:10:42 martin Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic ./usr/bin/fdformatbase-util-bin ./usr/bin/iasl base-util-bin ./usr/bin/pmc base-obsolete obsolete +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dd-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer_no_main-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan_cxx-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so co
CVS commit: [netbsd-9] src/sys/external/bsd/compiler_rt/dist/lib
Module Name:src Committed By: martin Date: Fri Aug 16 19:08:29 UTC 2019 Modified Files: src/sys/external/bsd/compiler_rt/dist/lib/asan [netbsd-9]: asan_posix.cc src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common [netbsd-9]: sanitizer_interceptors_ioctl_netbsd.inc sanitizer_platform_limits_netbsd.cc sanitizer_platform_limits_netbsd.h Log Message: Pull up following revision(s) (requested by kamil in ticket #59): sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h: revision 1.2 sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc: revision 1.2 sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc: revision 1.2 sys/external/bsd/compiler_rt/dist/lib/asan/asan_posix.cc: revision 1.2 Cherry-pick upstream compiler-rt patches for LLVM sanitizers Upstream no longer accepts patches for LLVM-8, therefore pull needed changes downstream. Enhancements: * resolved build failured with NetBSD 9.99.3 * ioctl(2) lists are synced with NetBSD 9.99.3 * fixes dynamic asan (-fsanitize=address -shared-libasa) crash on init commit 092068cd7429659138d6779a3072298462ad3e9c Author: Kamil Rytarowski Date: Wed Aug 7 21:56:43 2019 + Restrict the NetBSD ASan TSD fallback to !ASAN_DYNAMIC The fallback to the alternative implementation of TSD with TLS is only needed for the static version of ASan for NetBSD. The same code cannot be reused for the dynamic version of ASan as TLS breaks and TSD code works. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@368219 91177308-0d34-0410-b5e6-96231b3b80d8 commit 0bd9d23c4317d5d1c440e19892e178a29c9fe7be Author: Kamil Rytarowski Date: Thu Aug 8 02:21:44 2019 + Sync ioctl(2) list with NetBSD 9.99.3 Register 36 new ioctl(2) calls. Enable NVMM for amd64 as the API has been stabilized. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@368247 91177308-0d34-0410-b5e6-96231b3b80d8 commit 08d3c10606f09a4545487e9c3fad919ee396e3a6 Author: Tom Stellard Date: Wed May 15 20:29:49 2019 + Merging r360212: r360212 | kamil | 2019-05-07 17:44:41 -0700 (Tue, 07 May 2019) | 6 lines Fix build on NetBSD 8.99.38 With recent changes the dev/nvmm/nvmm_ioctl.h header is no longer a standalone NVMM header. Disable it until the NVMM operations will stabilize and be included in the ioctl(2) interceptors. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_80@360811 91177308-0d34-0410-b5e6-96231b3b80d8 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \ src/sys/external/bsd/compiler_rt/dist/lib/asan/asan_posix.cc cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \ src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc \ src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc \ src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/external/bsd/compiler_rt/dist/lib
Module Name:src
Committed By: martin
Date: Fri Aug 16 19:08:29 UTC 2019
Modified Files:
src/sys/external/bsd/compiler_rt/dist/lib/asan [netbsd-9]:
asan_posix.cc
src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common [netbsd-9]:
sanitizer_interceptors_ioctl_netbsd.inc
sanitizer_platform_limits_netbsd.cc
sanitizer_platform_limits_netbsd.h
Log Message:
Pull up following revision(s) (requested by kamil in ticket #59):
sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h:
revision 1.2
sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc:
revision 1.2
sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:
revision 1.2
sys/external/bsd/compiler_rt/dist/lib/asan/asan_posix.cc: revision 1.2
Cherry-pick upstream compiler-rt patches for LLVM sanitizers
Upstream no longer accepts patches for LLVM-8, therefore pull needed changes
downstream.
Enhancements:
* resolved build failured with NetBSD 9.99.3
* ioctl(2) lists are synced with NetBSD 9.99.3
* fixes dynamic asan (-fsanitize=address -shared-libasa) crash on init
commit 092068cd7429659138d6779a3072298462ad3e9c
Author: Kamil Rytarowski
Date: Wed Aug 7 21:56:43 2019 +
Restrict the NetBSD ASan TSD fallback to !ASAN_DYNAMIC
The fallback to the alternative implementation of TSD with TLS
is only needed for the static version of ASan for NetBSD.
The same code cannot be reused for the dynamic version of ASan as
TLS breaks and TSD code works.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@368219
91177308-0d34-0410-b5e6-96231b3b80d8
commit 0bd9d23c4317d5d1c440e19892e178a29c9fe7be
Author: Kamil Rytarowski
Date: Thu Aug 8 02:21:44 2019 +
Sync ioctl(2) list with NetBSD 9.99.3
Register 36 new ioctl(2) calls.
Enable NVMM for amd64 as the API has been stabilized.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@368247
91177308-0d34-0410-b5e6-96231b3b80d8
commit 08d3c10606f09a4545487e9c3fad919ee396e3a6
Author: Tom Stellard
Date: Wed May 15 20:29:49 2019 +
Merging r360212:
r360212 | kamil | 2019-05-07 17:44:41 -0700 (Tue, 07 May 2019) | 6 lines
Fix build on NetBSD 8.99.38
With recent changes the dev/nvmm/nvmm_ioctl.h header is no longer
a standalone NVMM header. Disable it until the NVMM operations will
stabilize and be included in the ioctl(2) interceptors.
git-svn-id:
https://llvm.org/svn/llvm-project/compiler-rt/branches/release_80@360811
91177308-0d34-0410-b5e6-96231b3b80d8
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \
src/sys/external/bsd/compiler_rt/dist/lib/asan/asan_posix.cc
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \
src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
\
src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
\
src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.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/external/bsd/compiler_rt/dist/lib/asan/asan_posix.cc
diff -u src/sys/external/bsd/compiler_rt/dist/lib/asan/asan_posix.cc:1.1.1.1 src/sys/external/bsd/compiler_rt/dist/lib/asan/asan_posix.cc:1.1.1.1.8.1
--- src/sys/external/bsd/compiler_rt/dist/lib/asan/asan_posix.cc:1.1.1.1 Tue Jan 8 05:40:28 2019
+++ src/sys/external/bsd/compiler_rt/dist/lib/asan/asan_posix.cc Fri Aug 16 19:08:29 2019
@@ -40,8 +40,8 @@ void AsanOnDeadlySignal(int signo, void
// -- TSD {{{1
-#if SANITIZER_NETBSD || SANITIZER_FREEBSD
-// Thread Static Data cannot be used in early init on NetBSD and FreeBSD.
+#if (SANITIZER_NETBSD && !ASAN_DYNAMIC) || SANITIZER_FREEBSD
+// Thread Static Data cannot be used in early static ASan init on NetBSD.
// Reuse the Asan TSD API for compatibility with existing code
// with an alternative implementation.
Index: src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
diff -u src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.1.1.1 src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.1.1.1.8.1
--- src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.1.1.1 Tue Jan 8 05:40:29 2019
+++ src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc Fri Aug 16 19:08:29 2019
@@ -25,7 +25,7 @@ struct io
CVS commit: [netbsd-9] src/external/bsd/compiler_rt
Module Name:src Committed By: martin Date: Fri Aug 16 18:44:10 UTC 2019 Added Files: src/external/bsd/compiler_rt [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/include [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/include/sanitizer [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/include/xray [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd [netbsd-9]: Makefile common.mk gen_dynamic_list.sh m32.mk m64.mk shared_deps.mk sources.mk syms.mk src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m32 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m64 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m32 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m64 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-basic-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-fdr-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/share [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #58): external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64/Makefile: revision 1.1 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/shlib_version: revision 1.1 external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile: revision 1.1 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/Makefile: revision 1.1 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile: revisio
CVS commit: [netbsd-9] src/external/bsd/compiler_rt
Module Name:src Committed By: martin Date: Fri Aug 16 18:44:10 UTC 2019 Added Files: src/external/bsd/compiler_rt [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/include [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/include/sanitizer [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/include/xray [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd [netbsd-9]: Makefile common.mk gen_dynamic_list.sh m32.mk m64.mk shared_deps.mk sources.mk syms.mk src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m32 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m64 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m32 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m64 [netbsd-9]: Makefile shlib_version src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-basic-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-fdr-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/share [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #58): external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64/Makefile: revision 1.1 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/shlib_version: revision 1.1 external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile: revision 1.1 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/Makefile: revision 1.1 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile: revisio
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Aug 16 15:40:00 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1337 and #1338 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.25 src/doc/CHANGES-8.2:1.1.2.26 --- src/doc/CHANGES-8.2:1.1.2.25 Tue Aug 13 14:30:50 2019 +++ src/doc/CHANGES-8.2 Fri Aug 16 15:39:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.25 2019/08/13 14:30:50 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.26 2019/08/16 15:39:59 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -571,3 +571,20 @@ sys/arch/i386/stand/lib/bootinfo_biosgeo Fix buffer overflow in BIOS disk geometry collection for bootinfo. [manu, ticket #1336] +sys/dev/acpi/acpi_ec.c1.76,1.77 + + Fix a bug that acpiec_space_handler() doesn't access more than 64bit + correctly. + [msaitoh, ticket #1337] + +sys/arch/x86/include/cacheinfo.h 1.27,1.28 +sys/arch/x86/x86/identcpu.c 1.74,1.93 +sys/arch/x86/include/specialreg.h 1.150 +usr.sbin/cpuctl/arch/i386.c 1.104 + + - Handle more Vortex CPU's from Andrius V. + - AMD CPUID Fn8000_0001d Cache Topology Information leaf is almost the + same as Intel Deterministic Cache Parameter Leaf(0x04), so make new + cpu_dcp_cacheinfo() and use it on both Intel and AMD. + [msaitoh, ticket #1338] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Aug 16 15:40:00 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1337 and #1338 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Fri Aug 16 15:36:17 UTC 2019
Modified Files:
src/sys/arch/x86/include [netbsd-8]: cacheinfo.h specialreg.h
src/sys/arch/x86/x86 [netbsd-8]: identcpu.c
src/usr.sbin/cpuctl/arch [netbsd-8]: i386.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1338):
usr.sbin/cpuctl/arch/i386.c: revision 1.104
sys/arch/x86/x86/identcpu.c: revision 1.93
sys/arch/x86/include/cacheinfo.h: revision 1.28
sys/arch/x86/include/specialreg.h: revision 1.150
- AMD CPUID Fn8000_0001d Cache Topology Information leaf is almost the same as
Intel Deterministic Cache Parameter Leaf(0x04), so make new
cpu_dcp_cacheinfo() and share it.
- AMD's L2 and L3's cache descriptor's definition is the same, so use one
common definition.
- KNF.
XXX Split some common functions to new identcpu_subr.c or use #ifdef _KERNEK
... #endif in identcpu.c to share from both kernel and cpuctl?
To generate a diff of this commit:
cvs rdiff -u -r1.22.10.3 -r1.22.10.4 src/sys/arch/x86/include/cacheinfo.h
cvs rdiff -u -r1.98.2.14 -r1.98.2.15 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.55.2.8 -r1.55.2.9 src/sys/arch/x86/x86/identcpu.c
cvs rdiff -u -r1.74.6.6 -r1.74.6.7 src/usr.sbin/cpuctl/arch/i386.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/include/cacheinfo.h
diff -u src/sys/arch/x86/include/cacheinfo.h:1.22.10.3 src/sys/arch/x86/include/cacheinfo.h:1.22.10.4
--- src/sys/arch/x86/include/cacheinfo.h:1.22.10.3 Fri Aug 16 15:28:38 2019
+++ src/sys/arch/x86/include/cacheinfo.h Fri Aug 16 15:36:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cacheinfo.h,v 1.22.10.3 2019/08/16 15:28:38 martin Exp $ */
+/* $NetBSD: cacheinfo.h,v 1.22.10.4 2019/08/16 15:36:17 martin Exp $ */
#ifndef _X86_CACHEINFO_H_
#define _X86_CACHEINFO_H_
@@ -339,7 +339,7 @@ __CI_TBL(CAI_PREFETCH, 0xf1,0,
__CI_TBL(0, 0,0, 0, 0, NULL) \
}
-#define AMD_L2CACHE_INFO { \
+#define AMD_L2L3CACHE_INFO { \
__CI_TBL(0, 0x01,1, 0, 0, NULL), \
__CI_TBL(0, 0x02,2, 0, 0, NULL), \
__CI_TBL(0, 0x03,3, 0, 0, NULL), \
@@ -347,22 +347,7 @@ __CI_TBL(0, 0x04,4, 0, 0, NULL), \
__CI_TBL(0, 0x05,6, 0, 0, NULL), \
__CI_TBL(0, 0x06,8, 0, 0, NULL), \
__CI_TBL(0, 0x08, 16, 0, 0, NULL), \
-__CI_TBL(0, 0x0a, 32, 0, 0, NULL), \
-__CI_TBL(0, 0x0b, 48, 0, 0, NULL), \
-__CI_TBL(0, 0x0c, 64, 0, 0, NULL), \
-__CI_TBL(0, 0x0d, 96, 0, 0, NULL), \
-__CI_TBL(0, 0x0e, 128, 0, 0, NULL), \
-__CI_TBL(0, 0x0f, 0xff, 0, 0, NULL), \
-__CI_TBL(0, 0x00,0, 0, 0, NULL) \
-}
-
-#define AMD_L3CACHE_INFO { \
-__CI_TBL(0, 0x01,1, 0, 0, NULL), \
-__CI_TBL(0, 0x02,2, 0, 0, NULL), \
-__CI_TBL(0, 0x04,4, 0, 0, NULL), \
-__CI_TBL(0, 0x06,8, 0, 0, NULL), \
-__CI_TBL(0, 0x08, 16, 0, 0, NULL), \
-__CI_TBL(0, 0x09, 16, 0, 0, NULL), \
+/* 0x09:Use Fn8000_001D */ \
__CI_TBL(0, 0x0a, 32, 0, 0, NULL), \
__CI_TBL(0, 0x0b, 48, 0, 0, NULL), \
__CI_TBL(0, 0x0c, 64, 0, 0, NULL), \
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.98.2.14 src/sys/arch/x86/include/specialreg.h:1.98.2.15
--- src/sys/arch/x86/include/specialreg.h:1.98.2.14 Wed Jul 17 15:37:33 2019
+++ src/sys/arch/x86/include/specialreg.h Fri Aug 16 15:36:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.98.2.14 2019/07/17 15:37:33 martin Exp $ */
+/* $NetBSD: specialreg.h,v 1.98.2.15 2019/08/16 15:36:17 martin Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -689,6 +689,14 @@
"\21" "VGIF"
/*
+ * AMD Fn8000_0001d Cache Topology Information.
+ * It's almost the same as Intel Deterministic Cache Parameter Leaf(0x04)
+ * except the following:
+ * No Cores/package (%eax bit 31..26)
+ * No Complex cache indexing (%edx bit 2)
+ */
+
+/*
* Centaur Extended Feature flags
*/
#define CPUID_VIA_HAS_RNG 0x0004 /* Random number generator */
Index: src/sys/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.55.2.8 src/sys/arch/x86/x86/identcpu.c:1.55.2.9
--- src/sys/arch/x86/x86/identcpu.c:1.55.2.8 Fri Aug 16 15:28:38 2019
+++ src/sys/arch/x86/x86/identcpu.c Fri Aug 16 15:36:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: identcpu.c,v 1.55.2.8 2019/08/16 15:28:38 martin Exp $ */
+/* $NetBSD: identcpu.c,v 1.55.2.9 2019/08/16 15:36:17 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.55.2.8 2019/08/16 15:28:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.55.2.9 2019/08/16 15:36:17 martin Exp $");
#include "opt_xen.h"
@@ -62,11 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: identcpu.c,v
static const struct x86_cache_info intel_cpuid_cache_info[] = INTEL_CACHE_INFO;
-static const
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Fri Aug 16 15:36:17 UTC 2019 Modified Files: src/sys/arch/x86/include [netbsd-8]: cacheinfo.h specialreg.h src/sys/arch/x86/x86 [netbsd-8]: identcpu.c src/usr.sbin/cpuctl/arch [netbsd-8]: i386.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1338): usr.sbin/cpuctl/arch/i386.c: revision 1.104 sys/arch/x86/x86/identcpu.c: revision 1.93 sys/arch/x86/include/cacheinfo.h: revision 1.28 sys/arch/x86/include/specialreg.h: revision 1.150 - AMD CPUID Fn8000_0001d Cache Topology Information leaf is almost the same as Intel Deterministic Cache Parameter Leaf(0x04), so make new cpu_dcp_cacheinfo() and share it. - AMD's L2 and L3's cache descriptor's definition is the same, so use one common definition. - KNF. XXX Split some common functions to new identcpu_subr.c or use #ifdef _KERNEK ... #endif in identcpu.c to share from both kernel and cpuctl? To generate a diff of this commit: cvs rdiff -u -r1.22.10.3 -r1.22.10.4 src/sys/arch/x86/include/cacheinfo.h cvs rdiff -u -r1.98.2.14 -r1.98.2.15 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.55.2.8 -r1.55.2.9 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.74.6.6 -r1.74.6.7 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/x86
Module Name:src Committed By: martin Date: Fri Aug 16 15:28:38 UTC 2019 Modified Files: src/sys/arch/x86/include [netbsd-8]: cacheinfo.h src/sys/arch/x86/x86 [netbsd-8]: identcpu.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1338): sys/arch/x86/include/cacheinfo.h: revision 1.27 sys/arch/x86/x86/identcpu.c: revision 1.74 Handle more Vortex CPU's from Andrius V. While here refactor the code to make it smaller. - It seems that AMD zen2's CPUID 0x8006 leaf's spec has changed. The EDX register's acsociativity field has 9. In the latest available document, it's a reserved value. I have no access to zen2's document, but many websites say that the acsociativity is 16. Add it. - - AMD CPUID Fn8000_0001d Cache Topology Information leaf is almost the same as Intel Deterministic Cache Parameter Leaf(0x04), so make new cpu_dcp_cacheinfo() and share it. - AMD's L2 and L3's cache descriptor's definition is the same, so use one common definition. - KNF. XXX Split some common functions to new identcpu_subr.c or use #ifdef _KERNEK ... #endif in identcpu.c to share from both kernel and cpuctl? To generate a diff of this commit: cvs rdiff -u -r1.22.10.2 -r1.22.10.3 src/sys/arch/x86/include/cacheinfo.h cvs rdiff -u -r1.55.2.7 -r1.55.2.8 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/x86
Module Name:src
Committed By: martin
Date: Fri Aug 16 15:28:38 UTC 2019
Modified Files:
src/sys/arch/x86/include [netbsd-8]: cacheinfo.h
src/sys/arch/x86/x86 [netbsd-8]: identcpu.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1338):
sys/arch/x86/include/cacheinfo.h: revision 1.27
sys/arch/x86/x86/identcpu.c: revision 1.74
Handle more Vortex CPU's from Andrius V.
While here refactor the code to make it smaller.
-
It seems that AMD zen2's CPUID 0x8006 leaf's spec has changed.
The EDX register's acsociativity field has 9. In the latest available document,
it's a reserved value. I have no access to zen2's document, but many websites
say that the acsociativity is 16. Add it.
-
- AMD CPUID Fn8000_0001d Cache Topology Information leaf is almost the same as
Intel Deterministic Cache Parameter Leaf(0x04), so make new
cpu_dcp_cacheinfo() and share it.
- AMD's L2 and L3's cache descriptor's definition is the same, so use one
common definition.
- KNF.
XXX Split some common functions to new identcpu_subr.c or use #ifdef _KERNEK
... #endif in identcpu.c to share from both kernel and cpuctl?
To generate a diff of this commit:
cvs rdiff -u -r1.22.10.2 -r1.22.10.3 src/sys/arch/x86/include/cacheinfo.h
cvs rdiff -u -r1.55.2.7 -r1.55.2.8 src/sys/arch/x86/x86/identcpu.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/include/cacheinfo.h
diff -u src/sys/arch/x86/include/cacheinfo.h:1.22.10.2 src/sys/arch/x86/include/cacheinfo.h:1.22.10.3
--- src/sys/arch/x86/include/cacheinfo.h:1.22.10.2 Mon Apr 9 18:04:32 2018
+++ src/sys/arch/x86/include/cacheinfo.h Fri Aug 16 15:28:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cacheinfo.h,v 1.22.10.2 2018/04/09 18:04:32 martin Exp $ */
+/* $NetBSD: cacheinfo.h,v 1.22.10.3 2019/08/16 15:28:38 martin Exp $ */
#ifndef _X86_CACHEINFO_H_
#define _X86_CACHEINFO_H_
@@ -362,6 +362,7 @@ __CI_TBL(0, 0x02,2, 0, 0, NULL), \
__CI_TBL(0, 0x04,4, 0, 0, NULL), \
__CI_TBL(0, 0x06,8, 0, 0, NULL), \
__CI_TBL(0, 0x08, 16, 0, 0, NULL), \
+__CI_TBL(0, 0x09, 16, 0, 0, NULL), \
__CI_TBL(0, 0x0a, 32, 0, 0, NULL), \
__CI_TBL(0, 0x0b, 48, 0, 0, NULL), \
__CI_TBL(0, 0x0c, 64, 0, 0, NULL), \
Index: src/sys/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.55.2.7 src/sys/arch/x86/x86/identcpu.c:1.55.2.8
--- src/sys/arch/x86/x86/identcpu.c:1.55.2.7 Wed Jun 12 10:17:32 2019
+++ src/sys/arch/x86/x86/identcpu.c Fri Aug 16 15:28:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: identcpu.c,v 1.55.2.7 2019/06/12 10:17:32 martin Exp $ */
+/* $NetBSD: identcpu.c,v 1.55.2.8 2019/08/16 15:28:38 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.55.2.7 2019/06/12 10:17:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.55.2.8 2019/08/16 15:28:38 martin Exp $");
#include "opt_xen.h"
@@ -707,24 +707,18 @@ cpu_probe_vortex86(struct cpu_info *ci)
outl(PCI_MODE1_ADDRESS_REG, PCI_MODE1_ENABLE | 0x90);
reg = inl(PCI_MODE1_DATA_REG);
- switch(reg) {
- case 0x31504d44:
- strcpy(cpu_brand_string, "Vortex86SX");
- break;
- case 0x32504d44:
- strcpy(cpu_brand_string, "Vortex86DX");
- break;
- case 0x33504d44:
- strcpy(cpu_brand_string, "Vortex86MX");
- break;
- case 0x37504d44:
- strcpy(cpu_brand_string, "Vortex86EX");
- break;
- default:
- strcpy(cpu_brand_string, "Unknown Vortex86");
- break;
+ if ((reg & 0xf8ff) != 0x30504d44) {
+ reg = 0;
+ } else {
+ reg = (reg >> 24) & 7;
}
+ static const char *cpu_vortex86_flavor[] = {
+ "??", "SX", "DX", "MX", "DX2", "MX+", "DX3", "EX",
+ };
+ snprintf(cpu_brand_string, sizeof(cpu_brand_string), "Vortex86%s",
+ cpu_vortex86_flavor[reg]);
+
#undef PCI_MODE1_ENABLE
#undef PCI_MODE1_ADDRESS_REG
#undef PCI_MODE1_DATA_REG
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Aug 16 15:24:09 UTC 2019 Modified Files: src/sys/dev/mii: etphy.c Log Message: >From FreeBSD: - Support ET1011. - Use mii_phy_flowstatus() to reflect flow status from negotiated result. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/mii/etphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Fri Aug 16 15:24:09 UTC 2019
Modified Files:
src/sys/dev/mii: etphy.c
Log Message:
>From FreeBSD:
- Support ET1011.
- Use mii_phy_flowstatus() to reflect flow status from negotiated result.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/mii/etphy.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/mii/etphy.c
diff -u src/sys/dev/mii/etphy.c:1.5 src/sys/dev/mii/etphy.c:1.6
--- src/sys/dev/mii/etphy.c:1.5 Fri Aug 16 15:17:31 2019
+++ src/sys/dev/mii/etphy.c Fri Aug 16 15:24:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: etphy.c,v 1.5 2019/08/16 15:17:31 msaitoh Exp $ */
+/* $NetBSD: etphy.c,v 1.6 2019/08/16 15:24:09 msaitoh Exp $ */
/* $OpenBSD: etphy.c,v 1.4 2008/04/02 20:12:58 brad Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: etphy.c,v 1.5 2019/08/16 15:17:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: etphy.c,v 1.6 2019/08/16 15:24:09 msaitoh Exp $");
#include
#include
@@ -89,6 +89,7 @@ static const struct mii_phy_funcs etphy_
static const struct mii_phydesc etphys[] = {
MII_PHY_DESC(AGERE, ET1011),
+ MII_PHY_DESC(AGERE, ET1011C),
MII_PHY_END,
};
@@ -258,6 +259,11 @@ etphy_reset(struct mii_softc *sc)
uint16_t reg;
int i;
+ if (sc->mii_mpd_model == MII_MODEL_AGERE_ET1011) {
+ mii_phy_reset(sc);
+ return;
+ }
+
for (i = 0; i < 2; ++i) {
PHY_READ(sc, MII_PHYIDR1, ®);
PHY_READ(sc, MII_PHYIDR2, ®);
@@ -339,7 +345,7 @@ etphy_status(struct mii_softc *sc)
}
if (sr & ETPHY_SR_FDX)
- mii->mii_media_active |= IFM_FDX;
+ mii->mii_media_active |= IFM_FDX | mii_phy_flowstatus(sc);
else
mii->mii_media_active |= IFM_HDX;
}
CVS commit: [netbsd-8] src/sys/dev/acpi
Module Name:src
Committed By: martin
Date: Fri Aug 16 15:24:41 UTC 2019
Modified Files:
src/sys/dev/acpi [netbsd-8]: acpi_ec.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1337):
sys/dev/acpi/acpi_ec.c: revision 1.76
sys/dev/acpi/acpi_ec.c: revision 1.77
- Fix a bug that acpiec_space_handler() doesn't access more than 64bit
correctly. Found by kUBSan on Thinkpad X220. acpiec0 accessed 128bits from
address 0xa0. The error message was:
UBSan: Undefined Behavior in ../../../../dev/acpi/acpi_ec.c:672:32,
shift exponent 64 is too large for 64-bit type 'long unsigned int'
- KNF.
- Make the case that width < 8 behave as the same as before. Pointed out by
Joerg.
- Change "switch" to "if" for simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.75.6.1 src/sys/dev/acpi/acpi_ec.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/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.75 src/sys/dev/acpi/acpi_ec.c:1.75.6.1
--- src/sys/dev/acpi/acpi_ec.c:1.75 Sat Mar 11 08:26:23 2017
+++ src/sys/dev/acpi/acpi_ec.c Fri Aug 16 15:24:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.75 2017/03/11 08:26:23 tsutsui Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.75.6.1 2019/08/16 15:24:41 martin Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger .
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.75 2017/03/11 08:26:23 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.75.6.1 2019/08/16 15:24:41 martin Exp $");
#include
#include
@@ -404,6 +404,7 @@ post_data_map:
static bool
acpiec_suspend(device_t dv, const pmf_qual_t *qual)
{
+
acpiec_cold = true;
return true;
@@ -412,6 +413,7 @@ acpiec_suspend(device_t dv, const pmf_qu
static bool
acpiec_resume(device_t dv, const pmf_qual_t *qual)
{
+
acpiec_cold = false;
return true;
@@ -454,9 +456,10 @@ acpiec_parse_gpe_package(device_t self,
ACPI_FREE(p);
return false;
}
-
+
if (p->Package.Count != 2) {
- aprint_error_dev(self, "_GPE package does not contain 2 elements\n");
+ aprint_error_dev(self,
+ "_GPE package does not contain 2 elements\n");
ACPI_FREE(p);
return false;
}
@@ -511,6 +514,7 @@ static ACPI_STATUS
acpiec_space_setup(ACPI_HANDLE region, uint32_t func, void *arg,
void **region_arg)
{
+
if (func == ACPI_REGION_DEACTIVATE)
*region_arg = NULL;
else
@@ -528,9 +532,11 @@ acpiec_lock(device_t dv)
mutex_enter(&sc->sc_access_mtx);
if (sc->sc_need_global_lock) {
- rv = AcpiAcquireGlobalLock(EC_LOCK_TIMEOUT, &sc->sc_global_lock);
+ rv = AcpiAcquireGlobalLock(EC_LOCK_TIMEOUT,
+ &sc->sc_global_lock);
if (rv != AE_OK) {
- aprint_error_dev(dv, "failed to acquire global lock: %s\n",
+ aprint_error_dev(dv,
+ "failed to acquire global lock: %s\n",
AcpiFormatException(rv));
return;
}
@@ -546,7 +552,8 @@ acpiec_unlock(device_t dv)
if (sc->sc_need_global_lock) {
rv = AcpiReleaseGlobalLock(sc->sc_global_lock);
if (rv != AE_OK) {
- aprint_error_dev(dv, "failed to release global lock: %s\n",
+ aprint_error_dev(dv,
+ "failed to release global lock: %s\n",
AcpiFormatException(rv));
}
}
@@ -587,7 +594,8 @@ acpiec_read(device_t dv, uint8_t addr, u
} else if (cv_timedwait(&sc->sc_cv, &sc->sc_mtx, EC_CMD_TIMEOUT * hz)) {
mutex_exit(&sc->sc_mtx);
acpiec_unlock(dv);
- aprint_error_dev(dv, "command takes over %d sec...\n", EC_CMD_TIMEOUT);
+ aprint_error_dev(dv,
+ "command takes over %d sec...\n", EC_CMD_TIMEOUT);
return AE_ERROR;
}
@@ -634,7 +642,8 @@ acpiec_write(device_t dv, uint8_t addr,
} else if (cv_timedwait(&sc->sc_cv, &sc->sc_mtx, EC_CMD_TIMEOUT * hz)) {
mutex_exit(&sc->sc_mtx);
acpiec_unlock(dv);
- aprint_error_dev(dv, "command takes over %d sec...\n", EC_CMD_TIMEOUT);
+ aprint_error_dev(dv,
+ "command takes over %d sec...\n", EC_CMD_TIMEOUT);
return AE_ERROR;
}
@@ -648,42 +657,36 @@ static ACPI_STATUS
acpiec_space_handler(uint32_t func, ACPI_PHYSICAL_ADDRESS paddr,
uint32_t width, ACPI_INTEGER *value, void *arg, void *region_arg)
{
- device_t dv;
+ device_t dv = arg;
ACPI_STATUS rv;
- uint8_t addr, reg;
- unsigned int i;
+ uint8_t addr;
+ uint8_t *reg;
+ if ((func != ACPI_READ) && (func != ACPI_WRITE)) {
+ aprint_error("%s: invalid Address Space function called: %x\n",
+ device_xname(dv), (unsigned int)func);
+ return AE_BAD_PARAMETER;
+ }
if (paddr > 0xff || width % 8 != 0 || value == NULL || arg == NULL ||
paddr + width / 8 > 0x100)
return AE_BAD_PARAMETER;
addr = paddr;
- dv = arg;
+ reg = (uint8_t *)value;
rv = AE_OK;
- switch (func) {
- case ACPI_READ:
+ if (func == ACPI_READ)
*value = 0;
- for (i = 0; i < width; i += 8, ++addr) {
- rv = acpiec_read(dv, addr, ®);
- if (rv != AE_OK)
-break;
- *value |= (ACPI_INTEGER)reg <<
CVS commit: [netbsd-8] src/sys/dev/acpi
Module Name:src Committed By: martin Date: Fri Aug 16 15:24:41 UTC 2019 Modified Files: src/sys/dev/acpi [netbsd-8]: acpi_ec.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1337): sys/dev/acpi/acpi_ec.c: revision 1.76 sys/dev/acpi/acpi_ec.c: revision 1.77 - Fix a bug that acpiec_space_handler() doesn't access more than 64bit correctly. Found by kUBSan on Thinkpad X220. acpiec0 accessed 128bits from address 0xa0. The error message was: UBSan: Undefined Behavior in ../../../../dev/acpi/acpi_ec.c:672:32, shift exponent 64 is too large for 64-bit type 'long unsigned int' - KNF. - Make the case that width < 8 behave as the same as before. Pointed out by Joerg. - Change "switch" to "if" for simplify. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.75.6.1 src/sys/dev/acpi/acpi_ec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Fri Aug 16 15:20:18 UTC 2019
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.139 -r1.140 src/sys/dev/mii/miidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.151 src/sys/dev/mii/miidevs.h:1.152
--- src/sys/dev/mii/miidevs.h:1.151 Thu Jun 6 16:05:45 2019
+++ src/sys/dev/mii/miidevs.h Fri Aug 16 15:20:18 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.151 2019/06/06 16:05:45 thorpej Exp $ */
+/* $NetBSD: miidevs.h,v 1.152 2019/08/16 15:20:18 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153 2019/06/06 16:04:13 thorpej Exp
+ * NetBSD: miidevs,v 1.154 2019/08/16 15:19:48 msaitoh Exp
*/
/*-
@@ -131,8 +131,10 @@
/*
* Agere PHYs
*/
-#define MII_MODEL_AGERE_ET1011 0x0004
-#define MII_STR_AGERE_ET1011 "Agere ET1011 10/100/1000baseT PHY"
+#define MII_MODEL_AGERE_ET1011 0x0001
+#define MII_STR_AGERE_ET1011 "ET1011 10/100/1000baseT PHY"
+#define MII_MODEL_AGERE_ET1011C 0x0004
+#define MII_STR_AGERE_ET1011C "ET1011C 10/100/1000baseT PHY"
/* Asix semiconductor PHYs */
#define MII_MODEL_xxASIX_AX88X9X 0x0031
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.139 src/sys/dev/mii/miidevs_data.h:1.140
--- src/sys/dev/mii/miidevs_data.h:1.139 Thu Jun 6 16:05:45 2019
+++ src/sys/dev/mii/miidevs_data.h Fri Aug 16 15:20:18 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.139 2019/06/06 16:05:45 thorpej Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.140 2019/08/16 15:20:18 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153 2019/06/06 16:04:13 thorpej Exp
+ * NetBSD: miidevs,v 1.154 2019/08/16 15:19:48 msaitoh Exp
*/
/*-
@@ -43,6 +43,7 @@ struct mii_knowndev {
};
struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_AGERE, MII_MODEL_AGERE_ET1011, MII_STR_AGERE_ET1011 },
+ { MII_OUI_AGERE, MII_MODEL_AGERE_ET1011C, MII_STR_AGERE_ET1011C },
{ MII_OUI_xxASIX, MII_MODEL_xxASIX_AX88X9X, MII_STR_xxASIX_AX88X9X },
{ MII_OUI_yyASIX, MII_MODEL_yyASIX_AX88772, MII_STR_yyASIX_AX88772 },
{ MII_OUI_yyASIX, MII_MODEL_yyASIX_AX88772A, MII_STR_yyASIX_AX88772A },
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Aug 16 15:20:18 UTC 2019 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.139 -r1.140 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Aug 16 15:19:49 UTC 2019 Modified Files: src/sys/dev/mii: miidevs Log Message: >From FreeBSD: - Rename ET1011 to ET1011C - Add ET1011 To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.153 src/sys/dev/mii/miidevs:1.154 --- src/sys/dev/mii/miidevs:1.153 Thu Jun 6 16:04:13 2019 +++ src/sys/dev/mii/miidevs Fri Aug 16 15:19:48 2019 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.153 2019/06/06 16:04:13 thorpej Exp $ +$NetBSD: miidevs,v 1.154 2019/08/16 15:19:48 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -124,7 +124,8 @@ oui xxXAQTI 0xace000 XaQti Corp. /* * Agere PHYs */ -model AGERE ET1011 0x0004 Agere ET1011 10/100/1000baseT PHY +model AGERE ET1011 0x0001 ET1011 10/100/1000baseT PHY +model AGERE ET1011C 0x0004 ET1011C 10/100/1000baseT PHY /* Asix semiconductor PHYs */ model xxASIX AX88X9X 0x0031 Ax88x9x internal PHY
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Aug 16 15:19:49 UTC 2019 Modified Files: src/sys/dev/mii: miidevs Log Message: >From FreeBSD: - Rename ET1011 to ET1011C - Add ET1011 To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Fri Aug 16 15:17:31 UTC 2019
Modified Files:
src/sys/dev/mii: etphy.c
Log Message:
No functional change:
- Use static.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/etphy.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/mii/etphy.c
diff -u src/sys/dev/mii/etphy.c:1.4 src/sys/dev/mii/etphy.c:1.5
--- src/sys/dev/mii/etphy.c:1.4 Mon Mar 25 09:29:08 2019
+++ src/sys/dev/mii/etphy.c Fri Aug 16 15:17:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: etphy.c,v 1.4 2019/03/25 09:29:08 msaitoh Exp $ */
+/* $NetBSD: etphy.c,v 1.5 2019/08/16 15:17:31 msaitoh Exp $ */
/* $OpenBSD: etphy.c,v 1.4 2008/04/02 20:12:58 brad Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: etphy.c,v 1.4 2019/03/25 09:29:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: etphy.c,v 1.5 2019/08/16 15:17:31 msaitoh Exp $");
#include
#include
@@ -77,13 +77,13 @@ __KERNEL_RCSID(0, "$NetBSD: etphy.c,v 1.
#define ETPHY_SR_FDX 0x0080
-int etphy_service(struct mii_softc *, struct mii_data *, int);
-void etphy_attach(device_t, device_t, void *);
-int etphy_match(device_t, cfdata_t, void *);
-void etphy_reset(struct mii_softc *);
-void etphy_status(struct mii_softc *);
+static int etphy_service(struct mii_softc *, struct mii_data *, int);
+static void etphy_attach(device_t, device_t, void *);
+static int etphy_match(device_t, cfdata_t, void *);
+static void etphy_reset(struct mii_softc *);
+static void etphy_status(struct mii_softc *);
-const struct mii_phy_funcs etphy_funcs = {
+static const struct mii_phy_funcs etphy_funcs = {
etphy_service, etphy_status, etphy_reset,
};
@@ -133,7 +133,7 @@ static const struct etphy_dsp {
{ 0x8010, 46 } /* IdlguardTime */
};
-int
+static int
etphy_match(device_t parent, cfdata_t match, void *aux)
{
struct mii_attach_args *ma = aux;
@@ -144,7 +144,7 @@ etphy_match(device_t parent, cfdata_t ma
return 0;
}
-void
+static void
etphy_attach(device_t parent, device_t self, void *aux)
{
struct mii_softc *sc = device_private(self);
@@ -185,7 +185,7 @@ etphy_attach(device_t parent, device_t s
aprint_error_dev(self, "couldn't establish power handler\n");
}
-int
+static int
etphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
@@ -229,7 +229,7 @@ etphy_service(struct mii_softc *sc, stru
if (IFM_SUBTYPE(ife->ifm_media) == IFM_1000_T) {
PHY_WRITE(sc, MII_BMCR,
- bmcr | BMCR_AUTOEN | BMCR_STARTNEG);
+bmcr | BMCR_AUTOEN | BMCR_STARTNEG);
}
}
break;
@@ -252,7 +252,7 @@ etphy_service(struct mii_softc *sc, stru
return 0;
}
-void
+static void
etphy_reset(struct mii_softc *sc)
{
uint16_t reg;
@@ -263,8 +263,7 @@ etphy_reset(struct mii_softc *sc)
PHY_READ(sc, MII_PHYIDR2, ®);
PHY_READ(sc, ETPHY_CTRL, ®);
- PHY_WRITE(sc, ETPHY_CTRL,
- ETPHY_CTRL_DIAG | ETPHY_CTRL_RSV1);
+ PHY_WRITE(sc, ETPHY_CTRL, ETPHY_CTRL_DIAG | ETPHY_CTRL_RSV1);
PHY_WRITE(sc, ETPHY_INDEX, ETPHY_INDEX_MAGIC);
PHY_READ(sc, ETPHY_DATA, ®);
@@ -294,13 +293,13 @@ etphy_reset(struct mii_softc *sc)
PHY_READ(sc, MII_BMCR, ®);
PHY_READ(sc, ETPHY_CTRL, ®);
- PHY_WRITE(sc, MII_BMCR, BMCR_AUTOEN | BMCR_S1000);
+ PHY_WRITE(sc, MII_BMCR, BMCR_AUTOEN | BMCR_S1000);
PHY_WRITE(sc, ETPHY_CTRL, ETPHY_CTRL_RSV1);
mii_phy_reset(sc);
}
-void
+static void
etphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Aug 16 15:17:31 UTC 2019 Modified Files: src/sys/dev/mii: etphy.c Log Message: No functional change: - Use static. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/etphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/kern
On Fri, Aug 16, 2019 at 08:05:01AM +1000, matthew green wrote: > "Maxime Villard" writes: > > Module Name:src > > Committed By: maxv > > Date: Thu Aug 15 12:06:42 UTC 2019 > > > > Modified Files: > > src/sys/kern: subr_kmem.c > > > > Log Message: > > Retire KMEM_GUARD. It has been superseded by kASan, which is much more > > powerful, has much more coverage - far beyond just kmem(9) -, and also > > consumes less memory. > was this discussed? > > KMEM_GUARD is useful for platforms that don't have kasan yet. Not only was it not discussed, but also it is code removal w/o core approval. Maxime: this does not mean you are not right, but even if you should be right, this needs prior public discussion and a guide for others what tools to use instead. You can not just use the big axe and later come up piece by piece with necessary details to understand the change. To you it may be clear (at least after your "instructions" in this thread), but others may have trouble parsing or finding it later. Martin
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Fri Aug 16 10:41:35 UTC 2019 Modified Files: src/sys/kern: subr_pool.c Log Message: Initialize pp->pr_redzone to false. For some reason with KUBSAN GCC does not eliminate the unused branch in pr_item_linkedlist_put(), and this leads to a unused uninitialized access which triggers KUBSAN messages. To generate a diff of this commit: cvs rdiff -u -r1.254 -r1.255 src/sys/kern/subr_pool.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Fri Aug 16 10:41:35 UTC 2019 Modified Files: src/sys/kern: subr_pool.c Log Message: Initialize pp->pr_redzone to false. For some reason with KUBSAN GCC does not eliminate the unused branch in pr_item_linkedlist_put(), and this leads to a unused uninitialized access which triggers KUBSAN messages. To generate a diff of this commit: cvs rdiff -u -r1.254 -r1.255 src/sys/kern/subr_pool.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_pool.c diff -u src/sys/kern/subr_pool.c:1.254 src/sys/kern/subr_pool.c:1.255 --- src/sys/kern/subr_pool.c:1.254 Sat Aug 3 09:31:07 2019 +++ src/sys/kern/subr_pool.c Fri Aug 16 10:41:35 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.254 2019/08/03 09:31:07 maxv Exp $ */ +/* $NetBSD: subr_pool.c,v 1.255 2019/08/16 10:41:35 maxv Exp $ */ /* * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.254 2019/08/03 09:31:07 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.255 2019/08/16 10:41:35 maxv Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" @@ -767,6 +767,7 @@ pool_init(struct pool *pp, size_t size, pp->pr_drain_hook = NULL; pp->pr_drain_hook_arg = NULL; pp->pr_freecheck = NULL; + pp->pr_redzone = false; pool_redzone_init(pp, size); pool_quarantine_init(pp);
CVS commit: src/sys/arch/arm/amlogic
Module Name:src Committed By: jmcneill Date: Fri Aug 16 10:36:06 UTC 2019 Modified Files: src/sys/arch/arm/amlogic: meson8b_clkc.c Log Message: Use correct register for mpll2_div clock To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/amlogic/meson8b_clkc.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/amlogic/meson8b_clkc.c diff -u src/sys/arch/arm/amlogic/meson8b_clkc.c:1.4 src/sys/arch/arm/amlogic/meson8b_clkc.c:1.5 --- src/sys/arch/arm/amlogic/meson8b_clkc.c:1.4 Tue Aug 13 09:56:08 2019 +++ src/sys/arch/arm/amlogic/meson8b_clkc.c Fri Aug 16 10:36:06 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: meson8b_clkc.c,v 1.4 2019/08/13 09:56:08 skrll Exp $ */ +/* $NetBSD: meson8b_clkc.c,v 1.5 2019/08/16 10:36:06 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: meson8b_clkc.c,v 1.4 2019/08/13 09:56:08 skrll Exp $"); +__KERNEL_RCSID(1, "$NetBSD: meson8b_clkc.c,v 1.5 2019/08/16 10:36:06 jmcneill Exp $"); #include #include @@ -268,9 +268,9 @@ static struct meson_clk_clk meson8b_clkc MESON_CLK_PLL_REG_INVALID,/* ssen */ 0), MESON_CLK_MPLL(MESON8B_CLOCK_MPLL2_DIV, "mpll2_div", "mpll_prediv", - MESON_CLK_PLL_REG(HHI_MPLL_CNTL8, __BITS(13,0)), /* sdm */ - MESON_CLK_PLL_REG(HHI_MPLL_CNTL8, __BIT(15)), /* sdm_enable */ - MESON_CLK_PLL_REG(HHI_MPLL_CNTL8, __BITS(24,16)), /* n2 */ + MESON_CLK_PLL_REG(HHI_MPLL_CNTL9, __BITS(13,0)), /* sdm */ + MESON_CLK_PLL_REG(HHI_MPLL_CNTL9, __BIT(15)), /* sdm_enable */ + MESON_CLK_PLL_REG(HHI_MPLL_CNTL9, __BITS(24,16)), /* n2 */ MESON_CLK_PLL_REG_INVALID,/* ssen */ 0),
CVS commit: src/sys/arch/arm/amlogic
Module Name:src Committed By: jmcneill Date: Fri Aug 16 10:36:06 UTC 2019 Modified Files: src/sys/arch/arm/amlogic: meson8b_clkc.c Log Message: Use correct register for mpll2_div clock To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/amlogic/meson8b_clkc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: msaitoh
Date: Fri Aug 16 10:33:17 UTC 2019
Modified Files:
src/sbin/ifconfig: af_atalk.c af_inet.c af_inet6.c af_inetany.c
af_link.c env.c ether.c extern.h ieee80211.c ifconfig.c parse.c
parse.h pfsync.c tunnel.c util.c vlan.c
Log Message:
Whitespace fix.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/ifconfig/af_atalk.c
cvs rdiff -u -r1.25 -r1.26 src/sbin/ifconfig/af_inet.c
cvs rdiff -u -r1.38 -r1.39 src/sbin/ifconfig/af_inet6.c
cvs rdiff -u -r1.17 -r1.18 src/sbin/ifconfig/af_inetany.c \
src/sbin/ifconfig/util.c
cvs rdiff -u -r1.7 -r1.8 src/sbin/ifconfig/af_link.c
cvs rdiff -u -r1.11 -r1.12 src/sbin/ifconfig/env.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/ifconfig/ether.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/ifconfig/extern.h
cvs rdiff -u -r1.29 -r1.30 src/sbin/ifconfig/ieee80211.c
cvs rdiff -u -r1.239 -r1.240 src/sbin/ifconfig/ifconfig.c
cvs rdiff -u -r1.18 -r1.19 src/sbin/ifconfig/parse.c
cvs rdiff -u -r1.8 -r1.9 src/sbin/ifconfig/parse.h
cvs rdiff -u -r1.1 -r1.2 src/sbin/ifconfig/pfsync.c
cvs rdiff -u -r1.20 -r1.21 src/sbin/ifconfig/tunnel.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/ifconfig/vlan.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.19 src/sbin/ifconfig/af_atalk.c:1.20
--- src/sbin/ifconfig/af_atalk.c:1.19 Sat Oct 19 00:35:30 2013
+++ src/sbin/ifconfig/af_atalk.c Fri Aug 16 10:33:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: af_atalk.c,v 1.19 2013/10/19 00:35:30 christos Exp $ */
+/* $NetBSD: af_atalk.c,v 1.20 2019/08/16 10:33:17 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,14 +31,14 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_atalk.c,v 1.19 2013/10/19 00:35:30 christos Exp $");
+__RCSID("$NetBSD: af_atalk.c,v 1.20 2019/08/16 10:33:17 msaitoh Exp $");
#endif /* not lint */
-#include
-#include
+#include
+#include
#include
-#include
+#include
#include
@@ -185,7 +185,7 @@ sat_print1(const char *prefix, const str
char buf[40];
(void)getnameinfo(sa, sa->sa_len, buf, sizeof(buf), NULL, 0, 0);
-
+
printf("%s%s", prefix, buf);
}
Index: src/sbin/ifconfig/af_inet.c
diff -u src/sbin/ifconfig/af_inet.c:1.25 src/sbin/ifconfig/af_inet.c:1.26
--- src/sbin/ifconfig/af_inet.c:1.25 Mon Jun 11 17:45:50 2018
+++ src/sbin/ifconfig/af_inet.c Fri Aug 16 10:33:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inet.c,v 1.25 2018/06/11 17:45:50 kamil Exp $ */
+/* $NetBSD: af_inet.c,v 1.26 2019/08/16 10:33:17 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,14 +31,14 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_inet.c,v 1.25 2018/06/11 17:45:50 kamil Exp $");
+__RCSID("$NetBSD: af_inet.c,v 1.26 2019/08/16 10:33:17 msaitoh Exp $");
#endif /* not lint */
-#include
-#include
+#include
+#include
#include
-#include
+#include
#include
#include
Index: src/sbin/ifconfig/af_inet6.c
diff -u src/sbin/ifconfig/af_inet6.c:1.38 src/sbin/ifconfig/af_inet6.c:1.39
--- src/sbin/ifconfig/af_inet6.c:1.38 Sat Oct 1 15:10:58 2016
+++ src/sbin/ifconfig/af_inet6.c Fri Aug 16 10:33:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inet6.c,v 1.38 2016/10/01 15:10:58 roy Exp $ */
+/* $NetBSD: af_inet6.c,v 1.39 2019/08/16 10:33:17 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,14 +31,14 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_inet6.c,v 1.38 2016/10/01 15:10:58 roy Exp $");
+__RCSID("$NetBSD: af_inet6.c,v 1.39 2019/08/16 10:33:17 msaitoh Exp $");
#endif /* not lint */
-#include
-#include
+#include
+#include
#include
-#include
+#include
#include
#include
#include
@@ -222,7 +222,7 @@ setia6eui64_impl(prop_dictionary_t env,
errx(EXIT_FAILURE,
"eui64 address modifier not allowed for the AF");
}
- in6 = &ifra->ifra_addr.sin6_addr;
+ in6 = &ifra->ifra_addr.sin6_addr;
if (memcmp(&in6addr_any.s6_addr[8], &in6->s6_addr[8], 8) != 0) {
union {
struct sockaddr_in6 sin6;
@@ -250,9 +250,9 @@ setia6eui64_impl(prop_dictionary_t env,
}
}
if (lladdr == NULL)
- errx(EXIT_FAILURE, "could not determine link local address");
+ errx(EXIT_FAILURE, "could not determine link local address");
- memcpy(&in6->s6_addr[8], &lladdr->s6_addr[8], 8);
+ memcpy(&in6->s6_addr[8], &lladdr->s6_addr[8], 8);
freeifaddrs(ifap);
return 0;
Index: src/sbin/ifconfig/af_inetany.c
diff -u src/sbin/ifconfig/af_inetany.c:1.17 src/sbin/ifconfig/af_inetany.c:1.18
--- src/sbin/ifconfig/af_inetany.c:1.17 Sun Dec 30 22:52:35 2012
+++ src/sbin/ifconfig/af_inetany.c Fri Aug 16 10:33:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inetany.c,v 1.17 2012/12/30 22:52:35 christos Exp $ */
+/* $NetBSD: af_inetany.c,v 1.18 2019/08/16 10:33:17 msaitoh Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,14 +27,14 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_inetany.c,v 1.17 201
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: msaitoh Date: Fri Aug 16 10:33:17 UTC 2019 Modified Files: src/sbin/ifconfig: af_atalk.c af_inet.c af_inet6.c af_inetany.c af_link.c env.c ether.c extern.h ieee80211.c ifconfig.c parse.c parse.h pfsync.c tunnel.c util.c vlan.c Log Message: Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sbin/ifconfig/af_atalk.c cvs rdiff -u -r1.25 -r1.26 src/sbin/ifconfig/af_inet.c cvs rdiff -u -r1.38 -r1.39 src/sbin/ifconfig/af_inet6.c cvs rdiff -u -r1.17 -r1.18 src/sbin/ifconfig/af_inetany.c \ src/sbin/ifconfig/util.c cvs rdiff -u -r1.7 -r1.8 src/sbin/ifconfig/af_link.c cvs rdiff -u -r1.11 -r1.12 src/sbin/ifconfig/env.c cvs rdiff -u -r1.6 -r1.7 src/sbin/ifconfig/ether.c cvs rdiff -u -r1.15 -r1.16 src/sbin/ifconfig/extern.h cvs rdiff -u -r1.29 -r1.30 src/sbin/ifconfig/ieee80211.c cvs rdiff -u -r1.239 -r1.240 src/sbin/ifconfig/ifconfig.c cvs rdiff -u -r1.18 -r1.19 src/sbin/ifconfig/parse.c cvs rdiff -u -r1.8 -r1.9 src/sbin/ifconfig/parse.h cvs rdiff -u -r1.1 -r1.2 src/sbin/ifconfig/pfsync.c cvs rdiff -u -r1.20 -r1.21 src/sbin/ifconfig/tunnel.c cvs rdiff -u -r1.14 -r1.15 src/sbin/ifconfig/vlan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Aug 16 08:52:46 UTC 2019 Modified Files: src/sys/dev/usb: files.usb Log Message: kue now depends upon usbnet. To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/sys/dev/usb/files.usb 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/files.usb diff -u src/sys/dev/usb/files.usb:1.164 src/sys/dev/usb/files.usb:1.165 --- src/sys/dev/usb/files.usb:1.164 Thu Aug 15 08:02:32 2019 +++ src/sys/dev/usb/files.usb Fri Aug 16 08:52:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.usb,v 1.164 2019/08/15 08:02:32 mrg Exp $ +# $NetBSD: files.usb,v 1.165 2019/08/16 08:52:46 mrg Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide @@ -349,7 +349,7 @@ attach cue at usbdevif file dev/usb/if_cue.c cue # Kawasaki LSI KL5KUSB101B -device kue: arp, ether, ifnet +device kue: arp, ether, ifnet, usbnet attach kue at usbdevif file dev/usb/if_kue.c kue
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Aug 16 08:52:46 UTC 2019 Modified Files: src/sys/dev/usb: files.usb Log Message: kue now depends upon usbnet. To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/sys/dev/usb/files.usb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Fri Aug 16 08:51:10 UTC 2019
Modified Files:
src/sys/dev/usb: if_kue.c if_kuereg.h
Log Message:
port kue(4) to usbnet(9). interesting notes:
- move KUE_RXFILT_PROMISC setting into kue_setiff() from kue_init()
to avoid multiple setting KUE_CMD_SET_PKT_FILTER reg multiple times
- software-only constructs moved from if_kuereg.h into if_kue.c
- kue is the first (umb(4) will need it to, i think) to have its own
autoconf detach routine remain
- un_tx_xfer_flags is 0 here, not USBD_FORCE_SHORT_XFER
- fix a potential data exposure (but probably not without a USB
protocol tap). kue needs the transfers to be 64-byte aligned, and
while i doubt it sends more than the frame provided, were sending
random kernel data (whatever was the 0-63 bytes to alignment) to
the device.
diffstat says:
2 files changed, 189 insertions(+), 739 deletions(-)
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/if_kuereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.97 src/sys/dev/usb/if_kue.c:1.98
--- src/sys/dev/usb/if_kue.c:1.97 Thu Aug 1 00:10:22 2019
+++ src/sys/dev/usb/if_kue.c Fri Aug 16 08:51:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.97 2019/08/01 00:10:22 mrg Exp $ */
+/* $NetBSD: if_kue.c,v 1.98 2019/08/16 08:51:09 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.97 2019/08/01 00:10:22 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.98 2019/08/16 08:51:09 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -79,33 +79,15 @@ __KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1
#endif
#include
-#include
-#include
-#include
#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
+
+#include
#ifdef INET
#include
#include
#endif
-#include
-#include
-#include
-#include
-#include
-
#include
#include
@@ -118,6 +100,28 @@ int kuedebug = 0;
#define DPRINTFN(n, x)
#endif
+struct kue_type {
+ uint16_t kue_vid;
+ uint16_t kue_did;
+};
+
+struct kue_softc {
+ struct usbnet kue_un;
+
+ struct kue_ether_desc kue_desc;
+ uint16_t kue_rxfilt;
+ uint8_t *kue_mcfilters;
+};
+
+#define KUE_MCFILT(x, y) \
+ (uint8_t *)&(sc->kue_mcfilters[y * ETHER_ADDR_LEN])
+
+#define KUE_BUFSZ 1536
+#define KUE_MIN_FRAMELEN 60
+
+#define KUE_RX_LIST_CNT 1
+#define KUE_TX_LIST_CNT 1
+
/*
* Various supported device vendors/products.
*/
@@ -160,37 +164,36 @@ static const struct usb_devno kue_devs[]
int kue_match(device_t, cfdata_t, void *);
void kue_attach(device_t, device_t, void *);
int kue_detach(device_t, int);
-int kue_activate(device_t, enum devact);
CFATTACH_DECL_NEW(kue, sizeof(struct kue_softc), kue_match, kue_attach,
-kue_detach, kue_activate);
+kue_detach, usbnet_activate);
-static int kue_tx_list_init(struct kue_softc *);
-static int kue_rx_list_init(struct kue_softc *);
-static int kue_send(struct kue_softc *, struct mbuf *, int);
-static int kue_open_pipes(struct kue_softc *);
-static void kue_rxeof(struct usbd_xfer *, void *, usbd_status);
-static void kue_txeof(struct usbd_xfer *, void *, usbd_status);
-static void kue_start(struct ifnet *);
-static int kue_ioctl(struct ifnet *, u_long, void *);
-static void kue_init(void *);
-static void kue_stop(struct kue_softc *);
-static void kue_watchdog(struct ifnet *);
+static void kue_rx_loop(struct usbnet *, struct usbnet_chain *, uint32_t);
+static unsigned kue_tx_prepare(struct usbnet *, struct mbuf *,
+ struct usbnet_chain *);
+static int kue_ioctl_cb(struct ifnet *, u_long, void *);
+static int kue_init(struct ifnet *);
+
+static struct usbnet_ops kue_ops = {
+ .uno_ioctl = kue_ioctl_cb,
+ .uno_tx_prepare = kue_tx_prepare,
+ .uno_rx_loop = kue_rx_loop,
+ .uno_init = kue_init,
+};
-static void kue_setmulti(struct kue_softc *);
-static void kue_reset(struct kue_softc *);
+static void kue_setiff(struct usbnet *);
+static void kue_reset(struct usbnet *);
-static usbd_status kue_ctl(struct kue_softc *, int, uint8_t,
+static usbd_status kue_ctl(struct usbnet *, int, uint8_t,
uint16_t, void *, uint32_t);
-static usbd_status kue_setword(struct kue_softc *, uint8_t, uint16_t);
-static int kue_load_fw(struct kue_softc *);
+static int kue_load_fw(struct usbnet *);
static usbd_status
-kue_setword(struct kue_softc *sc, uint8_t breq, uint16_t word)
+kue_setword(struct usbnet *un, uint8_t breq, uint16_t word)
{
usb_device_request_t req;
- DPRINTFN(10,("%s: %s: enter\n", device_xname(sc->kue_dev),__func__));
+ DPRINTFN(10,("%s: %s: enter\n", device_xname(un->un_dev),__func__));
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = breq;
@@ -198,16 +
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Aug 16 08:51:10 UTC 2019 Modified Files: src/sys/dev/usb: if_kue.c if_kuereg.h Log Message: port kue(4) to usbnet(9). interesting notes: - move KUE_RXFILT_PROMISC setting into kue_setiff() from kue_init() to avoid multiple setting KUE_CMD_SET_PKT_FILTER reg multiple times - software-only constructs moved from if_kuereg.h into if_kue.c - kue is the first (umb(4) will need it to, i think) to have its own autoconf detach routine remain - un_tx_xfer_flags is 0 here, not USBD_FORCE_SHORT_XFER - fix a potential data exposure (but probably not without a USB protocol tap). kue needs the transfers to be 64-byte aligned, and while i doubt it sends more than the frame provided, were sending random kernel data (whatever was the 0-63 bytes to alignment) to the device. diffstat says: 2 files changed, 189 insertions(+), 739 deletions(-) To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/sys/dev/usb/if_kue.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/if_kuereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Aug 16 08:38:21 UTC 2019 Modified Files: src/sys/dev/usb: usbnet.c Log Message: internal to usbnet: add buflen param to usbnet_newbuf(). use this to skip allocating an mbuf cluster for small packets (ported from kue(4).) remove usbnet_rx_start_pipes()'s always usbnet_rxeof argument. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/usbnet.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Fri Aug 16 08:38:21 UTC 2019
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
internal to usbnet:
add buflen param to usbnet_newbuf(). use this to skip allocating
an mbuf cluster for small packets (ported from kue(4).)
remove usbnet_rx_start_pipes()'s always usbnet_rxeof argument.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/usbnet.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/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.15 src/sys/dev/usb/usbnet.c:1.16
--- src/sys/dev/usb/usbnet.c:1.15 Thu Aug 15 05:52:23 2019
+++ src/sys/dev/usb/usbnet.c Fri Aug 16 08:38:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.15 2019/08/15 05:52:23 mrg Exp $ */
+/* $NetBSD: usbnet.c,v 1.16 2019/08/16 08:38:21 mrg Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.15 2019/08/15 05:52:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.16 2019/08/16 08:38:21 mrg Exp $");
#include
#include
@@ -211,7 +211,7 @@ uno_intr(struct usbnet *un, usbd_status
/* Interrupt handling. */
static struct mbuf *
-usbnet_newbuf(void)
+usbnet_newbuf(size_t buflen)
{
struct mbuf *m;
@@ -219,14 +219,16 @@ usbnet_newbuf(void)
if (m == NULL)
return NULL;
- MCLGET(m, M_DONTWAIT);
- if (!(m->m_flags & M_EXT)) {
- m_freem(m);
- return NULL;
+ if (buflen > MHLEN - ETHER_ALIGN) {
+ MCLGET(m, M_DONTWAIT);
+ if (!(m->m_flags & M_EXT)) {
+ m_freem(m);
+ return NULL;
+ }
}
- m->m_len = m->m_pkthdr.len = MCLBYTES;
m_adj(m, ETHER_ALIGN);
+ m->m_len = m->m_pkthdr.len = buflen;
return m;
}
@@ -248,18 +250,17 @@ usbnet_enqueue(struct usbnet * const un,
usbnet_isowned_rx(un);
- m = usbnet_newbuf();
+ m = usbnet_newbuf(buflen);
if (m == NULL) {
ifp->if_ierrors++;
return;
}
m_set_rcvif(m, ifp);
- m->m_pkthdr.len = m->m_len = buflen;
m->m_pkthdr.csum_flags = csum_flags;
m->m_pkthdr.csum_data = csum_data;
m->m_flags |= mbuf_flags;
- memcpy(mtod(m, char *), buf, buflen);
+ memcpy(mtod(m, uint8_t *), buf, buflen);
/* push the packet up */
if_percpuq_enqueue(ifp->if_percpuq, m);
@@ -274,14 +275,13 @@ usbnet_input(struct usbnet * const un, u
usbnet_isowned_rx(un);
- m = usbnet_newbuf();
+ m = usbnet_newbuf(buflen);
if (m == NULL) {
ifp->if_ierrors++;
return;
}
m_set_rcvif(m, ifp);
- m->m_pkthdr.len = m->m_len = buflen;
memcpy(mtod(m, char *), buf, buflen);
/* push the packet up */
@@ -576,7 +576,7 @@ usbnet_rx_list_fini(struct usbnet * cons
/* End of common RX functions */
static void
-usbnet_rx_start_pipes(struct usbnet * const un, usbd_callback cb)
+usbnet_rx_start_pipes(struct usbnet * const un)
{
struct usbnet_cdata * const cd = un_cdata(un);
struct usbnet_private * const unp = un->un_pri;
@@ -589,7 +589,7 @@ usbnet_rx_start_pipes(struct usbnet * co
struct usbnet_chain *c = &cd->uncd_rx_chain[i];
usbd_setup_xfer(c->unc_xfer, c, c->unc_buf, un->un_rx_bufsz,
- un->un_rx_xfer_flags, USBD_NO_TIMEOUT, cb);
+ un->un_rx_xfer_flags, USBD_NO_TIMEOUT, usbnet_rxeof);
usbd_transfer(c->unc_xfer);
}
@@ -769,7 +769,7 @@ usbnet_init_rx_tx(struct usbnet * const
}
/* Start up the receive pipe(s). */
- usbnet_rx_start_pipes(un, usbnet_rxeof);
+ usbnet_rx_start_pipes(un);
/* Indicate we are up and running. */
KASSERT(ifp->if_softc == NULL || IFNET_LOCKED(ifp));
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Fri Aug 16 08:29:20 UTC 2019
Modified Files:
src/sys/dev/usb: if_axe.c if_udav.c if_ure.c
Log Message:
make the default debug level zero.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/if_ure.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.115 src/sys/dev/usb/if_axe.c:1.116
--- src/sys/dev/usb/if_axe.c:1.115 Thu Aug 15 05:52:23 2019
+++ src/sys/dev/usb/if_axe.c Fri Aug 16 08:29:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.115 2019/08/15 05:52:23 mrg Exp $ */
+/* $NetBSD: if_axe.c,v 1.116 2019/08/16 08:29:20 mrg Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.115 2019/08/15 05:52:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.116 2019/08/16 08:29:20 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -159,7 +159,7 @@ struct axe_softc {
#ifndef AXE_DEBUG
#define axedebug 0
#else
-static int axedebug = 20;
+static int axedebug = 0;
SYSCTL_SETUP(sysctl_hw_axe_setup, "sysctl hw.axe setup")
{
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.68 src/sys/dev/usb/if_udav.c:1.69
--- src/sys/dev/usb/if_udav.c:1.68 Thu Aug 15 05:52:23 2019
+++ src/sys/dev/usb/if_udav.c Fri Aug 16 08:29:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.68 2019/08/15 05:52:23 mrg Exp $ */
+/* $NetBSD: if_udav.c,v 1.69 2019/08/16 08:29:20 mrg Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.68 2019/08/15 05:52:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.69 2019/08/16 08:29:20 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -93,7 +93,7 @@ static int udav_mem_write1(struct usbnet
#ifdef UDAV_DEBUG
#define DPRINTF(x) if (udavdebug) printf x
#define DPRINTFN(n, x) if (udavdebug >= (n)) printf x
-int udavdebug = 10;
+int udavdebug = 0;
#else
#define DPRINTF(x)
#define DPRINTFN(n, x)
Index: src/sys/dev/usb/if_ure.c
diff -u src/sys/dev/usb/if_ure.c:1.27 src/sys/dev/usb/if_ure.c:1.28
--- src/sys/dev/usb/if_ure.c:1.27 Thu Aug 15 05:52:23 2019
+++ src/sys/dev/usb/if_ure.c Fri Aug 16 08:29:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ure.c,v 1.27 2019/08/15 05:52:23 mrg Exp $ */
+/* $NetBSD: if_ure.c,v 1.28 2019/08/16 08:29:20 mrg Exp $ */
/* $OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $ */
/*-
@@ -30,7 +30,7 @@
/* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.27 2019/08/15 05:52:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.28 2019/08/16 08:29:20 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1
#ifdef URE_DEBUG
#define DPRINTF(x) do { if (uredebug) printf x; } while (0)
#define DPRINTFN(n, x) do { if (uredebug >= (n)) printf x; } while (0)
-int uredebug = 1;
+int uredebug = 0;
#else
#define DPRINTF(x)
#define DPRINTFN(n, x)
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Aug 16 08:29:20 UTC 2019 Modified Files: src/sys/dev/usb: if_axe.c if_udav.c if_ure.c Log Message: make the default debug level zero. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/dev/usb/if_axe.c cvs rdiff -u -r1.68 -r1.69 src/sys/dev/usb/if_udav.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/if_ure.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/kern
Le 16/08/2019 à 00:05, matthew green a écrit : KMEM_GUARD is useful for platforms that don't have kasan yet. Verily it was not. 1) The place where diagnostic/debug features should be implemented is pool(9), not kmem(9). Pools represent all of the dynamic system memory, kmem only a small subset of that. KMEM_GUARD was unable to detect anything on mbufs, pnbufs, vnodes, etc. 2) The pool hardening enabled by default in GENERIC is more powerful in detecting inconsistencies - like [1] -, and does more than half of KMEM_GUARD's work with basically no overhead. 3) The additional POOL_REDZONE option can be used to detect more bugs on all pools and not just kmem. But see below. We need to stop with these useless debug-only options that nobody uses, and which moreover are implemented in the wrong place and can detect nothing. [1] https://mail-index.netbsd.org/current-users/2019/08/01/msg036317.html Le 16/08/2019 à 07:46, Nick Hudson a écrit : yet? Can 32bit platforms and limit KVA have KASAN? If you are telling me they could reliably use KMEM_GUARD before, then it likely means they can have KASAN. If you want to add KASAN to more arches, feel free to, I made it largely MI, so the MD effort needed is limited. By the way, can we turn on POOL_REDZONE under DIAGNOSTIC now? Last time I tried to do that you complained to me that ARM wasn't booting anymore, until it turned out it was a bug in ARM which you later fixed. Would be nice to hear about that, because POOL_REDZONE *is* the kind of feature that is useful.
