CVS commit: src/sys/dev/ic
Module Name:src
Committed By: ozaki-r
Date: Mon Feb 20 07:43:29 UTC 2017
Modified Files:
src/sys/dev/ic: dwc_gmac.c elinkxl.c gem.c hd64570.c i82557.c i82586.c
i82596.c lan9118.c mb86950.c rtl81x9.c smc83c170.c
Log Message:
Apply deferred if_start to more drivers
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/dwc_gmac.c
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/ic/gem.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/ic/i82557.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/ic/i82586.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/i82596.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/lan9118.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/mb86950.c
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/ic/rtl81x9.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/ic/smc83c170.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.39 src/sys/dev/ic/dwc_gmac.c:1.40
--- src/sys/dev/ic/dwc_gmac.c:1.39 Mon Jan 23 08:36:23 2017
+++ src/sys/dev/ic/dwc_gmac.c Mon Feb 20 07:43:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.39 2017/01/23 08:36:23 skrll Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.40 2017/02/20 07:43:29 ozaki-r Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.39 2017/01/23 08:36:23 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.40 2017/02/20 07:43:29 ozaki-r Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -261,6 +261,7 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
/* Attach the interface. */
if_initialize(ifp);
sc->sc_ipq = if_percpuq_create(>sc_ec.ec_if);
+ if_deferred_start_init(ifp, NULL);
ether_ifattach(ifp, enaddr);
ether_set_ifflags_cb(>sc_ec, dwc_gmac_ifflags_cb);
if_register(ifp);
@@ -1368,7 +1369,7 @@ dwc_gmac_intr(struct dwc_gmac_softc *sc)
* Get more packets
*/
if (rv)
- sc->sc_ec.ec_if.if_start(>sc_ec.ec_if);
+ if_schedule_deferred_start(>sc_ec.ec_if);
return rv;
}
Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.120 src/sys/dev/ic/elinkxl.c:1.121
--- src/sys/dev/ic/elinkxl.c:1.120 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/elinkxl.c Mon Feb 20 07:43:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.120 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: elinkxl.c,v 1.121 2017/02/20 07:43:29 ozaki-r Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.120 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.121 2017/02/20 07:43:29 ozaki-r Exp $");
#include
#include
@@ -426,6 +426,7 @@ ex_config(struct ex_softc *sc)
IFCAP_CSUM_UDPv4_Tx | IFCAP_CSUM_UDPv4_Rx;
if_attach(ifp);
+ if_deferred_start_init(ifp, NULL);
ether_ifattach(ifp, macaddr);
ether_set_ifflags_cb(>sc_ethercom, ex_ifflags_cb);
@@ -1418,8 +1419,8 @@ ex_intr(void *arg)
}
/* no more interrupts */
- if (ret && IFQ_IS_EMPTY(>if_snd) == 0)
- ex_start(ifp);
+ if (ret)
+ if_schedule_deferred_start(ifp);
return ret;
}
Index: src/sys/dev/ic/gem.c
diff -u src/sys/dev/ic/gem.c:1.107 src/sys/dev/ic/gem.c:1.108
--- src/sys/dev/ic/gem.c:1.107 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/gem.c Mon Feb 20 07:43:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.107 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: gem.c,v 1.108 2017/02/20 07:43:29 ozaki-r Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.107 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.108 2017/02/20 07:43:29 ozaki-r Exp $");
#include "opt_inet.h"
@@ -577,6 +577,7 @@ gem_attach(struct gem_softc *sc, const u
/* Attach the interface. */
if_attach(ifp);
+ if_deferred_start_init(ifp, NULL);
ether_ifattach(ifp, enaddr);
ether_set_ifflags_cb(>sc_ethercom, gem_ifflags_cb);
@@ -1740,7 +1741,7 @@ gem_tint(struct gem_softc *sc)
ifp->if_flags &= ~IFF_OACTIVE;
sc->sc_if_flags = ifp->if_flags;
ifp->if_timer = SIMPLEQ_EMPTY(>sc_txdirtyq) ? 0 : 5;
- gem_start(ifp);
+ if_schedule_deferred_start(ifp);
}
DPRINTF(sc, ("%s: gem_tint: watchdog %d\n",
device_xname(sc->sc_dev), ifp->if_timer));
Index: src/sys/dev/ic/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.52 src/sys/dev/ic/hd64570.c:1.53
--- src/sys/dev/ic/hd64570.c:1.52 Tue Jan 24 09:05:28 2017
+++ src/sys/dev/ic/hd64570.c Mon Feb 20 07:43:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.52 2017/01/24 09:05:28 ozaki-r Exp $ */
+/* $NetBSD: hd64570.c,v 1.53 2017/02/20 07:43:29 ozaki-r Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.52 2017/01/24 09:05:28 ozaki-r Exp $");
CVS commit: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Mon Feb 20 06:48:49 UTC 2017
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Protect dbregs_dr*_dont_inherit_lwp in arch/amd64 with HAVE_DBREGS
The code for debug registers isn't in HEAD and it might break the build.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.22 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.23
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.22 Mon Feb 20 06:18:48 2017
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Mon Feb 20 06:48:49 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.22 2017/02/20 06:18:48 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.23 2017/02/20 06:48:49 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.22 2017/02/20 06:18:48 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.23 2017/02/20 06:48:49 kamil Exp $");
#include
#include
@@ -5897,13 +5897,14 @@ ATF_TC_BODY(dbregs_dr3_trap_code, tc)
volatile lwpid_t the_lwp_id = 0;
-static void
+static void __used
lwp_main_func(void *arg)
{
the_lwp_id = _lwp_self();
_lwp_exit();
}
+#if defined(HAVE_DBREGS)
ATF_TC(dbregs_dr0_dont_inherit_lwp);
ATF_TC_HEAD(dbregs_dr0_dont_inherit_lwp, tc)
{
@@ -6030,7 +6031,9 @@ ATF_TC_BODY(dbregs_dr0_dont_inherit_lwp,
TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+#endif
+#if defined(HAVE_DBREGS)
ATF_TC(dbregs_dr1_dont_inherit_lwp);
ATF_TC_HEAD(dbregs_dr1_dont_inherit_lwp, tc)
{
@@ -6157,7 +6160,9 @@ ATF_TC_BODY(dbregs_dr1_dont_inherit_lwp,
TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+#endif
+#if defined(HAVE_DBREGS)
ATF_TC(dbregs_dr2_dont_inherit_lwp);
ATF_TC_HEAD(dbregs_dr2_dont_inherit_lwp, tc)
{
@@ -6284,7 +6289,9 @@ ATF_TC_BODY(dbregs_dr2_dont_inherit_lwp,
TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+#endif
+#if defined(HAVE_DBREGS)
ATF_TC(dbregs_dr3_dont_inherit_lwp);
ATF_TC_HEAD(dbregs_dr3_dont_inherit_lwp, tc)
{
@@ -6411,7 +6418,9 @@ ATF_TC_BODY(dbregs_dr3_dont_inherit_lwp,
TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+#endif
+#if defined(HAVE_DBREGS)
ATF_TC(dbregs_dr6_dont_inherit_lwp);
ATF_TC_HEAD(dbregs_dr6_dont_inherit_lwp, tc)
{
@@ -6538,7 +6547,9 @@ ATF_TC_BODY(dbregs_dr6_dont_inherit_lwp,
TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+#endif
+#if defined(HAVE_DBREGS)
ATF_TC(dbregs_dr7_dont_inherit_lwp);
ATF_TC_HEAD(dbregs_dr7_dont_inherit_lwp, tc)
{
@@ -6665,6 +6676,7 @@ ATF_TC_BODY(dbregs_dr7_dont_inherit_lwp,
TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+#endif
ATF_TP_ADD_TCS(tp)
{
CVS commit: src/sys/dev/ic
Module Name:src Committed By: ozaki-r Date: Mon Feb 20 06:46:41 UTC 2017 Modified Files: src/sys/dev/ic: rtl8169.c Log Message: Fix assertion failure in bpf_mtap by applying deferred if_start to re(4) Reported by maya@ To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/dev/ic/rtl8169.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/rtl8169.c diff -u src/sys/dev/ic/rtl8169.c:1.148 src/sys/dev/ic/rtl8169.c:1.149 --- src/sys/dev/ic/rtl8169.c:1.148 Thu Dec 15 09:28:05 2016 +++ src/sys/dev/ic/rtl8169.c Mon Feb 20 06:46:41 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl8169.c,v 1.148 2016/12/15 09:28:05 ozaki-r Exp $ */ +/* $NetBSD: rtl8169.c,v 1.149 2017/02/20 06:46:41 ozaki-r Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.148 2016/12/15 09:28:05 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.149 2017/02/20 06:46:41 ozaki-r Exp $"); /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */ /* @@ -869,6 +869,7 @@ re_attach(struct rtk_softc *sc) * Call MI attach routine. */ if_attach(ifp); + if_deferred_start_init(ifp, NULL); ether_ifattach(ifp, eaddr); rnd_attach_source(>rnd_source, device_xname(sc->sc_dev), @@ -1496,8 +1497,8 @@ re_intr(void *arg) } } - if (handled && !IFQ_IS_EMPTY(>if_snd)) - re_start(ifp); + if (handled) + if_schedule_deferred_start(ifp); rnd_add_uint32(>rnd_source, status);
CVS commit: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Mon Feb 20 06:18:48 UTC 2017
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Add new tests dbregs_dr[67]_dont_inherit_lwp in arch/amd64
New tests:
- dbregs_dr6_dont_inherit_lwp
- dbregs_dr7_dont_inherit_lwp
Debug Registers are set always per-LWP and they are never inherited.
If a user wants to reuse them, there is need to set trap on thread creation
(PTRACE_LWP_CREATE) and set them from a debugger on newly created LWP.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.21 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.22
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.21 Mon Feb 20 05:47:59 2017
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Mon Feb 20 06:18:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.21 2017/02/20 05:47:59 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.22 2017/02/20 06:18:48 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.21 2017/02/20 05:47:59 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.22 2017/02/20 06:18:48 kamil Exp $");
#include
#include
@@ -6412,6 +6412,260 @@ ATF_TC_BODY(dbregs_dr3_dont_inherit_lwp,
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
}
+ATF_TC(dbregs_dr6_dont_inherit_lwp);
+ATF_TC_HEAD(dbregs_dr6_dont_inherit_lwp, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify that 1 LWP creation is intercepted by ptrace(2) with "
+ "EVENT_MASK set to PTRACE_LWP_CREATE and Debug Register 6 from "
+ "the forker thread is not inherited");
+}
+
+ATF_TC_BODY(dbregs_dr6_dont_inherit_lwp, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+ ptrace_state_t state;
+ const int slen = sizeof(state);
+ ptrace_event_t event;
+ const int elen = sizeof(event);
+ ucontext_t uc;
+ lwpid_t lid;
+ static const size_t ssize = 16*1024;
+ void *stack;
+ size_t i;
+ struct dbreg r1;
+ struct dbreg r2;
+
+ printf("Before forking process PID=%d\n", getpid());
+ ATF_REQUIRE((child = fork()) != -1);
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before allocating memory for stack in child\n");
+ FORKEE_ASSERT((stack = malloc(ssize)) != NULL);
+
+ printf("Before making context for new lwp in child\n");
+ _lwp_makecontext(, lwp_main_func, NULL, NULL, stack, ssize);
+
+ printf("Before creating new in child\n");
+ FORKEE_ASSERT(_lwp_create(, 0, ) == 0);
+
+ printf("Before waiting for lwp %d to exit\n", lid);
+ FORKEE_ASSERT(_lwp_wait(lid, NULL) == 0);
+
+ printf("Before verifying that reported %d and running lid %d "
+ "are the same\n", lid, the_lwp_id);
+ FORKEE_ASSERT_EQ(lid, the_lwp_id);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Set empty EVENT_MASK for the child %d\n", child);
+ event.pe_set_event = PTRACE_LWP_CREATE;
+ ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, , elen) != -1);
+
+ printf("Call GETDBREGS for the child process (r1)\n");
+ ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
+
+ printf("State of the debug registers (r1):\n");
+ for (i = 0; i < __arraycount(r1.dr); i++)
+ printf("r1[%zu]=%#lx\n", i, r1.dr[i]);
+
+ r1.dr[6] = 1; /* breakpoint condition dr0 detected */
+ printf("Set DR6 (r1.dr[6]) to new value %#lx\n", r1.dr[6]);
+
+ printf("New state of the debug registers (r1):\n");
+ for (i = 0; i < __arraycount(r1.dr); i++)
+ printf("r1[%zu]=%#lx\n", i, r1.dr[i]);
+
+ printf("Call SETDBREGS for the child process (r1)\n");
+ ATF_REQUIRE(ptrace(PT_SETDBREGS, child, , 0) != -1);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child - expected stopped "
+ "SIGTRAP\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, SIGTRAP);
+
+ ATF_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, , slen) != -1);
+
+ ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_LWP_CREATE);
+
+ lid = state.pe_lwp;
+ printf("Reported
CVS commit: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Mon Feb 20 05:47:59 UTC 2017
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Fix more issues with compat to i386 in arch/amd64 tests for Debug Registers
Stop compating the number of available registers with 16, it's amd64
specific. i386 ships with 8 Debug Registers.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.20 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.21
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.20 Mon Feb 20 05:40:51 2017
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Mon Feb 20 05:47:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.20 2017/02/20 05:40:51 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.21 2017/02/20 05:47:59 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.20 2017/02/20 05:40:51 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.21 2017/02/20 05:47:59 kamil Exp $");
#include
#include
@@ -245,16 +245,9 @@ ATF_TC_BODY(dbregs_preserve_dr0, tc)
#endif
struct dbreg r1;
struct dbreg r2;
- /* Number of available CPU Debug Registers on AMD64 */
- const size_t len = 16;
size_t i;
int watchme;
- printf("Assert that known number of Debug Registers (%zu) is valid\n",
- len);
- ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
- ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
-
printf("Before forking process PID=%d\n", getpid());
ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
@@ -329,16 +322,9 @@ ATF_TC_BODY(dbregs_preserve_dr1, tc)
#endif
struct dbreg r1;
struct dbreg r2;
- /* Number of available CPU Debug Registers on AMD64 */
- const size_t len = 16;
size_t i;
int watchme;
- printf("Assert that known number of Debug Registers (%zu) is valid\n",
- len);
- ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
- ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
-
printf("Before forking process PID=%d\n", getpid());
ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
@@ -413,16 +399,9 @@ ATF_TC_BODY(dbregs_preserve_dr2, tc)
#endif
struct dbreg r1;
struct dbreg r2;
- /* Number of available CPU Debug Registers on AMD64 */
- const size_t len = 16;
size_t i;
int watchme;
- printf("Assert that known number of Debug Registers (%zu) is valid\n",
- len);
- ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
- ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
-
printf("Before forking process PID=%d\n", getpid());
ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
@@ -497,16 +476,9 @@ ATF_TC_BODY(dbregs_preserve_dr3, tc)
#endif
struct dbreg r1;
struct dbreg r2;
- /* Number of available CPU Debug Registers on AMD64 */
- const size_t len = 16;
size_t i;
int watchme;
- printf("Assert that known number of Debug Registers (%zu) is valid\n",
- len);
- ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
- ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
-
printf("Before forking process PID=%d\n", getpid());
ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
@@ -582,16 +554,9 @@ ATF_TC_BODY(dbregs_preserve_dr0_yield, t
#endif
struct dbreg r1;
struct dbreg r2;
- /* Number of available CPU Debug Registers on AMD64 */
- const size_t len = 16;
size_t i;
int watchme;
- printf("Assert that known number of Debug Registers (%zu) is valid\n",
- len);
- ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
- ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
-
printf("Before forking process PID=%d\n", getpid());
ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
@@ -672,16 +637,9 @@ ATF_TC_BODY(dbregs_preserve_dr1_yield, t
#endif
struct dbreg r1;
struct dbreg r2;
- /* Number of available CPU Debug Registers on AMD64 */
- const size_t len = 16;
size_t i;
int watchme;
- printf("Assert that known number of Debug Registers (%zu) is valid\n",
- len);
- ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
- ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
-
printf("Before forking process PID=%d\n", getpid());
ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
@@ -762,16 +720,9 @@ ATF_TC_BODY(dbregs_preserve_dr2_yield, t
#endif
struct dbreg r1;
struct dbreg r2;
- /* Number of available CPU Debug Registers on AMD64 */
- const size_t len = 16;
size_t i;
int watchme;
- printf("Assert that known number of Debug Registers (%zu) is valid\n",
- len);
- ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
- ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
-
printf("Before forking process PID=%d\n", getpid());
ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
@@ -852,16 +803,9 @@ ATF_TC_BODY(dbregs_preserve_dr3_yield, t
#endif
struct dbreg r1;
struct dbreg
CVS commit: src/external/ibm-public/postfix
Module Name:src
Committed By: rin
Date: Mon Feb 20 05:46:12 UTC 2017
Modified Files:
src/external/ibm-public/postfix: Makefile.inc
Log Message:
bump from NETBSD4 to NETBSD7, no functional changes at the moment
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/ibm-public/postfix/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.18 src/external/ibm-public/postfix/Makefile.inc:1.19
--- src/external/ibm-public/postfix/Makefile.inc:1.18 Tue Feb 14 01:16:43 2017
+++ src/external/ibm-public/postfix/Makefile.inc Mon Feb 20 05:46:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2017/02/14 01:16:43 christos Exp $
+# $NetBSD: Makefile.inc,v 1.19 2017/02/20 05:46:12 rin Exp $
.include
@@ -9,7 +9,7 @@ WARNS?= 0
PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist
-CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH -DNO_EAI \
+CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \
-I${DIST} \
-I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
-I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \
CVS commit: src/external/ibm-public/postfix/dist/src/util
Module Name:src Committed By: rin Date: Mon Feb 20 05:43:12 UTC 2017 Modified Files: src/external/ibm-public/postfix/dist/src/util: sys_defs.h Log Message: We have getifaddrs(3) since NetBSD 1.5, regardless of whether IPv6 is supported or not. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/dist/src/util/sys_defs.h diff -u src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.10 src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.11 --- src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.10 Mon Feb 20 05:40:03 2017 +++ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Mon Feb 20 05:43:12 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_defs.h,v 1.10 2017/02/20 05:40:03 rin Exp $ */ +/* $NetBSD: sys_defs.h,v 1.11 2017/02/20 05:43:12 rin Exp $ */ #ifndef _SYS_DEFS_H_INCLUDED_ #define _SYS_DEFS_H_INCLUDED_ @@ -185,6 +185,8 @@ || defined(USAGI_LIBINET6) #ifndef NO_IPV6 #define HAS_IPV6 +#endif +#if !defined(NO_IPV6) || defined(__NetBSD__) #define HAVE_GETIFADDRS #endif #endif
CVS commit: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Mon Feb 20 05:40:51 UTC 2017
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Add new tests dbregs_dr*_dont_inherit_lwp and improve i386 compat
Add new tests:
- dbregs_dr0_dont_inherit_lwp
- dbregs_dr1_dont_inherit_lwp
- dbregs_dr2_dont_inherit_lwp
- dbregs_dr3_dont_inherit_lwp
Fix memcmp(3) usage when comparing registers. Comparing with len is
incorrect as it should be len*sizeof(register) or just sizeof(registers).
Don't check for 16 Debug Registers, it's amd64 specific and not portable
to i386.
Don't compare registers before and after triggering a trap, it's a bug that
was hidden by incorrect usage of memcmp(3).
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.19 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.20
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.19 Mon Feb 20 02:56:03 2017
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Mon Feb 20 05:40:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.19 2017/02/20 02:56:03 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.20 2017/02/20 05:40:51 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.19 2017/02/20 02:56:03 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.20 2017/02/20 05:40:51 kamil Exp $");
#include
#include
@@ -39,6 +39,7 @@ __RCSID("$NetBSD: t_ptrace_wait.c,v 1.19
#include
#include
#include
+#include
#include
#include
#include
@@ -294,7 +295,7 @@ ATF_TC_BODY(dbregs_preserve_dr0, tc)
ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
printf("Assert that (r1) and (r2) are the same\n");
- ATF_REQUIRE(memcmp(, , len) == 0);
+ ATF_REQUIRE(memcmp(, , sizeof(r1)) == 0);
printf("Before resuming the child process where it left off and "
"without signal to be sent\n");
@@ -378,7 +379,7 @@ ATF_TC_BODY(dbregs_preserve_dr1, tc)
ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
printf("Assert that (r1) and (r2) are the same\n");
- ATF_REQUIRE(memcmp(, , len) == 0);
+ ATF_REQUIRE(memcmp(, , sizeof(r1)) == 0);
printf("Before resuming the child process where it left off and "
"without signal to be sent\n");
@@ -462,7 +463,7 @@ ATF_TC_BODY(dbregs_preserve_dr2, tc)
ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
printf("Assert that (r1) and (r2) are the same\n");
- ATF_REQUIRE(memcmp(, , len) == 0);
+ ATF_REQUIRE(memcmp(, , sizeof(r1)) == 0);
printf("Before resuming the child process where it left off and "
"without signal to be sent\n");
@@ -546,7 +547,7 @@ ATF_TC_BODY(dbregs_preserve_dr3, tc)
ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
printf("Assert that (r1) and (r2) are the same\n");
- ATF_REQUIRE(memcmp(, , len) == 0);
+ ATF_REQUIRE(memcmp(, , sizeof(r1)) == 0);
printf("Before resuming the child process where it left off and "
"without signal to be sent\n");
@@ -636,7 +637,7 @@ ATF_TC_BODY(dbregs_preserve_dr0_yield, t
ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
printf("Assert that (r1) and (r2) are the same\n");
- ATF_REQUIRE(memcmp(, , len) == 0);
+ ATF_REQUIRE(memcmp(, , sizeof(r1)) == 0);
printf("Before resuming the child process where it left off and "
"without signal to be sent\n");
@@ -726,7 +727,7 @@ ATF_TC_BODY(dbregs_preserve_dr1_yield, t
ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
printf("Assert that (r1) and (r2) are the same\n");
- ATF_REQUIRE(memcmp(, , len) == 0);
+ ATF_REQUIRE(memcmp(, , sizeof(r1)) == 0);
printf("Before resuming the child process where it left off and "
"without signal to be sent\n");
@@ -816,7 +817,7 @@ ATF_TC_BODY(dbregs_preserve_dr2_yield, t
ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
printf("Assert that (r1) and (r2) are the same\n");
- ATF_REQUIRE(memcmp(, , len) == 0);
+ ATF_REQUIRE(memcmp(, , sizeof(r1)) == 0);
printf("Before resuming the child process where it left off and "
"without signal to be sent\n");
@@ -906,7 +907,7 @@ ATF_TC_BODY(dbregs_preserve_dr3_yield, t
ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
printf("Assert that (r1) and (r2) are the same\n");
- ATF_REQUIRE(memcmp(, , len) == 0);
+ ATF_REQUIRE(memcmp(, , sizeof(r1)) == 0);
printf("Before resuming the child process where it left off and "
"without signal to be sent\n");
@@ -1002,7 +1003,7 @@ ATF_TC_BODY(dbregs_preserve_dr0_continue
ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
printf("Assert that (r1) and (r2) are the same\n");
- ATF_REQUIRE(memcmp(, , len) == 0);
+ ATF_REQUIRE(memcmp(, , sizeof(r1)) == 0);
printf("Before
CVS commit: src/external/ibm-public/postfix/dist/src/util
Module Name:src Committed By: rin Date: Mon Feb 20 05:40:03 UTC 2017 Modified Files: src/external/ibm-public/postfix/dist/src/util: sys_defs.h Log Message: correct obviously misplaced #endif To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/dist/src/util/sys_defs.h diff -u src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.9 src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.10 --- src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.9 Tue Feb 14 01:16:49 2017 +++ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Mon Feb 20 05:40:03 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_defs.h,v 1.9 2017/02/14 01:16:49 christos Exp $ */ +/* $NetBSD: sys_defs.h,v 1.10 2017/02/20 05:40:03 rin Exp $ */ #ifndef _SYS_DEFS_H_INCLUDED_ #define _SYS_DEFS_H_INCLUDED_ @@ -187,6 +187,7 @@ #define HAS_IPV6 #define HAVE_GETIFADDRS #endif +#endif #if (defined(__FreeBSD_version) && __FreeBSD_version >= 30) \ || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 10300) \ @@ -212,8 +213,6 @@ #endif #endif -#endif - /* * UNIX on MAC. */
CVS commit: src/sys/net
Module Name:src
Committed By: ozaki-r
Date: Mon Feb 20 04:23:11 UTC 2017
Modified Files:
src/sys/net: route.c
Log Message:
Make updating a rtentry in rtinit MP-safe
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/net/route.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.191 src/sys/net/route.c:1.192
--- src/sys/net/route.c:1.191 Fri Feb 17 04:31:34 2017
+++ src/sys/net/route.c Mon Feb 20 04:23:11 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.191 2017/02/17 04:31:34 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.192 2017/02/20 04:23:11 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.191 2017/02/17 04:31:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.192 2017/02/20 04:23:11 ozaki-r Exp $");
#include
#ifdef RTFLUSH_DEBUG
@@ -1512,10 +1512,6 @@ rtinit(struct ifaddr *ifa, int cmd, int
break;
case RTM_ADD:
/*
- * FIXME NOMPSAFE: the rtentry is updated with the existence
- * of refeferences of it.
- */
- /*
* XXX it looks just reverting rt_ifa replaced by ifa_rtrequest
* called via rtrequest1. Can we just prevent the replacement
* somehow and remove the following code? And also doesn't
@@ -1524,14 +1520,30 @@ rtinit(struct ifaddr *ifa, int cmd, int
if (rt->rt_ifa != ifa) {
printf("rtinit: wrong ifa (%p) was (%p)\n", ifa,
rt->rt_ifa);
- if (rt->rt_ifa->ifa_rtrequest != NULL) {
-rt->rt_ifa->ifa_rtrequest(RTM_DELETE, rt,
-);
+#ifdef NET_MPSAFE
+ KASSERT(!cpu_softintr_p());
+
+ error = rt_update_prepare(rt);
+ if (error == 0) {
+#endif
+if (rt->rt_ifa->ifa_rtrequest != NULL) {
+ rt->rt_ifa->ifa_rtrequest(RTM_DELETE,
+ rt, );
+}
+rt_replace_ifa(rt, ifa);
+rt->rt_ifp = ifa->ifa_ifp;
+if (ifa->ifa_rtrequest != NULL)
+ ifa->ifa_rtrequest(RTM_ADD, rt, );
+#ifdef NET_MPSAFE
+rt_update_finish(rt);
+ } else {
+/*
+ * If error != 0, the rtentry is being
+ * destroyed, so doing nothing doesn't
+ * matter.
+ */
}
- rt_replace_ifa(rt, ifa);
- rt->rt_ifp = ifa->ifa_ifp;
- if (ifa->ifa_rtrequest != NULL)
-ifa->ifa_rtrequest(RTM_ADD, rt, );
+#endif
}
rt_newmsg(cmd, rt);
rt_unref(rt);
CVS commit: src/etc/mtree
Module Name:src Committed By: pgoyette Date: Mon Feb 20 04:02:53 UTC 2017 Modified Files: src/etc/mtree: special Log Message: Move the /etc/sasl stuff to proper position in collating sequence. XXX Ideally we would sort the whole file... To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.158 src/etc/mtree/special:1.159 --- src/etc/mtree/special:1.158 Mon Feb 20 00:33:53 2017 +++ src/etc/mtree/special Mon Feb 20 04:02:53 2017 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.158 2017/02/20 00:33:53 pgoyette Exp $ +# $NetBSD: special,v 1.159 2017/02/20 04:02:53 pgoyette Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -276,11 +276,6 @@ ./etc/rc.d/routed type=file mode=0555 ./etc/rc.d/rpcbind type=file mode=0555 ./etc/rc.d/rtadvd type=file mode=0555 -./etc/saslc.d type=dir mode=0755 -./etc/saslc.d/postfix type=dir mode=0755 -./etc/saslc.d/postfix/mech type=dir mode=0755 -./etc/saslc.d/saslc type=dir mode=0755 -./etc/saslc.d/saslc/mech type=dir mode=0755 ./etc/rc.d/rtclocaltime type=file mode=0555 ./etc/rc.d/rwho type=file mode=0555 ./etc/rc.d/savecore type=file mode=0555 @@ -316,6 +311,11 @@ ./etc/resolv.conf type=file mode=0644 optional ./etc/rpc type=file mode=0644 ./etc/rtadvd.conf type=file mode=0644 optional +./etc/saslc.d type=dir mode=0755 +./etc/saslc.d/postfix type=dir mode=0755 +./etc/saslc.d/postfix/mech type=dir mode=0755 +./etc/saslc.d/saslc type=dir mode=0755 +./etc/saslc.d/saslc/mech type=dir mode=0755 ./etc/security type=file mode=0644 ./etc/security.conf type=file mode=0644 ./etc/security.local type=file mode=0644 optional
CVS commit: src/doc
Module Name:src Committed By: kamil Date: Mon Feb 20 03:37:24 UTC 2017 Modified Files: src/doc: TODO.ptrace Log Message: Add new entry to TODO.ptrace check 64-bit debugger on 64-bit kernel tracing capabilities of 32-bit tracee Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/doc/TODO.ptrace Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.ptrace diff -u src/doc/TODO.ptrace:1.22 src/doc/TODO.ptrace:1.23 --- src/doc/TODO.ptrace:1.22 Fri Feb 17 21:22:02 2017 +++ src/doc/TODO.ptrace Mon Feb 20 03:37:24 2017 @@ -1,4 +1,4 @@ -$NetBSD: TODO.ptrace,v 1.22 2017/02/17 21:22:02 kamil Exp $ +$NetBSD: TODO.ptrace,v 1.23 2017/02/20 03:37:24 kamil Exp $ Items we (currently) plan to finish in the ptrace(2) field: @@ -31,6 +31,7 @@ Items we (currently) plan to finish in t - fix more calls for netbsd32 compat - research ipkdb(4) - research kgdb(4) + - check 64-bit debugger on 64-bit kernel tracing capabilities of 32-bit tracee and of course: fix as many bugs as possible.
CVS commit: src/share/man/man4
Module Name:src Committed By: ryoon Date: Mon Feb 20 03:29:04 UTC 2017 Modified Files: src/share/man/man4: acpi.4 Log Message: Add valz(4) To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/share/man/man4/acpi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpi.4 diff -u src/share/man/man4/acpi.4:1.81 src/share/man/man4/acpi.4:1.82 --- src/share/man/man4/acpi.4:1.81 Tue Jan 3 08:49:04 2017 +++ src/share/man/man4/acpi.4 Mon Feb 20 03:29:04 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: acpi.4,v 1.81 2017/01/03 08:49:04 maya Exp $ +.\" $NetBSD: acpi.4,v 1.82 2017/02/20 03:29:04 ryoon Exp $ .\" .\" Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 29, 2016 +.Dd February 20, 2017 .Dt ACPI 4 .Os .Sh NAME @@ -309,6 +309,8 @@ IBM/Lenovo ThinkPad laptop device driver Abit uGuru Hardware monitor. .It Xr vald 4 Toshiba Libretto device. +.It Xr valz 4 +Toshiba Dynabook device. .It Xr wb 4 Winbond W83L518D Integrated Media Reader. .It Xr wss 4
CVS commit: src
Module Name:src Committed By: kamil Date: Mon Feb 20 03:14:42 UTC 2017 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Log Message: Remove tests/lib/libc/gen/exect paths from mtree and sets The exect tests have been removed from the distribution. Requested by Thomas Klausner. To generate a diff of this commit: cvs rdiff -u -r1.721 -r1.722 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.140 -r1.141 src/etc/mtree/NetBSD.dist.tests 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.721 src/distrib/sets/lists/tests/mi:1.722 --- src/distrib/sets/lists/tests/mi:1.721 Thu Feb 16 08:44:47 2017 +++ src/distrib/sets/lists/tests/mi Mon Feb 20 03:14:42 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.721 2017/02/16 08:44:47 knakahara Exp $ +# $NetBSD: mi,v 1.722 2017/02/20 03:14:42 kamil Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -91,7 +91,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/c063tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/dbtests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/gentests-lib-debug compattestfile,atf -./usr/libdata/debug/usr/tests/lib/libc/gen/exect tests-kernel-tests compattestfile,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/exect tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/gen/execve tests-kernel-tests compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn tests-kernel-tests compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/getaddrinfo tests-obsolete obsolete Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.140 src/etc/mtree/NetBSD.dist.tests:1.141 --- src/etc/mtree/NetBSD.dist.tests:1.140 Thu Feb 16 08:44:47 2017 +++ src/etc/mtree/NetBSD.dist.tests Mon Feb 20 03:14:42 2017 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.140 2017/02/16 08:44:47 knakahara Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.141 2017/02/20 03:14:42 kamil Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -81,7 +81,6 @@ ./usr/libdata/debug/usr/tests/lib/libc/c063 ./usr/libdata/debug/usr/tests/lib/libc/db ./usr/libdata/debug/usr/tests/lib/libc/gen -./usr/libdata/debug/usr/tests/lib/libc/gen/exect ./usr/libdata/debug/usr/tests/lib/libc/gen/execve ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn ./usr/libdata/debug/usr/tests/lib/libc/hash @@ -265,7 +264,6 @@ ./usr/tests/lib/libc/c063 ./usr/tests/lib/libc/db ./usr/tests/lib/libc/gen -./usr/tests/lib/libc/gen/exect ./usr/tests/lib/libc/gen/execve ./usr/tests/lib/libc/gen/posix_spawn ./usr/tests/lib/libc/hash
CVS commit: src/sys/net
Module Name:src
Committed By: ozaki-r
Date: Mon Feb 20 03:08:38 UTC 2017
Modified Files:
src/sys/net: bpf.c
Log Message:
Reinit a pslist entry before inserting it to a pslist again
Fix PR kern/51984
Tested by nonaka@
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/sys/net/bpf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.215 src/sys/net/bpf.c:1.216
--- src/sys/net/bpf.c:1.215 Sun Feb 19 13:58:42 2017
+++ src/sys/net/bpf.c Mon Feb 20 03:08:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.215 2017/02/19 13:58:42 christos Exp $ */
+/* $NetBSD: bpf.c,v 1.216 2017/02/20 03:08:38 ozaki-r Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.215 2017/02/19 13:58:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.216 2017/02/20 03:08:38 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -1380,11 +1380,13 @@ bpf_setif(struct bpf_d *d, struct ifreq
}
mutex_enter(d->bd_mtx);
if (bp != d->bd_bif) {
- if (d->bd_bif)
+ if (d->bd_bif) {
/*
* Detach if attached to something else.
*/
bpf_detachd(d);
+BPFIF_DLIST_ENTRY_INIT(d);
+ }
bpf_attachd(d, bp);
}
@@ -2239,6 +2241,7 @@ bpf_setdlt(struct bpf_d *d, u_int dlt)
return EINVAL;
opromisc = d->bd_promisc;
bpf_detachd(d);
+ BPFIF_DLIST_ENTRY_INIT(d);
bpf_attachd(d, bp);
reset_d(d);
if (opromisc) {
CVS commit: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Mon Feb 20 02:56:03 UTC 2017
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Add new tests dbregs_dr[0123]_trap_code in arch/amd64
Add new tests:
- dbregs_dr0_trap_code
- dbregs_dr1_trap_code
- dbregs_dr2_trap_code
- dbregs_dr3_trap_code
This is the final set of tests for trap types that are supposed to be
supported by all amd64 CPUs.
Traps for code (instruction) execution must be set to 1 byte, otherwise
they are undefined. x86 code traps must point to the first byte of an
instruction.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.18 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.19
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.18 Mon Feb 20 01:34:53 2017
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Mon Feb 20 02:56:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.18 2017/02/20 01:34:53 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.19 2017/02/20 02:56:03 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.18 2017/02/20 01:34:53 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.19 2017/02/20 02:56:03 kamil Exp $");
#include
#include
@@ -5986,6 +5986,558 @@ ATF_TC_BODY(dbregs_dr3_trap_variable_rea
}
#endif
+#if defined(HAVE_DBREGS)
+ATF_TC(dbregs_dr0_trap_code);
+ATF_TC_HEAD(dbregs_dr0_trap_code, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify that setting trap with DR0 triggers SIGTRAP "
+ "(break on code execution trap)");
+}
+
+ATF_TC_BODY(dbregs_dr0_trap_code, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+ struct dbreg r1;
+ struct dbreg r2;
+ /* Number of available CPU Debug Registers on AMD64 */
+ const size_t len = 16;
+ size_t i;
+ volatile int watchme = 1;
+ union u dr7;
+
+ struct ptrace_siginfo info;
+ memset(, 0, sizeof(info));
+
+ dr7.raw = 0;
+ dr7.bits.global_dr0_breakpoint = 1;
+ dr7.bits.condition_dr0 = 0; /* 0b00 -- break on code execution */
+ dr7.bits.len_dr0 = 0; /* 0b00 -- 1 byte */
+
+ printf("Assert that known number of Debug Registers (%zu) is valid\n",
+ len);
+ ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
+ ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
+
+ printf("Before forking process PID=%d\n", getpid());
+ ATF_REQUIRE((child = fork()) != -1);
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("check_happy(%d)=%d\n", watchme, check_happy(watchme));
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Call GETDBREGS for the child process (r1)\n");
+ ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
+
+ printf("State of the debug registers (r1):\n");
+ for (i = 0; i < __arraycount(r1.dr); i++)
+ printf("r1[%zu]=%#lx\n", i, r1.dr[i]);
+
+ r1.dr[0] = (long)(intptr_t)check_happy;
+ printf("Set DR0 (r1.dr[0]) to new value %#lx\n", r1.dr[0]);
+
+ r1.dr[7] = dr7.raw;
+ printf("Set DR7 (r1.dr[7]) to new value %#lx\n", r1.dr[7]);
+
+ printf("New state of the debug registers (r1):\n");
+ for (i = 0; i < __arraycount(r1.dr); i++)
+ printf("r1[%zu]=%#lx\n", i, r1.dr[i]);
+
+ printf("Call SETDBREGS for the child process (r1)\n");
+ ATF_REQUIRE(ptrace(PT_SETDBREGS, child, , 0) != -1);
+
+ printf("Call CONTINUE for the child process\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, SIGTRAP);
+
+ printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
+ ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, , sizeof(info)) != -1);
+
+ printf("Signal traced to lwpid=%d\n", info.psi_lwpid);
+ printf("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
+ info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
+ info.psi_siginfo.si_errno);
+
+ printf("Before checking siginfo_t\n");
+ ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
+ ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_DBREG);
CVS commit: src/crypto/external/bsd/netpgp/dist/src
Module Name:src
Committed By: khorben
Date: Mon Feb 20 01:38:28 UTC 2017
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c
src/crypto/external/bsd/netpgp/dist/src/librsa: rsastubs.c
Log Message:
Remove a useless loop around getpass()
According to getpass(3), this library function cannot return NULL.
Verified with a source code inspection.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.98 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.99
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.98 Tue Jun 28 16:34:40 2016
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Mon Feb 20 01:38:28 2017
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.98 2016/06/28 16:34:40 christos Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.99 2017/02/20 01:38:28 khorben Exp $");
#endif
#include
@@ -740,14 +740,10 @@ find_passphrase(FILE *passfp, const char
}
for (i = 0 ; i < attempts ; i++) {
(void) snprintf(prompt, sizeof(prompt), "Enter passphrase for %.16s: ", id);
- if ((cp = getpass(prompt)) == NULL) {
- break;
- }
+ cp = getpass(prompt);
cc = snprintf(buf, sizeof(buf), "%s", cp);
(void) snprintf(prompt, sizeof(prompt), "Repeat passphrase for %.16s: ", id);
- if ((cp = getpass(prompt)) == NULL) {
- break;
- }
+ cp = getpass(prompt);
cc = snprintf(passphrase, size, "%s", cp);
if (strcmp(buf, passphrase) == 0) {
(void) memset(buf, 0x0, sizeof(buf));
Index: src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c
diff -u src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c:1.2 src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c:1.2 Tue Nov 20 05:26:25 2012
+++ src/crypto/external/bsd/netpgp/dist/src/librsa/rsastubs.c Mon Feb 20 01:38:28 2017
@@ -43,9 +43,7 @@ pass_cb(char *buf, int size, int rwflag,
USE_ARG(rwflag);
snprintf(prompt, sizeof(prompt), "\"%s\" passphrase: ", (char *)u);
- if ((passphrase = getpass(prompt)) == NULL) {
- return -1;
- }
+ passphrase = getpass(prompt);
(void) memcpy(buf, passphrase, (size_t)size);
return (int)strlen(passphrase);
}
CVS commit: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Mon Feb 20 01:34:53 UTC 2017
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Add new tests dbregs_dr*_trap_variable_readwrite_read_*byte* in arch/amd64
Add new tests:
- dbregs_dr0_trap_variable_readwrite_read_byte
- dbregs_dr1_trap_variable_readwrite_read_byte
- dbregs_dr2_trap_variable_readwrite_read_byte
- dbregs_dr3_trap_variable_readwrite_read_byte
- dbregs_dr0_trap_variable_readwrite_read_2bytes
- dbregs_dr1_trap_variable_readwrite_read_2bytes
- dbregs_dr2_trap_variable_readwrite_read_2bytes
- dbregs_dr3_trap_variable_readwrite_read_2bytes
- dbregs_dr0_trap_variable_readwrite_read_4bytes
- dbregs_dr1_trap_variable_readwrite_read_4bytes
- dbregs_dr2_trap_variable_readwrite_read_4bytes
- dbregs_dr3_trap_variable_readwrite_read_4bytes
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.17 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.18
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.17 Mon Feb 20 01:21:47 2017
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Mon Feb 20 01:34:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.17 2017/02/20 01:21:47 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.18 2017/02/20 01:34:53 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.17 2017/02/20 01:21:47 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.18 2017/02/20 01:34:53 kamil Exp $");
#include
#include
@@ -4426,6 +4426,1566 @@ ATF_TC_BODY(dbregs_dr3_trap_variable_rea
}
#endif
+#if defined(HAVE_DBREGS)
+ATF_TC(dbregs_dr0_trap_variable_readwrite_read_byte);
+ATF_TC_HEAD(dbregs_dr0_trap_variable_readwrite_read_byte, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify that setting trap with DR0 triggers SIGTRAP "
+ "(break on data read/write trap in write 1 byte mode)");
+}
+
+ATF_TC_BODY(dbregs_dr0_trap_variable_readwrite_read_byte, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+ struct dbreg r1;
+ struct dbreg r2;
+ /* Number of available CPU Debug Registers on AMD64 */
+ const size_t len = 16;
+ size_t i;
+ volatile int watchme = 1;
+ union u dr7;
+
+ struct ptrace_siginfo info;
+ memset(, 0, sizeof(info));
+
+ dr7.raw = 0;
+ dr7.bits.global_dr0_breakpoint = 1;
+ dr7.bits.condition_dr0 = 3; /* 0b11 -- break on data write */
+ dr7.bits.len_dr0 = 0; /* 0b00 -- 1 byte */
+
+ printf("Assert that known number of Debug Registers (%zu) is valid\n",
+ len);
+ ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
+ ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
+
+ printf("Before forking process PID=%d\n", getpid());
+ ATF_REQUIRE((child = fork()) != -1);
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("watchme=%d\n", watchme);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Call GETDBREGS for the child process (r1)\n");
+ ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
+
+ printf("State of the debug registers (r1):\n");
+ for (i = 0; i < __arraycount(r1.dr); i++)
+ printf("r1[%zu]=%#lx\n", i, r1.dr[i]);
+
+ r1.dr[0] = (long)(intptr_t)
+ printf("Set DR0 (r1.dr[0]) to new value %#lx\n", r1.dr[0]);
+
+ r1.dr[7] = dr7.raw;
+ printf("Set DR7 (r1.dr[7]) to new value %#lx\n", r1.dr[7]);
+
+ printf("New state of the debug registers (r1):\n");
+ for (i = 0; i < __arraycount(r1.dr); i++)
+ printf("r1[%zu]=%#lx\n", i, r1.dr[i]);
+
+ printf("Call SETDBREGS for the child process (r1)\n");
+ ATF_REQUIRE(ptrace(PT_SETDBREGS, child, , 0) != -1);
+
+ printf("Call CONTINUE for the child process\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, SIGTRAP);
+
+ printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
+ ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, , sizeof(info)) != -1);
+
+ printf("Signal traced to lwpid=%d\n", info.psi_lwpid);
+
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: khorben
Date: Mon Feb 20 01:33:28 UTC 2017
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: reader.c
Log Message:
Remove a useless loop around getpass()
According to getpass(3), this library function cannot return NULL.
Verified with a source code inspection.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.49 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.50
--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.49 Mon Mar 5 02:20:18 2012
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c Mon Feb 20 01:33:28 2017
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: reader.c,v 1.49 2012/03/05 02:20:18 christos Exp $");
+__RCSID("$NetBSD: reader.c,v 1.50 2017/02/20 01:33:28 khorben Exp $");
#endif
#include
@@ -162,8 +162,7 @@ pgp_getpassphrase(void *in, char *phrase
char *p;
if (in == NULL) {
- while ((p = getpass("netpgp passphrase: ")) == NULL) {
- }
+ p = getpass("netpgp passphrase: ");
(void) snprintf(phrase, size, "%s", p);
} else {
if (fgets(phrase, (int)size, in) == NULL) {
CVS commit: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Mon Feb 20 01:21:47 UTC 2017
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Add new tests dbregs_dr*_trap_variable_readwrite_write_*byte* in arch/amd64
Add new tests:
- dbregs_dr0_trap_variable_readwrite_write_byte
- dbregs_dr1_trap_variable_readwrite_write_byte
- dbregs_dr2_trap_variable_readwrite_write_byte
- dbregs_dr3_trap_variable_readwrite_write_byte
- dbregs_dr0_trap_variable_readwrite_write_2bytes
- dbregs_dr1_trap_variable_readwrite_write_2bytes
- dbregs_dr2_trap_variable_readwrite_write_2bytes
- dbregs_dr3_trap_variable_readwrite_write_2bytes
- dbregs_dr0_trap_variable_readwrite_write_4bytes
- dbregs_dr1_trap_variable_readwrite_write_4bytes
- dbregs_dr2_trap_variable_readwrite_write_4bytes
- dbregs_dr3_trap_variable_readwrite_write_4bytes
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.16 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.17
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.16 Sun Feb 19 23:58:30 2017
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Mon Feb 20 01:21:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.16 2017/02/19 23:58:30 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.17 2017/02/20 01:21:47 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.16 2017/02/19 23:58:30 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.17 2017/02/20 01:21:47 kamil Exp $");
#include
#include
@@ -1336,7 +1336,7 @@ ATF_TC_BODY(dbregs_dr0_trap_variable_wri
dr7.raw = 0;
dr7.bits.global_dr0_breakpoint = 1;
- dr7.bits.condition_dr0 = 3; /* 0b11 -- break on data write */
+ dr7.bits.condition_dr0 = 1; /* 0b01 -- break on data write only */
dr7.bits.len_dr0 = 0; /* 0b00 -- 1 byte */
printf("Assert that known number of Debug Registers (%zu) is valid\n",
@@ -1466,7 +1466,7 @@ ATF_TC_BODY(dbregs_dr1_trap_variable_wri
dr7.raw = 0;
dr7.bits.global_dr1_breakpoint = 1;
- dr7.bits.condition_dr1 = 3; /* 0b11 -- break on data write */
+ dr7.bits.condition_dr1 = 1; /* 0b01 -- break on data write only */
dr7.bits.len_dr1 = 0; /* 0b00 -- 1 byte */
printf("Assert that known number of Debug Registers (%zu) is valid\n",
@@ -1596,7 +1596,7 @@ ATF_TC_BODY(dbregs_dr2_trap_variable_wri
dr7.raw = 0;
dr7.bits.global_dr2_breakpoint = 1;
- dr7.bits.condition_dr2 = 3; /* 0b11 -- break on data write */
+ dr7.bits.condition_dr2 = 1; /* 0b01 -- break on data write only */
dr7.bits.len_dr2 = 0; /* 0b00 -- 1 byte */
printf("Assert that known number of Debug Registers (%zu) is valid\n",
@@ -1726,7 +1726,7 @@ ATF_TC_BODY(dbregs_dr3_trap_variable_wri
dr7.raw = 0;
dr7.bits.global_dr3_breakpoint = 1;
- dr7.bits.condition_dr3 = 3; /* 0b11 -- break on data write */
+ dr7.bits.condition_dr3 = 1; /* 0b01 -- break on data write only */
dr7.bits.len_dr3 = 0; /* 0b00 -- 1 byte */
printf("Assert that known number of Debug Registers (%zu) is valid\n",
@@ -1856,7 +1856,7 @@ ATF_TC_BODY(dbregs_dr0_trap_variable_wri
dr7.raw = 0;
dr7.bits.global_dr0_breakpoint = 1;
- dr7.bits.condition_dr0 = 3; /* 0b11 -- break on data write */
+ dr7.bits.condition_dr0 = 1; /* 0b01 -- break on data write only */
dr7.bits.len_dr0 = 1; /* 0b01 -- 2 bytes */
printf("Assert that known number of Debug Registers (%zu) is valid\n",
@@ -1986,7 +1986,7 @@ ATF_TC_BODY(dbregs_dr1_trap_variable_wri
dr7.raw = 0;
dr7.bits.global_dr1_breakpoint = 1;
- dr7.bits.condition_dr1 = 3; /* 0b11 -- break on data write */
+ dr7.bits.condition_dr1 = 1; /* 0b01 -- break on data write only */
dr7.bits.len_dr1 = 1; /* 0b01 -- 2 bytes */
printf("Assert that known number of Debug Registers (%zu) is valid\n",
@@ -2116,7 +2116,7 @@ ATF_TC_BODY(dbregs_dr2_trap_variable_wri
dr7.raw = 0;
dr7.bits.global_dr2_breakpoint = 1;
- dr7.bits.condition_dr2 = 3; /* 0b11 -- break on data write */
+ dr7.bits.condition_dr2 = 1; /* 0b01 -- break on data write only */
dr7.bits.len_dr2 = 1; /* 0b01 -- 2 bytes */
printf("Assert that known number of Debug Registers (%zu) is valid\n",
@@ -2246,7 +2246,7 @@ ATF_TC_BODY(dbregs_dr3_trap_variable_wri
dr7.raw = 0;
dr7.bits.global_dr3_breakpoint = 1;
- dr7.bits.condition_dr3 = 3; /* 0b11 -- break on data write */
+ dr7.bits.condition_dr3 = 1; /* 0b01 -- break on data write only */
dr7.bits.len_dr3 = 1; /* 0b01 -- 2 bytes */
printf("Assert that known number of Debug Registers (%zu) is valid\n",
@@ -2376,7 +2376,7 @@ ATF_TC_BODY(dbregs_dr0_trap_variable_wri
dr7.raw = 0;
dr7.bits.global_dr0_breakpoint = 1;
- dr7.bits.condition_dr0 = 3; /* 0b11 --
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: khorben
Date: Mon Feb 20 00:51:08 UTC 2017
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c
Log Message:
Do not crash when listing keys without a keyring
To test: (with an empty ~/.gnupg)
$ netpgpkeys --import-key /dev/null
Submitted on tech-pkg@ as:
[PATCH 01/11] Do not crash when listing keys without a keyring
Different patch for the same issue.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.50 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.51
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.50 Sat Jun 25 00:37:44 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c Mon Feb 20 00:51:08 2017
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: keyring.c,v 1.50 2011/06/25 00:37:44 agc Exp $");
+__RCSID("$NetBSD: keyring.c,v 1.51 2017/02/20 00:51:08 khorben Exp $");
#endif
#ifdef HAVE_FCNTL_H
@@ -993,9 +993,12 @@ pgp_keyring_list(pgp_io_t *io, const pgp
{
pgp_key_t *key;
unsigned n;
+ unsigned keyc = (keyring != NULL) ? keyring->keyc : 0;
- (void) fprintf(io->res, "%u key%s\n", keyring->keyc,
- (keyring->keyc == 1) ? "" : "s");
+ (void) fprintf(io->res, "%u key%s\n", keyc, (keyc == 1) ? "" : "s");
+ if (keyring == NULL) {
+ return 1;
+ }
for (n = 0, key = keyring->keys; n < keyring->keyc; ++n, ++key) {
if (pgp_is_key_secret(key)) {
pgp_print_keydata(io, keyring, key, "sec",
CVS commit: src/etc/mtree
Module Name:src Committed By: pgoyette Date: Mon Feb 20 00:33:53 UTC 2017 Modified Files: src/etc/mtree: special Log Message: Add /etc/rc.d/unbound per christos@ XXX should we move the /etc/sasl/ entries to their proper place in XXX sort order? as of now they're sitting in the middle of /etc/rc.d ! To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.157 src/etc/mtree/special:1.158 --- src/etc/mtree/special:1.157 Mon Feb 20 00:29:37 2017 +++ src/etc/mtree/special Mon Feb 20 00:33:53 2017 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.157 2017/02/20 00:29:37 pgoyette Exp $ +# $NetBSD: special,v 1.158 2017/02/20 00:33:53 pgoyette Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -296,6 +296,7 @@ ./etc/rc.d/timed type=file mode=0555 ./etc/rc.d/tpctl type=file mode=0555 ./etc/rc.d/ttys type=file mode=0555 +./etc/rc.d/unbound type=file mode=0555 ./etc/rc.d/veriexec type=file mode=0555 ./etc/rc.d/virecover type=file mode=0555 ./etc/rc.d/wdogctl type=file mode=0555
CVS commit: src/etc/mtree
Module Name:src Committed By: pgoyette Date: Mon Feb 20 00:29:37 UTC 2017 Modified Files: src/etc/mtree: special Log Message: Mark the entry for /etc/rc.d/nsd optional - it's not included in every system. To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.156 src/etc/mtree/special:1.157 --- src/etc/mtree/special:1.156 Sat Jan 7 22:37:22 2017 +++ src/etc/mtree/special Mon Feb 20 00:29:37 2017 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.156 2017/01/07 22:37:22 christos Exp $ +# $NetBSD: special,v 1.157 2017/02/20 00:29:37 pgoyette Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -252,7 +252,7 @@ ./etc/rc.d/nfslocking type=file mode=0555 ./etc/rc.d/npf type=file mode=0555 ./etc/rc.d/npfd type=file mode=0555 -./etc/rc.d/nsd type=file mode=0555 +./etc/rc.d/nsd type=file mode=0555 optional ./etc/rc.d/ntpd type=file mode=0555 ./etc/rc.d/ntpdate type=file mode=0555 ./etc/rc.d/perusertmp type=file mode=0555
CVS commit: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Sun Feb 19 23:58:30 UTC 2017
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Extend dbregs_dr*_trap_variable tests to 1-2-4 byte traps in arch/amd64
Replace the following tests:
- dbregs_dr0_trap_variable
- dbregs_dr1_trap_variable
- dbregs_dr2_trap_variable
- dbregs_dr3_trap_variable
With new ones:
- dbregs_dr0_trap_variable_writeonly_byte
- dbregs_dr1_trap_variable_writeonly_byte
- dbregs_dr2_trap_variable_writeonly_byte
- dbregs_dr3_trap_variable_writeonly_byte
- dbregs_dr0_trap_variable_writeonly_2bytes
- dbregs_dr1_trap_variable_writeonly_2bytes
- dbregs_dr2_trap_variable_writeonly_2bytes
- dbregs_dr3_trap_variable_writeonly_2bytes
- dbregs_dr0_trap_variable_writeonly_4bytes
- dbregs_dr1_trap_variable_writeonly_4bytes
- dbregs_dr2_trap_variable_writeonly_4bytes
- dbregs_dr3_trap_variable_writeonly_4bytes
All tests pass with my local implementation of debug registers. Once the
interface will be verified, I will prepare it for commit to HEAD.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.15 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.16
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.15 Sun Feb 19 22:09:29 2017
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Sun Feb 19 23:58:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.15 2017/02/19 22:09:29 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.16 2017/02/19 23:58:30 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.15 2017/02/19 22:09:29 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.16 2017/02/19 23:58:30 kamil Exp $");
#include
#include
@@ -1307,14 +1307,1055 @@ ATF_TC_BODY(dbregs_preserve_dr3_continue
#endif
#if defined(HAVE_DBREGS)
-ATF_TC(dbregs_dr0_trap_variable);
-ATF_TC_HEAD(dbregs_dr0_trap_variable, tc)
+ATF_TC(dbregs_dr0_trap_variable_writeonly_byte);
+ATF_TC_HEAD(dbregs_dr0_trap_variable_writeonly_byte, tc)
{
atf_tc_set_md_var(tc, "descr",
- "Verify that setting trap with DR0 triggers SIGTRAP");
+ "Verify that setting trap with DR0 triggers SIGTRAP "
+ "(break on data writes only and 1 byte mode)");
}
-ATF_TC_BODY(dbregs_dr0_trap_variable, tc)
+ATF_TC_BODY(dbregs_dr0_trap_variable_writeonly_byte, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+ struct dbreg r1;
+ struct dbreg r2;
+ /* Number of available CPU Debug Registers on AMD64 */
+ const size_t len = 16;
+ size_t i;
+ volatile int watchme;
+ union u dr7;
+
+ struct ptrace_siginfo info;
+ memset(, 0, sizeof(info));
+
+ dr7.raw = 0;
+ dr7.bits.global_dr0_breakpoint = 1;
+ dr7.bits.condition_dr0 = 3; /* 0b11 -- break on data write */
+ dr7.bits.len_dr0 = 0; /* 0b00 -- 1 byte */
+
+ printf("Assert that known number of Debug Registers (%zu) is valid\n",
+ len);
+ ATF_REQUIRE_EQ(__arraycount(r1.dr), len);
+ ATF_REQUIRE_EQ(__arraycount(r2.dr), len);
+
+ printf("Before forking process PID=%d\n", getpid());
+ ATF_REQUIRE((child = fork()) != -1);
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ watchme = 1;
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Call GETDBREGS for the child process (r1)\n");
+ ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
+
+ printf("State of the debug registers (r1):\n");
+ for (i = 0; i < __arraycount(r1.dr); i++)
+ printf("r1[%zu]=%#lx\n", i, r1.dr[i]);
+
+ r1.dr[0] = (long)(intptr_t)
+ printf("Set DR0 (r1.dr[0]) to new value %#lx\n", r1.dr[0]);
+
+ r1.dr[7] = dr7.raw;
+ printf("Set DR7 (r1.dr[7]) to new value %#lx\n", r1.dr[7]);
+
+ printf("New state of the debug registers (r1):\n");
+ for (i = 0; i < __arraycount(r1.dr); i++)
+ printf("r1[%zu]=%#lx\n", i, r1.dr[i]);
+
+ printf("Call SETDBREGS for the child process (r1)\n");
+ ATF_REQUIRE(ptrace(PT_SETDBREGS, child, , 0) != -1);
+
+ printf("Call CONTINUE for the child process\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s()
CVS commit: src/tests/kernel/arch/amd64
Module Name:src
Committed By: kamil
Date: Sun Feb 19 22:09:29 UTC 2017
Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c
Log Message:
Add checks for si_code in dbregs_dr[0123]_trap_variable in ATF arch/amd64
Validate that debug register traps generate appropriate SIGTRAP signal with
TRAP_DBREG property in si_code.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/kernel/arch/amd64/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.14 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.15
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.14 Sat Feb 18 04:30:34 2017
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Sun Feb 19 22:09:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.14 2017/02/18 04:30:34 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.15 2017/02/19 22:09:29 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.14 2017/02/18 04:30:34 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.15 2017/02/19 22:09:29 kamil Exp $");
#include
#include
@@ -1330,6 +1330,9 @@ ATF_TC_BODY(dbregs_dr0_trap_variable, tc
volatile int watchme;
union u dr7;
+ struct ptrace_siginfo info;
+ memset(, 0, sizeof(info));
+
dr7.raw = 0;
dr7.bits.global_dr0_breakpoint = 1;
dr7.bits.condition_dr0 = 3; /* 0b11 -- break on data write */
@@ -1392,6 +1395,18 @@ ATF_TC_BODY(dbregs_dr0_trap_variable, tc
validate_status_stopped(status, SIGTRAP);
+ printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
+ ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, , sizeof(info)) != -1);
+
+ printf("Signal traced to lwpid=%d\n", info.psi_lwpid);
+ printf("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
+ info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
+ info.psi_siginfo.si_errno);
+
+ printf("Before checking siginfo_t\n");
+ ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
+ ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_DBREG);
+
printf("Call CONTINUE for the child process\n");
ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
@@ -1444,6 +1459,9 @@ ATF_TC_BODY(dbregs_dr1_trap_variable, tc
volatile int watchme;
union u dr7;
+ struct ptrace_siginfo info;
+ memset(, 0, sizeof(info));
+
dr7.raw = 0;
dr7.bits.global_dr1_breakpoint = 1;
dr7.bits.condition_dr1 = 3; /* 0b11 -- break on data write */
@@ -1506,6 +1524,18 @@ ATF_TC_BODY(dbregs_dr1_trap_variable, tc
validate_status_stopped(status, SIGTRAP);
+ printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
+ ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, , sizeof(info)) != -1);
+
+ printf("Signal traced to lwpid=%d\n", info.psi_lwpid);
+ printf("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
+ info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
+ info.psi_siginfo.si_errno);
+
+ printf("Before checking siginfo_t\n");
+ ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
+ ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_DBREG);
+
printf("Call CONTINUE for the child process\n");
ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
@@ -1558,6 +1588,9 @@ ATF_TC_BODY(dbregs_dr2_trap_variable, tc
volatile int watchme;
union u dr7;
+ struct ptrace_siginfo info;
+ memset(, 0, sizeof(info));
+
dr7.raw = 0;
dr7.bits.global_dr2_breakpoint = 1;
dr7.bits.condition_dr2 = 3; /* 0b11 -- break on data write */
@@ -1620,6 +1653,18 @@ ATF_TC_BODY(dbregs_dr2_trap_variable, tc
validate_status_stopped(status, SIGTRAP);
+ printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
+ ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, , sizeof(info)) != -1);
+
+ printf("Signal traced to lwpid=%d\n", info.psi_lwpid);
+ printf("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
+ info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
+ info.psi_siginfo.si_errno);
+
+ printf("Before checking siginfo_t\n");
+ ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
+ ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_DBREG);
+
printf("Call CONTINUE for the child process\n");
ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
@@ -1672,6 +1717,9 @@ ATF_TC_BODY(dbregs_dr3_trap_variable, tc
volatile int watchme;
union u dr7;
+ struct ptrace_siginfo info;
+ memset(, 0, sizeof(info));
+
dr7.raw = 0;
dr7.bits.global_dr3_breakpoint = 1;
dr7.bits.condition_dr3 = 3; /* 0b11 -- break on data write */
@@ -1734,6 +1782,18 @@ ATF_TC_BODY(dbregs_dr3_trap_variable, tc
validate_status_stopped(status, SIGTRAP);
+ printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
+ ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, , sizeof(info)) != -1);
+
+ printf("Signal traced to lwpid=%d\n",
CVS commit: src/sys/net/npf
Module Name:src
Committed By: christos
Date: Sun Feb 19 20:27:22 UTC 2017
Modified Files:
src/sys/net/npf: npf_handler.c npf_inet.c
Log Message:
Don't reassemble ipv6 fragments, instead treat the first fragment as a regular
packet (subject to filtering rules), and pass subsequent fragments in the
same group unconditionally.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/net/npf/npf_handler.c \
src/sys/net/npf/npf_inet.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_handler.c
diff -u src/sys/net/npf/npf_handler.c:1.36 src/sys/net/npf/npf_handler.c:1.37
--- src/sys/net/npf/npf_handler.c:1.36 Sat Jan 28 19:15:54 2017
+++ src/sys/net/npf/npf_handler.c Sun Feb 19 15:27:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_handler.c,v 1.36 2017/01/29 00:15:54 christos Exp $ */
+/* $NetBSD: npf_handler.c,v 1.37 2017/02/19 20:27:22 christos Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_handler.c,v 1.36 2017/01/29 00:15:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_handler.c,v 1.37 2017/02/19 20:27:22 christos Exp $");
#include
#include
@@ -129,7 +129,7 @@ npf_packet_handler(npf_t *npf, struct mb
npf_conn_t *con;
npf_rule_t *rl;
npf_rproc_t *rp;
- int error, decision;
+ int error, decision, flags;
uint32_t ntag;
npf_match_info_t mi;
@@ -155,9 +155,17 @@ npf_packet_handler(npf_t *npf, struct mb
rp = NULL;
/* Cache everything. Determine whether it is an IP fragment. */
- if (__predict_false(npf_cache_all() & NPC_IPFRAG)) {
+ flags = npf_cache_all();
+ if (__predict_false(flags & NPC_IPFRAG)) {
/*
- * Pass to IPv4 or IPv6 reassembly mechanism.
+ * We pass IPv6 fragments unconditionally
+ * The first IPv6 fragment is not marked as such
+ * and passes through the filter
+ */
+ if (flags & NPC_IP6)
+ return 0;
+ /*
+ * Pass to IPv4 reassembly mechanism.
*/
error = npf_reassembly(npf, , mp);
if (error) {
Index: src/sys/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.36 src/sys/net/npf/npf_inet.c:1.37
--- src/sys/net/npf/npf_inet.c:1.36 Mon Dec 26 18:05:06 2016
+++ src/sys/net/npf/npf_inet.c Sun Feb 19 15:27:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_inet.c,v 1.36 2016/12/26 23:05:06 christos Exp $ */
+/* $NetBSD: npf_inet.c,v 1.37 2017/02/19 20:27:22 christos Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.36 2016/12/26 23:05:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.37 2017/02/19 20:27:22 christos Exp $");
#include
#include
@@ -355,6 +355,7 @@ npf_cache_ip(npf_cache_t *npc, nbuf_t *n
case (IPV6_VERSION >> 4): {
struct ip6_hdr *ip6;
struct ip6_ext *ip6e;
+ struct ip6_frag *ip6f;
size_t off, hlen;
ip6 = nbuf_ensure_contig(nbuf, sizeof(struct ip6_hdr));
@@ -387,8 +388,21 @@ npf_cache_ip(npf_cache_t *npc, nbuf_t *n
hlen = (ip6e->ip6e_len + 1) << 3;
break;
case IPPROTO_FRAGMENT:
+ip6f = nbuf_ensure_contig(nbuf, sizeof(*ip6f));
+if (ip6f == NULL)
+ return 0;
+/*
+ * We treat the first fragment as a regular
+ * packet and then we pass the rest of the
+ * fragments unconditionally. This way if
+ * the first packet passes the rest will
+ * be able to reassembled, if not they will
+ * be ignored. We can do better later.
+ */
+if (ntohs(ip6f->ip6f_offlg & IP6F_OFF_MASK) != 0)
+ flags |= NPC_IPFRAG;
+
hlen = sizeof(struct ip6_frag);
-flags |= NPC_IPFRAG;
break;
case IPPROTO_AH:
hlen = (ip6e->ip6e_len + 2) << 2;
CVS commit: src/sys/arch/sparc64/doc
Module Name:src Committed By: palle Date: Sun Feb 19 18:30:05 UTC 2017 Modified Files: src/sys/arch/sparc64/doc: TODO Log Message: sun4v: Update TODO with the status of the sun4v work so far To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc64/doc/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/doc/TODO diff -u src/sys/arch/sparc64/doc/TODO:1.23 src/sys/arch/sparc64/doc/TODO:1.24 --- src/sys/arch/sparc64/doc/TODO:1.23 Sun Feb 19 18:27:12 2017 +++ src/sys/arch/sparc64/doc/TODO Sun Feb 19 18:30:05 2017 @@ -1,4 +1,4 @@ - /* $NetBSD: TODO,v 1.23 2017/02/19 18:27:12 palle Exp $ */ + /* $NetBSD: TODO,v 1.24 2017/02/19 18:30:05 palle Exp $ */ Things to be done: @@ -11,6 +11,7 @@ sun4u: - GENERIC.UP kernel hangs on v445 (missing interrupt?) sun4v: + - current status: The kernel boots and starts the init process (syscalls are done, but crashes...) - 64-bit kernel support - 32-bit kernel support - libkvm
CVS commit: src/sys/arch/sparc64/doc
Module Name:src Committed By: palle Date: Sun Feb 19 18:27:13 UTC 2017 Modified Files: src/sys/arch/sparc64/doc: TODO Log Message: sun4v: Note that the code recently added to locore.s rft_user may not be enough to make things work properly To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc64/doc/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/doc/TODO diff -u src/sys/arch/sparc64/doc/TODO:1.22 src/sys/arch/sparc64/doc/TODO:1.23 --- src/sys/arch/sparc64/doc/TODO:1.22 Sun Feb 19 18:07:12 2017 +++ src/sys/arch/sparc64/doc/TODO Sun Feb 19 18:27:12 2017 @@ -1,4 +1,4 @@ - /* $NetBSD: TODO,v 1.22 2017/02/19 18:07:12 palle Exp $ */ + /* $NetBSD: TODO,v 1.23 2017/02/19 18:27:12 palle Exp $ */ Things to be done: @@ -30,3 +30,5 @@ sun4v: - man pages for drivers imported from OpenBSD lke vpci, vbus, cbus, vdsk, ldc etc. - vdsk and ldc drivers: code maked with OPENBSD_BUSDMA - make the bus_dma stuff work properly - vbus.c: handle prom_getprop() memory leaks +- locore.s: rft_user (sun4v specific manaul fill) - seems to work, but is it good enough (compared to openbsds rft_user +
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Sun Feb 19 18:25:45 UTC 2017 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: sun4v: rft_user needs special handling (a manual fill) since the restore instruction may cause the number of trap levels to exceed the maximum for sun4v - inspired by code from the the openbsd rft_user code path - verified using qemu for both sun4u and sun4v To generate a diff of this commit: cvs rdiff -u -r1.408 -r1.409 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.408 src/sys/arch/sparc64/sparc64/locore.s:1.409 --- src/sys/arch/sparc64/sparc64/locore.s:1.408 Fri Feb 10 23:26:23 2017 +++ src/sys/arch/sparc64/sparc64/locore.s Sun Feb 19 18:25:45 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.408 2017/02/10 23:26:23 palle Exp $ */ +/* $NetBSD: locore.s,v 1.409 2017/02/19 18:25:45 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -3145,7 +3145,7 @@ sun4v_texttrap: ba,a,pt %icc, return_from_trap nop NOTREACHED - + /* * End of traps for sun4v. */ @@ -4747,6 +4747,36 @@ rft_user: wrpr %g2, 0, %tpc wrpr %g3, 0, %tnpc wrpr %g1, %g0, %tstate + + /* + * The restore instruction further down may cause the trap level + * to exceede the maximum trap level on sun4v, so a manual fill + * may be necessary. + */ + +#ifdef SUN4V + sethi %hi(cputyp), %g5 + ld [%g5 + %lo(cputyp)], %g5 + cmp %g5, CPU_SUN4V + bne,pt %icc, 1f + nop + + ! Only manual fill if the restore instruction will cause a fill trap + rdpr %canrestore, %g5 + brnz %g5, 1f + nop + + ! Do a manual fill + wr %g0, ASI_AIUS, %asi + rdpr %cwp, %g4 + dec %g4 + wrpr %g4, 0, %cwp + FILL ldxa, %sp+BIAS, 8, %asi + restored + inc %g4 + wrpr %g4, 0, %cwp +1: +#endif restore 6: rdpr %canrestore, %g5
CVS commit: src/sys/arch/sparc64/doc
Module Name:src Committed By: palle Date: Sun Feb 19 18:07:12 UTC 2017 Modified Files: src/sys/arch/sparc64/doc: TODO Log Message: sun4v: Note that prom_getprop() leaks memory in vbus.c To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc64/doc/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/doc/TODO diff -u src/sys/arch/sparc64/doc/TODO:1.21 src/sys/arch/sparc64/doc/TODO:1.22 --- src/sys/arch/sparc64/doc/TODO:1.21 Sun Feb 5 20:08:35 2017 +++ src/sys/arch/sparc64/doc/TODO Sun Feb 19 18:07:12 2017 @@ -1,4 +1,4 @@ - /* $NetBSD: TODO,v 1.21 2017/02/05 20:08:35 palle Exp $ */ + /* $NetBSD: TODO,v 1.22 2017/02/19 18:07:12 palle Exp $ */ Things to be done: @@ -29,4 +29,4 @@ sun4v: - mpt(4) complains: mpt0: Phy 0: Link Status Unknown - man pages for drivers imported from OpenBSD lke vpci, vbus, cbus, vdsk, ldc etc. - vdsk and ldc drivers: code maked with OPENBSD_BUSDMA - make the bus_dma stuff work properly - +- vbus.c: handle prom_getprop() memory leaks
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Sun Feb 19 17:45:16 UTC 2017 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: amend 1436 To generate a diff of this commit: cvs rdiff -u -r1.1.2.83 -r1.1.2.84 src/doc/CHANGES-6.0.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.83 src/doc/CHANGES-6.0.7:1.1.2.84 --- src/doc/CHANGES-6.0.7:1.1.2.83 Sun Feb 19 07:58:50 2017 +++ src/doc/CHANGES-6.0.7 Sun Feb 19 17:45:16 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.83 2017/02/19 07:58:50 snj Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.84 2017/02/19 17:45:16 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -9747,7 +9747,7 @@ external/bsd/tcpdump/dist/strtoaddr.h u external/bsd/tcpdump/dist/tcp.h up to 1.8 external/bsd/tcpdump/dist/tcpdump-stdinc.hdelete delete external/bsd/tcpdump/dist/tcpdump.1.in up to 1.12 -external/bsd/tcpdump/dist/tcpdump.c up to 1.15 +external/bsd/tcpdump/dist/tcpdump.c up to 1.15, patch external/bsd/tcpdump/dist/telnet.h delete external/bsd/tcpdump/dist/tests/02-sunrise-sunset-esp.pcap up to 1.1.1.1 external/bsd/tcpdump/dist/tests/02-sunrise-sunset-esp.puu delete @@ -10279,7 +10279,7 @@ external/bsd/tcpdump/dist/win32/prj/WinD external/bsd/tcpdump/dist/win32/prj/WinDump.sln up to 1.1.1.1 external/bsd/tcpdump/dist/win32/prj/WinDump.vcproj up to 1.1.1.1 external/bsd/tcpdump/dist/win32/src/ether_ntohost.c up to 1.1.1.1 -external/bsd/tcpdump/include/config.h up to 1.10 +external/bsd/tcpdump/include/config.h up to 1.10, patch external/bsd/tcpdump/tcpdump2netbsd up to 1.1 Update tcpdump to 4.9.0, fixing the following vulnerabilities:
CVS commit: [netbsd-6-0] src/external/bsd/tcpdump
Module Name:src
Committed By: snj
Date: Sun Feb 19 17:44:39 UTC 2017
Modified Files:
src/external/bsd/tcpdump/dist [netbsd-6-0]: tcpdump.c
src/external/bsd/tcpdump/include [netbsd-6-0]: config.h
Log Message:
Apply patch (requested by spz in ticket #1436):
Adjust for older libpcap in netbsd-6*
To generate a diff of this commit:
cvs rdiff -u -r1.3.12.1 -r1.3.12.2 src/external/bsd/tcpdump/dist/tcpdump.c
cvs rdiff -u -r1.3.12.1 -r1.3.12.2 src/external/bsd/tcpdump/include/config.h
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/tcpdump/dist/tcpdump.c
diff -u src/external/bsd/tcpdump/dist/tcpdump.c:1.3.12.1 src/external/bsd/tcpdump/dist/tcpdump.c:1.3.12.2
--- src/external/bsd/tcpdump/dist/tcpdump.c:1.3.12.1 Sun Feb 19 07:35:25 2017
+++ src/external/bsd/tcpdump/dist/tcpdump.c Sun Feb 19 17:44:39 2017
@@ -30,7 +30,7 @@
static const char copyright[] _U_ =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
The Regents of the University of California. All rights reserved.\n";
-__RCSID("$NetBSD: tcpdump.c,v 1.3.12.1 2017/02/19 07:35:25 snj Exp $");
+__RCSID("$NetBSD: tcpdump.c,v 1.3.12.2 2017/02/19 17:44:39 snj Exp $");
#endif
/*
@@ -156,8 +156,8 @@ static int Lflag; /* list available da
static int Iflag; /* rfmon (monitor) mode */
#ifdef HAVE_PCAP_SET_TSTAMP_TYPE
static int Jflag; /* list available time stamp types */
-#endif
static int jflag = -1; /* packet time stamp source */
+#endif
static int pflag; /* don't go promiscuous */
#ifdef HAVE_PCAP_SETDIRECTION
static int Qflag = -1; /* restrict captured packet by send/receive direction */
@@ -166,7 +166,9 @@ static int Uflag; /* "unbuffered" outp
static int Wflag; /* recycle output files after this number of files */
static int WflagChars;
static char *zflag = NULL; /* compress each savefile using a specified command (like gzip or bzip2) */
+#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
static int immediate_mode;
+#endif
static int infodelay;
static int infoprint;
@@ -190,7 +192,9 @@ static RETSIGTYPE cleanup(int);
static RETSIGTYPE child_cleanup(int);
static void print_version(void);
static void print_usage(void);
+#ifdef HAVE_PCAP_SET_TSTAMP_TYPE
static void show_tstamp_types_and_exit(pcap_t *, const char *device) __attribute__((noreturn));
+#endif
static void show_dlts_and_exit(pcap_t *, const char *device) __attribute__((noreturn));
#ifdef HAVE_PCAP_FINDALLDEVS
static void show_devices_and_exit (void) __attribute__((noreturn));
Index: src/external/bsd/tcpdump/include/config.h
diff -u src/external/bsd/tcpdump/include/config.h:1.3.12.1 src/external/bsd/tcpdump/include/config.h:1.3.12.2
--- src/external/bsd/tcpdump/include/config.h:1.3.12.1 Sun Feb 19 07:35:30 2017
+++ src/external/bsd/tcpdump/include/config.h Sun Feb 19 17:44:39 2017
@@ -146,7 +146,7 @@
#define HAVE_PCAP_SET_DATALINK 1
/* Define to 1 if you have the `pcap_set_immediate_mode' function. */
-#define HAVE_PCAP_SET_IMMEDIATE_MODE 1
+/* #undef HAVE_PCAP_SET_IMMEDIATE_MODE */
/* Define to 1 if you have the `pcap_set_optimizer_debug' function. */
/* #undef HAVE_PCAP_SET_OPTIMIZER_DEBUG */
@@ -155,10 +155,10 @@
/* #undef HAVE_PCAP_SET_PARSER_DEBUG */
/* Define to 1 if you have the `pcap_set_tstamp_precision' function. */
-#define HAVE_PCAP_SET_TSTAMP_PRECISION 1
+/* #undef HAVE_PCAP_SET_TSTAMP_PRECISION */
/* Define to 1 if you have the `pcap_set_tstamp_type' function. */
-#define HAVE_PCAP_SET_TSTAMP_TYPE 1
+/* #undef HAVE_PCAP_SET_TSTAMP_TYPE */
/* Define to 1 if you have the header file. */
/* #undef HAVE_PCAP_USB_H */
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Sun Feb 19 17:44:11 UTC 2017 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: amend 1436 To generate a diff of this commit: cvs rdiff -u -r1.1.2.81 -r1.1.2.82 src/doc/CHANGES-6.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.81 src/doc/CHANGES-6.1.6:1.1.2.82 --- src/doc/CHANGES-6.1.6:1.1.2.81 Sun Feb 19 08:00:03 2017 +++ src/doc/CHANGES-6.1.6 Sun Feb 19 17:44:11 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.81 2017/02/19 08:00:03 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.82 2017/02/19 17:44:11 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -9467,7 +9467,7 @@ external/bsd/tcpdump/dist/strtoaddr.h u external/bsd/tcpdump/dist/tcp.h up to 1.8 external/bsd/tcpdump/dist/tcpdump-stdinc.hdelete delete external/bsd/tcpdump/dist/tcpdump.1.in up to 1.12 -external/bsd/tcpdump/dist/tcpdump.c up to 1.15 +external/bsd/tcpdump/dist/tcpdump.c up to 1.15, patch external/bsd/tcpdump/dist/telnet.h delete external/bsd/tcpdump/dist/tests/02-sunrise-sunset-esp.pcap up to 1.1.1.1 external/bsd/tcpdump/dist/tests/02-sunrise-sunset-esp.puu delete @@ -,7 +,7 @@ external/bsd/tcpdump/dist/win32/prj/WinD external/bsd/tcpdump/dist/win32/prj/WinDump.sln up to 1.1.1.1 external/bsd/tcpdump/dist/win32/prj/WinDump.vcproj up to 1.1.1.1 external/bsd/tcpdump/dist/win32/src/ether_ntohost.c up to 1.1.1.1 -external/bsd/tcpdump/include/config.h up to 1.10 +external/bsd/tcpdump/include/config.h up to 1.10, patch external/bsd/tcpdump/tcpdump2netbsd up to 1.1 Update tcpdump to 4.9.0, fixing the following vulnerabilities:
CVS commit: [netbsd-6-1] src/external/bsd/tcpdump
Module Name:src
Committed By: snj
Date: Sun Feb 19 17:43:53 UTC 2017
Modified Files:
src/external/bsd/tcpdump/dist [netbsd-6-1]: tcpdump.c
src/external/bsd/tcpdump/include [netbsd-6-1]: config.h
Log Message:
Apply patch (requested by spz in ticket #1436):
Adjust for older libpcap in netbsd-6*
To generate a diff of this commit:
cvs rdiff -u -r1.3.18.1 -r1.3.18.2 src/external/bsd/tcpdump/dist/tcpdump.c
cvs rdiff -u -r1.3.18.1 -r1.3.18.2 src/external/bsd/tcpdump/include/config.h
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/tcpdump/dist/tcpdump.c
diff -u src/external/bsd/tcpdump/dist/tcpdump.c:1.3.18.1 src/external/bsd/tcpdump/dist/tcpdump.c:1.3.18.2
--- src/external/bsd/tcpdump/dist/tcpdump.c:1.3.18.1 Sun Feb 19 07:36:20 2017
+++ src/external/bsd/tcpdump/dist/tcpdump.c Sun Feb 19 17:43:53 2017
@@ -30,7 +30,7 @@
static const char copyright[] _U_ =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
The Regents of the University of California. All rights reserved.\n";
-__RCSID("$NetBSD: tcpdump.c,v 1.3.18.1 2017/02/19 07:36:20 snj Exp $");
+__RCSID("$NetBSD: tcpdump.c,v 1.3.18.2 2017/02/19 17:43:53 snj Exp $");
#endif
/*
@@ -156,8 +156,8 @@ static int Lflag; /* list available da
static int Iflag; /* rfmon (monitor) mode */
#ifdef HAVE_PCAP_SET_TSTAMP_TYPE
static int Jflag; /* list available time stamp types */
-#endif
static int jflag = -1; /* packet time stamp source */
+#endif
static int pflag; /* don't go promiscuous */
#ifdef HAVE_PCAP_SETDIRECTION
static int Qflag = -1; /* restrict captured packet by send/receive direction */
@@ -166,7 +166,9 @@ static int Uflag; /* "unbuffered" outp
static int Wflag; /* recycle output files after this number of files */
static int WflagChars;
static char *zflag = NULL; /* compress each savefile using a specified command (like gzip or bzip2) */
+#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
static int immediate_mode;
+#endif
static int infodelay;
static int infoprint;
@@ -190,7 +192,9 @@ static RETSIGTYPE cleanup(int);
static RETSIGTYPE child_cleanup(int);
static void print_version(void);
static void print_usage(void);
+#ifdef HAVE_PCAP_SET_TSTAMP_TYPE
static void show_tstamp_types_and_exit(pcap_t *, const char *device) __attribute__((noreturn));
+#endif
static void show_dlts_and_exit(pcap_t *, const char *device) __attribute__((noreturn));
#ifdef HAVE_PCAP_FINDALLDEVS
static void show_devices_and_exit (void) __attribute__((noreturn));
Index: src/external/bsd/tcpdump/include/config.h
diff -u src/external/bsd/tcpdump/include/config.h:1.3.18.1 src/external/bsd/tcpdump/include/config.h:1.3.18.2
--- src/external/bsd/tcpdump/include/config.h:1.3.18.1 Sun Feb 19 07:36:28 2017
+++ src/external/bsd/tcpdump/include/config.h Sun Feb 19 17:43:53 2017
@@ -146,7 +146,7 @@
#define HAVE_PCAP_SET_DATALINK 1
/* Define to 1 if you have the `pcap_set_immediate_mode' function. */
-#define HAVE_PCAP_SET_IMMEDIATE_MODE 1
+/* #undef HAVE_PCAP_SET_IMMEDIATE_MODE */
/* Define to 1 if you have the `pcap_set_optimizer_debug' function. */
/* #undef HAVE_PCAP_SET_OPTIMIZER_DEBUG */
@@ -155,10 +155,10 @@
/* #undef HAVE_PCAP_SET_PARSER_DEBUG */
/* Define to 1 if you have the `pcap_set_tstamp_precision' function. */
-#define HAVE_PCAP_SET_TSTAMP_PRECISION 1
+/* #undef HAVE_PCAP_SET_TSTAMP_PRECISION */
/* Define to 1 if you have the `pcap_set_tstamp_type' function. */
-#define HAVE_PCAP_SET_TSTAMP_TYPE 1
+/* #undef HAVE_PCAP_SET_TSTAMP_TYPE */
/* Define to 1 if you have the header file. */
/* #undef HAVE_PCAP_USB_H */
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Sun Feb 19 17:43:35 UTC 2017 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: amend 1436 To generate a diff of this commit: cvs rdiff -u -r1.1.2.272 -r1.1.2.273 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.272 src/doc/CHANGES-6.2:1.1.2.273 --- src/doc/CHANGES-6.2:1.1.2.272 Sun Feb 19 08:01:08 2017 +++ src/doc/CHANGES-6.2 Sun Feb 19 17:43:34 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.272 2017/02/19 08:01:08 snj Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.273 2017/02/19 17:43:34 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -15826,7 +15826,7 @@ external/bsd/tcpdump/dist/strtoaddr.h u external/bsd/tcpdump/dist/tcp.h up to 1.8 external/bsd/tcpdump/dist/tcpdump-stdinc.hdelete delete external/bsd/tcpdump/dist/tcpdump.1.in up to 1.12 -external/bsd/tcpdump/dist/tcpdump.c up to 1.15 +external/bsd/tcpdump/dist/tcpdump.c up to 1.15, patch external/bsd/tcpdump/dist/telnet.h delete external/bsd/tcpdump/dist/tests/02-sunrise-sunset-esp.pcap up to 1.1.1.1 external/bsd/tcpdump/dist/tests/02-sunrise-sunset-esp.puu delete @@ -16358,7 +16358,7 @@ external/bsd/tcpdump/dist/win32/prj/WinD external/bsd/tcpdump/dist/win32/prj/WinDump.sln up to 1.1.1.1 external/bsd/tcpdump/dist/win32/prj/WinDump.vcproj up to 1.1.1.1 external/bsd/tcpdump/dist/win32/src/ether_ntohost.c up to 1.1.1.1 -external/bsd/tcpdump/include/config.h up to 1.10 +external/bsd/tcpdump/include/config.h up to 1.10, patch external/bsd/tcpdump/tcpdump2netbsd up to 1.1 Update tcpdump to 4.9.0, fixing the following vulnerabilities:
CVS commit: [netbsd-6] src/external/bsd/tcpdump
Module Name:src
Committed By: snj
Date: Sun Feb 19 17:42:27 UTC 2017
Modified Files:
src/external/bsd/tcpdump/dist [netbsd-6]: tcpdump.c
src/external/bsd/tcpdump/include [netbsd-6]: config.h
Log Message:
Apply patch (requested by spz in ticket #1436):
Adjust for older libpcap in netbsd-6*
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/external/bsd/tcpdump/dist/tcpdump.c
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/external/bsd/tcpdump/include/config.h
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/tcpdump/dist/tcpdump.c
diff -u src/external/bsd/tcpdump/dist/tcpdump.c:1.3.6.1 src/external/bsd/tcpdump/dist/tcpdump.c:1.3.6.2
--- src/external/bsd/tcpdump/dist/tcpdump.c:1.3.6.1 Sun Feb 19 07:37:09 2017
+++ src/external/bsd/tcpdump/dist/tcpdump.c Sun Feb 19 17:42:27 2017
@@ -30,7 +30,7 @@
static const char copyright[] _U_ =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
The Regents of the University of California. All rights reserved.\n";
-__RCSID("$NetBSD: tcpdump.c,v 1.3.6.1 2017/02/19 07:37:09 snj Exp $");
+__RCSID("$NetBSD: tcpdump.c,v 1.3.6.2 2017/02/19 17:42:27 snj Exp $");
#endif
/*
@@ -156,8 +156,8 @@ static int Lflag; /* list available da
static int Iflag; /* rfmon (monitor) mode */
#ifdef HAVE_PCAP_SET_TSTAMP_TYPE
static int Jflag; /* list available time stamp types */
-#endif
static int jflag = -1; /* packet time stamp source */
+#endif
static int pflag; /* don't go promiscuous */
#ifdef HAVE_PCAP_SETDIRECTION
static int Qflag = -1; /* restrict captured packet by send/receive direction */
@@ -166,7 +166,9 @@ static int Uflag; /* "unbuffered" outp
static int Wflag; /* recycle output files after this number of files */
static int WflagChars;
static char *zflag = NULL; /* compress each savefile using a specified command (like gzip or bzip2) */
+#ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
static int immediate_mode;
+#endif
static int infodelay;
static int infoprint;
@@ -190,7 +192,9 @@ static RETSIGTYPE cleanup(int);
static RETSIGTYPE child_cleanup(int);
static void print_version(void);
static void print_usage(void);
+#ifdef HAVE_PCAP_SET_TSTAMP_TYPE
static void show_tstamp_types_and_exit(pcap_t *, const char *device) __attribute__((noreturn));
+#endif
static void show_dlts_and_exit(pcap_t *, const char *device) __attribute__((noreturn));
#ifdef HAVE_PCAP_FINDALLDEVS
static void show_devices_and_exit (void) __attribute__((noreturn));
Index: src/external/bsd/tcpdump/include/config.h
diff -u src/external/bsd/tcpdump/include/config.h:1.3.6.1 src/external/bsd/tcpdump/include/config.h:1.3.6.2
--- src/external/bsd/tcpdump/include/config.h:1.3.6.1 Sun Feb 19 07:37:18 2017
+++ src/external/bsd/tcpdump/include/config.h Sun Feb 19 17:42:27 2017
@@ -146,7 +146,7 @@
#define HAVE_PCAP_SET_DATALINK 1
/* Define to 1 if you have the `pcap_set_immediate_mode' function. */
-#define HAVE_PCAP_SET_IMMEDIATE_MODE 1
+/* #undef HAVE_PCAP_SET_IMMEDIATE_MODE */
/* Define to 1 if you have the `pcap_set_optimizer_debug' function. */
/* #undef HAVE_PCAP_SET_OPTIMIZER_DEBUG */
@@ -155,10 +155,10 @@
/* #undef HAVE_PCAP_SET_PARSER_DEBUG */
/* Define to 1 if you have the `pcap_set_tstamp_precision' function. */
-#define HAVE_PCAP_SET_TSTAMP_PRECISION 1
+/* #undef HAVE_PCAP_SET_TSTAMP_PRECISION */
/* Define to 1 if you have the `pcap_set_tstamp_type' function. */
-#define HAVE_PCAP_SET_TSTAMP_TYPE 1
+/* #undef HAVE_PCAP_SET_TSTAMP_TYPE */
/* Define to 1 if you have the header file. */
/* #undef HAVE_PCAP_USB_H */
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: jakllsch Date: Sun Feb 19 14:34:40 UTC 2017 Modified Files: src/sys/arch/shark/ofw: vlpci.c Log Message: Filter configuration space at and above PCI_CONF_SIZE, instead of KASSERTing. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/shark/ofw/vlpci.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/shark/ofw/vlpci.c diff -u src/sys/arch/shark/ofw/vlpci.c:1.2 src/sys/arch/shark/ofw/vlpci.c:1.3 --- src/sys/arch/shark/ofw/vlpci.c:1.2 Sat Feb 18 13:56:29 2017 +++ src/sys/arch/shark/ofw/vlpci.c Sun Feb 19 14:34:40 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: vlpci.c,v 1.2 2017/02/18 13:56:29 flxd Exp $ */ +/* $NetBSD: vlpci.c,v 1.3 2017/02/19 14:34:40 jakllsch Exp $ */ /* * Copyright (c) 2017 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.2 2017/02/18 13:56:29 flxd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.3 2017/02/19 14:34:40 jakllsch Exp $"); #include "opt_pci.h" #include "pci.h" @@ -179,7 +179,9 @@ vlpci_pc_conf_read(void *v, pcitag_t tag pcireg_t ret; KASSERT((offset & 3) == 0); - KASSERT(offset < 0x100); + + if (offset >= PCI_CONF_SIZE) + return 0x; mutex_spin_enter(>sc_lock); bus_space_write_4(_io_bs_tag, sc->sc_conf_ioh, 0, @@ -201,7 +203,9 @@ vlpci_pc_conf_write(void *v, pcitag_t ta struct vlpci_softc * const sc = v; KASSERT((offset & 3) == 0); - KASSERT(offset < 0x100); + + if (offset >= PCI_CONF_SIZE) + return; #if 0 device_printf(sc->sc_dev, "%s tag %x offset %x val %x\n",
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Sun Feb 19 13:58:42 UTC 2017 Modified Files: src/sys/net: bpf.c Log Message: typo To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/sys/net/bpf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/bpf.c diff -u src/sys/net/bpf.c:1.214 src/sys/net/bpf.c:1.215 --- src/sys/net/bpf.c:1.214 Sun Feb 12 22:44:45 2017 +++ src/sys/net/bpf.c Sun Feb 19 08:58:42 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: bpf.c,v 1.214 2017/02/13 03:44:45 ozaki-r Exp $ */ +/* $NetBSD: bpf.c,v 1.215 2017/02/19 13:58:42 christos Exp $ */ /* * Copyright (c) 1990, 1991, 1993 @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.214 2017/02/13 03:44:45 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.215 2017/02/19 13:58:42 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_bpf.h" @@ -184,7 +184,7 @@ static struct pslist_head bpf_iflist; static struct pslist_head bpf_dlist; /* Macros for bpf_d on bpf_dlist */ -#define BPF_DLIST_WRITER_INSEART_HEAD(__d)\ +#define BPF_DLIST_WRITER_INSERT_HEAD(__d)\ PSLIST_WRITER_INSERT_HEAD(_dlist, (__d), bd_bpf_dlist_entry) #define BPF_DLIST_READER_FOREACH(__d) \ PSLIST_READER_FOREACH((__d), _dlist, struct bpf_d, \ @@ -576,7 +576,7 @@ bpfopen(dev_t dev, int flag, int mode, s cv_init(>bd_cv, "bpf"); mutex_enter(_mtx); - BPF_DLIST_WRITER_INSEART_HEAD(d); + BPF_DLIST_WRITER_INSERT_HEAD(d); mutex_exit(_mtx); return fd_clone(fp, fd, flag, _fileops, d);
CVS commit: src/share/man/man9/man9.x86
Module Name:src Committed By: wiz Date: Sun Feb 19 11:54:59 UTC 2017 Modified Files: src/share/man/man9/man9.x86: tsc.9 Log Message: Sort. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man9/man9.x86/tsc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/man9.x86/tsc.9 diff -u src/share/man/man9/man9.x86/tsc.9:1.7 src/share/man/man9/man9.x86/tsc.9:1.8 --- src/share/man/man9/man9.x86/tsc.9:1.7 Fri Feb 17 22:31:08 2017 +++ src/share/man/man9/man9.x86/tsc.9 Sun Feb 19 11:54:59 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: tsc.9,v 1.7 2017/02/17 22:31:08 christos Exp $ +.\" $NetBSD: tsc.9,v 1.8 2017/02/19 11:54:59 wiz Exp $ .\" .\" Copyright (c) 2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -148,5 +148,5 @@ attach. .Xr gettimeofday 2 , .Xr hpet 4 , .Xr hz 9 , -.Xr x86/rdmsr 9 , -.Xr timecounter 9 +.Xr timecounter 9 , +.Xr x86/rdmsr 9
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun Feb 19 11:16:45 UTC 2017 Modified Files: src/share/man/man4: options.4 Log Message: Add some articles. To generate a diff of this commit: cvs rdiff -u -r1.462 -r1.463 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.462 src/share/man/man4/options.4:1.463 --- src/share/man/man4/options.4:1.462 Sun Feb 19 07:43:42 2017 +++ src/share/man/man4/options.4 Sun Feb 19 11:16:45 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.462 2017/02/19 07:43:42 rin Exp $ +.\" $NetBSD: options.4,v 1.463 2017/02/19 11:16:45 wiz Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -979,11 +979,11 @@ support. This allows a system to recognize a disklabel written in the other byte order. For writing, when a label already exists, its byte order is preserved. Otherwise, a new label is written in the native byte order. -To specify the byte order explicitly, +To specify the byte order explicitly, the .Fl F option of .Xr disklabel 8 -should be used with +should be used with the .Fl B option in order to avoid using .Xr ioctl 2 , @@ -993,8 +993,8 @@ amd64, bebox, emips, epoc32, evbarm, i38 .\" riscv, rs6000, sandpoint, .\" usermode, -xen, and zaurus. -And to machines of +xen, and zaurus; +also to machines of the .\" evbarm64, evbmips and evbppc ports that support Master Boot Record (MBR).
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Sun Feb 19 08:01:08 UTC 2017 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: 1435, 1436 To generate a diff of this commit: cvs rdiff -u -r1.1.2.271 -r1.1.2.272 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.271 src/doc/CHANGES-6.2:1.1.2.272 --- src/doc/CHANGES-6.2:1.1.2.271 Tue Feb 14 17:01:55 2017 +++ src/doc/CHANGES-6.2 Sun Feb 19 08:01:08 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.271 2017/02/14 17:01:55 snj Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.272 2017/02/19 08:01:08 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -15461,3 +15461,920 @@ sys/compat/linux/arch/amd64/linux_machde Don't let userland choose %rip. [maxv, ticket #1433] +external/mit/expat/dist/CMake.READMEup to 1.1.1.3 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.3 +external/mit/expat/dist/COPYING up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.4 +external/mit/expat/dist/MANIFESTup to 1.1.1.4 +external/mit/expat/dist/Makefile.in up to 1.1.1.4 +external/mit/expat/dist/README up to 1.1.1.4 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.3 +external/mit/expat/dist/amiga/expat_lib.c up to 1.1.1.2 +external/mit/expat/dist/amiga/expat_vectors.c up to 1.1.1.2 +external/mit/expat/dist/amiga/launch.c up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/xmlwf.mak up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.4 +external/mit/expat/dist/configure.acup to 1.1.1.2 +external/mit/expat/dist/conftools/config.guess up to 1.3 +external/mit/expat/dist/conftools/config.subup to 1.3 +external/mit/expat/dist/conftools/install-shup to 1.1.1.4 +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.4 +external/mit/expat/dist/doc/expat.png up to 1.1.1.2 +external/mit/expat/dist/doc/valid-xhtml10.png up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.sgml delete +external/mit/expat/dist/doc/xmlwf.xml up to 1.1.1.1 +external/mit/expat/dist/examples/elements.c up to 1.1.1.3 +external/mit/expat/dist/examples/outline.c up to 1.1.1.2 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.4 +external/mit/expat/dist/lib/expat.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expat.h up to 1.1.1.4 +external/mit/expat/dist/lib/expat_external.hup to 1.1.1.2 +external/mit/expat/dist/lib/expat_static.dspup to 1.1.1.3 +external/mit/expat/dist/lib/expatw.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expatw_static.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/internal.h up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.6 +external/mit/expat/dist/lib/xmlrole.c up to 1.1.1.3 +external/mit/expat/dist/lib/xmltok.cup to 1.3 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.5 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltsugar.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/lt~obsolete.m4 up to 1.1.1.2 +external/mit/expat/dist/tests/chardata.cup to 1.1.1.3 +external/mit/expat/dist/tests/minicheck.c up to 1.1.1.2 +external/mit/expat/dist/tests/minicheck.h up to 1.1.1.3 +external/mit/expat/dist/tests/runtests.cup to 1.1.1.3 +external/mit/expat/dist/tests/xmltest.shup to 1.2 +external/mit/expat/dist/win32/README.txtup to 1.1.1.3 +external/mit/expat/dist/win32/expat.iss up to 1.1.1.4 +external/mit/expat/dist/xmlwf/codepage.cup to 1.1.1.2 +external/mit/expat/dist/xmlwf/readfilemap.c up to 1.1.1.3 +external/mit/expat/dist/xmlwf/xmlfile.c up to 1.1.1.2 +external/mit/expat/dist/xmlwf/xmlwf.c up to 1.1.1.4 +external/mit/expat/dist/xmlwf/xmlwf.dsp up to 1.1.1.3 +external/mit/expat/lib/libexpat/expat_config.h up to 1.4 + + Update expat to 2.2.0, fixing CVE-2016-0718,
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Sun Feb 19 08:00:03 UTC 2017 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: 1435, 1436 To generate a diff of this commit: cvs rdiff -u -r1.1.2.80 -r1.1.2.81 src/doc/CHANGES-6.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.80 src/doc/CHANGES-6.1.6:1.1.2.81 --- src/doc/CHANGES-6.1.6:1.1.2.80 Tue Feb 14 16:59:08 2017 +++ src/doc/CHANGES-6.1.6 Sun Feb 19 08:00:03 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.80 2017/02/14 16:59:08 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.81 2017/02/19 08:00:03 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -9102,3 +9102,920 @@ sys/compat/linux/arch/amd64/linux_machde Don't let userland choose %rip. [maxv, ticket #1433] +external/mit/expat/dist/CMake.READMEup to 1.1.1.3 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.3 +external/mit/expat/dist/COPYING up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.4 +external/mit/expat/dist/MANIFESTup to 1.1.1.4 +external/mit/expat/dist/Makefile.in up to 1.1.1.4 +external/mit/expat/dist/README up to 1.1.1.4 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.3 +external/mit/expat/dist/amiga/expat_lib.c up to 1.1.1.2 +external/mit/expat/dist/amiga/expat_vectors.c up to 1.1.1.2 +external/mit/expat/dist/amiga/launch.c up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/xmlwf.mak up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.4 +external/mit/expat/dist/configure.acup to 1.1.1.2 +external/mit/expat/dist/conftools/config.guess up to 1.3 +external/mit/expat/dist/conftools/config.subup to 1.3 +external/mit/expat/dist/conftools/install-shup to 1.1.1.4 +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.4 +external/mit/expat/dist/doc/expat.png up to 1.1.1.2 +external/mit/expat/dist/doc/valid-xhtml10.png up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.sgml delete +external/mit/expat/dist/doc/xmlwf.xml up to 1.1.1.1 +external/mit/expat/dist/examples/elements.c up to 1.1.1.3 +external/mit/expat/dist/examples/outline.c up to 1.1.1.2 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.4 +external/mit/expat/dist/lib/expat.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expat.h up to 1.1.1.4 +external/mit/expat/dist/lib/expat_external.hup to 1.1.1.2 +external/mit/expat/dist/lib/expat_static.dspup to 1.1.1.3 +external/mit/expat/dist/lib/expatw.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expatw_static.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/internal.h up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.6 +external/mit/expat/dist/lib/xmlrole.c up to 1.1.1.3 +external/mit/expat/dist/lib/xmltok.cup to 1.3 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.5 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltsugar.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/lt~obsolete.m4 up to 1.1.1.2 +external/mit/expat/dist/tests/chardata.cup to 1.1.1.3 +external/mit/expat/dist/tests/minicheck.c up to 1.1.1.2 +external/mit/expat/dist/tests/minicheck.h up to 1.1.1.3 +external/mit/expat/dist/tests/runtests.cup to 1.1.1.3 +external/mit/expat/dist/tests/xmltest.shup to 1.2 +external/mit/expat/dist/win32/README.txtup to 1.1.1.3 +external/mit/expat/dist/win32/expat.iss up to 1.1.1.4 +external/mit/expat/dist/xmlwf/codepage.cup to 1.1.1.2 +external/mit/expat/dist/xmlwf/readfilemap.c up to 1.1.1.3 +external/mit/expat/dist/xmlwf/xmlfile.c up to 1.1.1.2 +external/mit/expat/dist/xmlwf/xmlwf.c up to 1.1.1.4 +external/mit/expat/dist/xmlwf/xmlwf.dsp up to 1.1.1.3 +external/mit/expat/lib/libexpat/expat_config.h up to 1.4 + + Update expat to 2.2.0,
