CVS commit: src/sys/arch/arm/imx/fdt
Module Name:src Committed By: hkenken Date: Wed Nov 13 07:56:11 UTC 2019 Modified Files: src/sys/arch/arm/imx/fdt: if_enet_imx.c Log Message: Add support "phy-reset-post-delay". To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/fdt/if_enet_imx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/imx/fdt
Module Name:src
Committed By: hkenken
Date: Wed Nov 13 07:56:11 UTC 2019
Modified Files:
src/sys/arch/arm/imx/fdt: if_enet_imx.c
Log Message:
Add support "phy-reset-post-delay".
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/fdt/if_enet_imx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/imx/fdt/if_enet_imx.c
diff -u src/sys/arch/arm/imx/fdt/if_enet_imx.c:1.6 src/sys/arch/arm/imx/fdt/if_enet_imx.c:1.7
--- src/sys/arch/arm/imx/fdt/if_enet_imx.c:1.6 Tue Nov 12 08:40:57 2019
+++ src/sys/arch/arm/imx/fdt/if_enet_imx.c Wed Nov 13 07:56:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_enet_imx.c,v 1.6 2019/11/12 08:40:57 hkenken Exp $ */
+/* $NetBSD: if_enet_imx.c,v 1.7 2019/11/13 07:56:10 hkenken Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.6 2019/11/12 08:40:57 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.7 2019/11/13 07:56:10 hkenken Exp $");
#include "opt_fdt.h"
@@ -195,19 +195,23 @@ enet_init_clocks(struct enet_softc *sc)
static void
enet_phy_reset(struct enet_fdt_softc *sc, const int phandle)
{
- int error;
+ u_int msec;
sc->sc_pin_reset = fdtbus_gpio_acquire(phandle, "phy-reset-gpios", GPIO_PIN_OUTPUT);
if (sc->sc_pin_reset == NULL)
return;
- u_int msec;
- error = of_getprop_uint32(phandle, "phy-reset-duration", );
- if (error)
+ if (of_getprop_uint32(phandle, "phy-reset-duration", ))
msec = 1;
/* Reset */
fdtbus_gpio_write(sc->sc_pin_reset, 1);
delay(msec * 1000);
fdtbus_gpio_write(sc->sc_pin_reset, 0);
+
+ /* Post delay */
+ if (!of_getprop_uint32(phandle, "phy-reset-post-delay", ))
+ msec = 0;
+
+ delay(msec * 1000);
}
CVS commit: src/share/man/man4
Module Name:src Committed By: isaki Date: Wed Nov 13 07:52:25 UTC 2019 Modified Files: src/share/man/man4: audio.4 Log Message: Add some audio drivers in SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/share/man/man4/audio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: isaki Date: Wed Nov 13 07:52:25 UTC 2019 Modified Files: src/share/man/man4: audio.4 Log Message: Add some audio drivers in SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/share/man/man4/audio.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/audio.4 diff -u src/share/man/man4/audio.4:1.92 src/share/man/man4/audio.4:1.93 --- src/share/man/man4/audio.4:1.92 Tue Nov 12 12:50:04 2019 +++ src/share/man/man4/audio.4 Wed Nov 13 07:52:25 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.4,v 1.92 2019/11/12 12:50:04 wiz Exp $ +.\" $NetBSD: audio.4,v 1.93 2019/11/13 07:52:25 isaki Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -757,9 +757,13 @@ string values. .Xr mixerctl 1 , .Xr ioctl 2 , .Xr ossaudio 3 , +.Xr acorn32/vidcaudio 4 , +.\" .Xr amiga/aucc 4 , +.\" .Xr amiga/melody 4 , .Xr arcofi 4 , .Xr aria 4 , .Xr auacer 4 , +.Xr audiocs 4 , .Xr auich 4 , .Xr auixp 4 , .\" .Xr ausoc 4 , @@ -778,6 +782,10 @@ string values. .Xr esm 4 , .Xr eso 4 , .Xr ess 4 , +.\" .Xr evbarm/aaci 4 , +.\" .Xr evbarm/digfilt 4 , +.\" .Xr evbarm/pxaacu 4 , +.\" .Xr evbarm/udassio 4 , .Xr fms 4 , .Xr gcscaudio 4 , .Xr gus 4 ,
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: hikaru Date: Wed Nov 13 02:55:00 UTC 2019 Modified Files: src/sys/arch/x86/pci: msipic.c Log Message: Disable MSI-X before writing the MSI-X table. That fixes MSI-X interrupt lost on VMware ESXi 6.7 PCI passthrough devices. ok knakahara@ To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/pci/msipic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: hikaru Date: Wed Nov 13 02:55:00 UTC 2019 Modified Files: src/sys/arch/x86/pci: msipic.c Log Message: Disable MSI-X before writing the MSI-X table. That fixes MSI-X interrupt lost on VMware ESXi 6.7 PCI passthrough devices. ok knakahara@ To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/pci/msipic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/pci/msipic.c diff -u src/sys/arch/x86/pci/msipic.c:1.18 src/sys/arch/x86/pci/msipic.c:1.19 --- src/sys/arch/x86/pci/msipic.c:1.18 Thu Oct 3 18:53:08 2019 +++ src/sys/arch/x86/pci/msipic.c Wed Nov 13 02:54:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: msipic.c,v 1.18 2019/10/03 18:53:08 tnn Exp $ */ +/* $NetBSD: msipic.c,v 1.19 2019/11/13 02:54:59 hikaru Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.18 2019/10/03 18:53:08 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.19 2019/11/13 02:54:59 hikaru Exp $"); #include "opt_intrdebug.h" @@ -548,6 +548,11 @@ msix_addroute(struct pic *pic, struct cp err = pci_get_capability(pc, tag, PCI_CAP_MSIX, , NULL); KASSERT(err != 0); + /* Disable MSI-X before writing MSI-X table */ + ctl = pci_conf_read(pc, tag, off + PCI_MSIX_CTL); + ctl &= ~PCI_MSIX_CTL_ENABLE; + pci_conf_write(pc, tag, off + PCI_MSIX_CTL, ctl); + entry_base = PCI_MSIX_TABLE_ENTRY_SIZE * msix_vec; /*
CVS commit: src/sys
Module Name:src
Committed By: ozaki-r
Date: Wed Nov 13 02:51:23 UTC 2019
Modified Files:
src/sys/net: if.c route.c
src/sys/netinet: ip_input.c sctp_output.c
src/sys/netinet6: frag6.c in6_src.c ip6_output.c nd6_nbr.c
Log Message:
Get rid of unnecessary NULL checks for rt_ifa and ifa_ifp
They are always non-NULL nowadays.
To generate a diff of this commit:
cvs rdiff -u -r1.463 -r1.464 src/sys/net/if.c
cvs rdiff -u -r1.225 -r1.226 src/sys/net/route.c
cvs rdiff -u -r1.392 -r1.393 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netinet/sctp_output.c
cvs rdiff -u -r1.74 -r1.75 src/sys/netinet6/frag6.c
cvs rdiff -u -r1.85 -r1.86 src/sys/netinet6/in6_src.c
cvs rdiff -u -r1.221 -r1.222 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.174 -r1.175 src/sys/netinet6/nd6_nbr.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/if.c
diff -u src/sys/net/if.c:1.463 src/sys/net/if.c:1.464
--- src/sys/net/if.c:1.463 Sun Oct 6 15:11:17 2019
+++ src/sys/net/if.c Wed Nov 13 02:51:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.463 2019/10/06 15:11:17 uwe Exp $ */
+/* $NetBSD: if.c,v 1.464 2019/11/13 02:51:22 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.463 2019/10/06 15:11:17 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.464 2019/11/13 02:51:22 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2197,10 +2197,10 @@ link_rtrequest(int cmd, struct rtentry *
struct ifnet *ifp;
struct psref psref;
- if (cmd != RTM_ADD || (ifa = rt->rt_ifa) == NULL ||
- (ifp = ifa->ifa_ifp) == NULL || (dst = rt_getkey(rt)) == NULL ||
- ISSET(info->rti_flags, RTF_DONTCHANGEIFA))
+ if (cmd != RTM_ADD || ISSET(info->rti_flags, RTF_DONTCHANGEIFA))
return;
+ ifp = rt->rt_ifa->ifa_ifp;
+ dst = rt_getkey(rt);
if ((ifa = ifaof_ifpforaddr_psref(dst, ifp, )) != NULL) {
rt_replace_ifa(rt, ifa);
if (ifa->ifa_rtrequest && ifa->ifa_rtrequest != link_rtrequest)
Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.225 src/sys/net/route.c:1.226
--- src/sys/net/route.c:1.225 Thu Oct 3 03:10:02 2019
+++ src/sys/net/route.c Wed Nov 13 02:51:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.225 2019/10/03 03:10:02 knakahara Exp $ */
+/* $NetBSD: route.c,v 1.226 2019/11/13 02:51:22 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.225 2019/10/03 03:10:02 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.226 2019/11/13 02:51:22 ozaki-r Exp $");
#include
#ifdef RTFLUSH_DEBUG
@@ -355,9 +355,8 @@ rt_get_ifa(struct rtentry *rt)
{
struct ifaddr *ifa;
- if ((ifa = rt->rt_ifa) == NULL)
- return ifa;
- else if (ifa->ifa_getifa == NULL)
+ ifa = rt->rt_ifa;
+ if (ifa->ifa_getifa == NULL)
return ifa;
#if 0
else if (ifa->ifa_seqno != NULL && *ifa->ifa_seqno == rt->rt_ifa_seqno)
@@ -412,8 +411,7 @@ rt_replace_ifa(struct rtentry *rt, struc
if (rt->rt_ifa == ifa)
return;
- if (rt->rt_ifa &&
- rt->rt_ifa != ifa &&
+ if (rt->rt_ifa != ifa &&
rt->rt_ifa->ifa_flags & IFA_ROUTE &&
rt_ifa_connected(rt, rt->rt_ifa))
{
@@ -1194,18 +1192,17 @@ rtrequest1(int req, struct rt_addrinfo *
if ((rt = rt_deladdr(rtbl, dst, netmask)) == NULL)
senderr(ESRCH);
rt->rt_flags &= ~RTF_UP;
- if ((ifa = rt->rt_ifa)) {
- if (ifa->ifa_flags & IFA_ROUTE &&
- rt_ifa_connected(rt, ifa)) {
-RT_DPRINTF("rt->_rt_key = %p, ifa = %p, "
-"deleted IFA_ROUTE\n",
-(void *)rt->_rt_key, (void *)ifa);
-ifa->ifa_flags &= ~IFA_ROUTE;
- }
- if (ifa->ifa_rtrequest)
-ifa->ifa_rtrequest(RTM_DELETE, rt, info);
- ifa = NULL;
+ ifa = rt->rt_ifa;
+ if (ifa->ifa_flags & IFA_ROUTE &&
+ rt_ifa_connected(rt, ifa)) {
+ RT_DPRINTF("rt->_rt_key = %p, ifa = %p, "
+ "deleted IFA_ROUTE\n",
+ (void *)rt->_rt_key, (void *)ifa);
+ ifa->ifa_flags &= ~IFA_ROUTE;
}
+ if (ifa->ifa_rtrequest)
+ ifa->ifa_rtrequest(RTM_DELETE, rt, info);
+ ifa = NULL;
rttrash++;
if (ret_nrt) {
*ret_nrt = rt;
@@ -1519,7 +1516,7 @@ rt_update(struct rtentry *rt, struct rt_
rt->rt_flags = (info->rti_flags & ~PRESERVED_RTF) |
(rt->rt_flags & PRESERVED_RTF);
}
- if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
+ if (rt->rt_ifa->ifa_rtrequest)
rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, info);
#if defined(INET) || defined(INET6)
if (ifp_changed && rt_mask(rt) != NULL)
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.392 src/sys/netinet/ip_input.c:1.393
--- src/sys/netinet/ip_input.c:1.392 Thu Sep 19 05:31:50 2019
+++ src/sys/netinet/ip_input.c Wed Nov 13 02:51:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.392 2019/09/19 05:31:50 ozaki-r Exp $ */
+/* $NetBSD:
CVS commit: src/sys
Module Name:src Committed By: ozaki-r Date: Wed Nov 13 02:51:23 UTC 2019 Modified Files: src/sys/net: if.c route.c src/sys/netinet: ip_input.c sctp_output.c src/sys/netinet6: frag6.c in6_src.c ip6_output.c nd6_nbr.c Log Message: Get rid of unnecessary NULL checks for rt_ifa and ifa_ifp They are always non-NULL nowadays. To generate a diff of this commit: cvs rdiff -u -r1.463 -r1.464 src/sys/net/if.c cvs rdiff -u -r1.225 -r1.226 src/sys/net/route.c cvs rdiff -u -r1.392 -r1.393 src/sys/netinet/ip_input.c cvs rdiff -u -r1.18 -r1.19 src/sys/netinet/sctp_output.c cvs rdiff -u -r1.74 -r1.75 src/sys/netinet6/frag6.c cvs rdiff -u -r1.85 -r1.86 src/sys/netinet6/in6_src.c cvs rdiff -u -r1.221 -r1.222 src/sys/netinet6/ip6_output.c cvs rdiff -u -r1.174 -r1.175 src/sys/netinet6/nd6_nbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: mrg
Date: Wed Nov 13 01:31:47 UTC 2019
Modified Files:
src/sys/kern: kern_cpu.c
Log Message:
put the ucode not found message under #ifdef DEBUG. use printf()
instead of aprint_error().
there's an error returned to userland and displayed by cpuctl.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/kern/kern_cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.76 src/sys/kern/kern_cpu.c:1.77
--- src/sys/kern/kern_cpu.c:1.76 Sun Oct 6 02:04:26 2019
+++ src/sys/kern/kern_cpu.c Wed Nov 13 01:31:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.76 2019/10/06 02:04:26 uwe Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.77 2019/11/13 01:31:47 mrg Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.76 2019/10/06 02:04:26 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.77 2019/11/13 01:31:47 mrg Exp $");
#include "opt_cpu_ucode.h"
@@ -602,7 +602,9 @@ cpu_ucode_load(struct cpu_ucode_softc *s
error = cpu_ucode_md_open(, sc->loader_version, fwname);
if (error != 0) {
- aprint_error("ucode: firmware_open failed: %i\n", error);
+#ifdef DEBUG
+ printf("ucode: firmware_open(%s) failed: %i\n", fwname, error);
+#endif
goto err0;
}
CVS commit: src/sys/kern
Module Name:src Committed By: mrg Date: Wed Nov 13 01:31:47 UTC 2019 Modified Files: src/sys/kern: kern_cpu.c Log Message: put the ucode not found message under #ifdef DEBUG. use printf() instead of aprint_error(). there's an error returned to userland and displayed by cpuctl. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/kern/kern_cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/dist
Module Name:src Committed By: kre Date: Wed Nov 13 00:19:46 UTC 2019 Modified Files: src/external/bsd/tmux/dist: tty-keys.c Log Message: Appease gcc. Init "terminator". It is plainly obvious that the init value cannot be used (the var was never used uninit'd - could not be) but gcc apparently cannot work that out. Revert this if we ever get a compiler with a brain. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tmux/dist/tty-keys.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/dist
Module Name:src
Committed By: kre
Date: Wed Nov 13 00:19:46 UTC 2019
Modified Files:
src/external/bsd/tmux/dist: tty-keys.c
Log Message:
Appease gcc. Init "terminator".
It is plainly obvious that the init value cannot be used (the
var was never used uninit'd - could not be) but gcc apparently cannot
work that out. Revert this if we ever get a compiler with a brain.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tmux/dist/tty-keys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/dist/tty-keys.c
diff -u src/external/bsd/tmux/dist/tty-keys.c:1.11 src/external/bsd/tmux/dist/tty-keys.c:1.12
--- src/external/bsd/tmux/dist/tty-keys.c:1.11 Tue Nov 12 21:02:28 2019
+++ src/external/bsd/tmux/dist/tty-keys.c Wed Nov 13 00:19:46 2019
@@ -931,6 +931,7 @@ tty_keys_clipboard(__unused struct tty *
return (1);
/* Find the terminator if any. */
+ terminator = 0; /* XXX: appease gcc (this value is never used) */
for (end = 5; end < len; end++) {
if (buf[end] == '\007') {
terminator = 1;
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Tue Nov 12 23:54:34 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: remove debugging. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Tue Nov 12 23:54:34 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
remove debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.8 src/usr.sbin/postinstall/postinstall.in:1.9
--- src/usr.sbin/postinstall/postinstall.in:1.8 Wed Oct 30 16:24:44 2019
+++ src/usr.sbin/postinstall/postinstall.in Tue Nov 12 18:54:34 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.8 2019/10/30 20:24:44 prlw1 Exp $
+# $NetBSD: postinstall.in,v 1.9 2019/11/12 23:54:34 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2253,7 +2253,6 @@ getarchsubdirs() {
getcompatlibdirs() {
for i in $(getarchsubdirs); do
- echo $i 1>&2
if [ -d "${DEST_DIR}/usr/lib/$i" ]; then
echo /usr/lib/$i
fi
Re: CVS commit: src [llvm]
On Tue, Nov 12, 2019 at 04:31:00PM +0100, Maxime Villard wrote: > Le 12/11/2019 à 16:06, Maxime Villard a écrit : > > Le 12/11/2019 à 14:37, Joerg Sonnenberger a écrit : > > > On Tue, Nov 12, 2019 at 11:39:09AM +0100, Maxime Villard wrote: > > > > Le 11/11/2019 à 23:45, Joerg Sonnenberger a écrit : > > > > > Module Name: src > > > > > Committed By: joerg > > > > > Date: Mon Nov 11 22:45:32 UTC 2019 > > > > > > > > > > [...] > > > > > Log Message: > > > > > Update LLVM to 10.0.0git (01f3a59fb3e2542fce74c768718f594d0debd0da) > > > > > > > > Since this change, I cannot cross-compile GENERIC amd64 from Linux: > > > > > > What non-standard settings are you using? amd64 is certainly on my list > > > of architectures to test. > > > > No particular settings. Just the latest src/ compiled unchanged with > > > > ./build.sh -j4 -U -O ../obj -V MKLLVM=yes -V MKGCC=no -V HAVE_LLVM=yes -m > > amd64 kernel=GENERIC > > I'm also having the same issue on a NetBSD-amd64 host, with again an unchanged > src/ and the same command Is that a clean build? I certainly do full release builds for all LLVM architectures and I don't get this. Joerg
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Nov 12 21:03:49 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tmux To generate a diff of this commit: cvs rdiff -u -r1.1668 -r1.1669 src/doc/3RDPARTY cvs rdiff -u -r1.2611 -r1.2612 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1668 src/doc/3RDPARTY:1.1669 --- src/doc/3RDPARTY:1.1668 Mon Nov 11 17:44:57 2019 +++ src/doc/3RDPARTY Tue Nov 12 16:03:49 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1668 2019/11/11 22:44:57 joerg Exp $ +# $NetBSD: 3RDPARTY,v 1.1669 2019/11/12 21:03:49 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1346,12 +1346,12 @@ perhaps this implementation should be ke purposes. Package: tmux -Version: 2.8 +Version: 2.9a Current Vers: 2.9a Maintainer: Nicholas Marriott Archive site: https://github.com/tmux/tmux Home page: http://tmux.github.io -Date: 2019-10-09 +Date: 2019-11-12 Mailing List: tmux-us...@googlegroups.com Responsible: christos License: BSD Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2611 src/doc/CHANGES:1.2612 --- src/doc/CHANGES:1.2611 Tue Nov 12 03:35:56 2019 +++ src/doc/CHANGES Tue Nov 12 16:03:49 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2611 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2612 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -74,3 +74,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: micphy(4): Add support for Microchip KSZ80[0456]1, KSZ8721, KSZ9[01]31, KS8731 and KSZ9477. [msaitoh 20191107] + tmux(1): Imported 2.9a. [christos 20191112]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Nov 12 21:03:49 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tmux To generate a diff of this commit: cvs rdiff -u -r1.1668 -r1.1669 src/doc/3RDPARTY cvs rdiff -u -r1.2611 -r1.2612 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: christos Date: Tue Nov 12 21:02:46 UTC 2019 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: new files and bump version To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/tmux/usr.bin/tmux/Makefile diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.22 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.23 --- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.22 Sun Oct 13 03:28:07 2019 +++ src/external/bsd/tmux/usr.bin/tmux/Makefile Tue Nov 12 16:02:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/10/13 07:28:07 mrg Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/12 21:02:46 christos Exp $ .include @@ -56,6 +56,7 @@ cmd-refresh-client.c \ cmd-rename-session.c \ cmd-rename-window.c \ cmd-resize-pane.c \ +cmd-resize-window.c \ cmd-respawn-pane.c \ cmd-respawn-window.c \ cmd-rotate-window.c \ @@ -86,6 +87,7 @@ control-notify.c \ control.c \ environ.c \ format.c \ +format-draw.c \ grid-view.c \ grid.c \ hooks.c \ @@ -206,13 +208,13 @@ CPPFLAGS+= \ -DPACKAGE=\"tmux\" \ -DPACKAGE_BUGREPORT=\"\" \ -DPACKAGE_NAME=\"tmux\" \ --DPACKAGE_STRING=\"tmux\ 2.8\" \ +-DPACKAGE_STRING=\"tmux\ 2.9a\" \ -DPACKAGE_TARNAME=\"tmux\" \ -DPACKAGE_URL=\"\" \ --DPACKAGE_VERSION=\"2.8\" \ +-DPACKAGE_VERSION=\"2.9a\" \ -DSTDC_HEADERS=1 \ -DTMUX_CONF="\"/etc/tmux.conf\"" \ --DVERSION=\"2.8\" \ +-DVERSION=\"2.9a\" \ -D_ALL_SOURCE=1 \ -D_GNU_SOURCE=1 \ -D_OPENBSD_SOURCE \
CVS commit: src/external/bsd/tmux/dist
Module Name:src Committed By: christos Date: Tue Nov 12 21:02:28 UTC 2019 Modified Files: src/external/bsd/tmux/dist: client.c cmd-attach-session.c cmd-capture-pane.c cmd-display-message.c cmd-if-shell.c cmd-load-buffer.c cmd-new-session.c cmd-queue.c cmd-send-keys.c cmd-show-messages.c cmd-show-options.c cmd-split-window.c cmd-string.c cmd-wait-for.c colour.c environ.c format.c grid.c input-keys.c input.c job.c key-bindings.c mode-tree.c options.c screen-write.c screen.c server-client.c server-fn.c session.c status.c style.c tmux.1 tmux.c tmux.h tty-keys.c tty-term.c tty.c utf8.c window-buffer.c window-client.c window-copy.c window-tree.c window.c xmalloc.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/dist/client.c \ src/external/bsd/tmux/dist/cmd-send-keys.c \ src/external/bsd/tmux/dist/colour.c src/external/bsd/tmux/dist/grid.c \ src/external/bsd/tmux/dist/input-keys.c \ src/external/bsd/tmux/dist/status.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tmux/dist/cmd-attach-session.c \ src/external/bsd/tmux/dist/cmd-new-session.c \ src/external/bsd/tmux/dist/cmd-wait-for.c \ src/external/bsd/tmux/dist/server-client.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tmux/dist/cmd-capture-pane.c \ src/external/bsd/tmux/dist/cmd-load-buffer.c \ src/external/bsd/tmux/dist/cmd-show-messages.c \ src/external/bsd/tmux/dist/cmd-split-window.c \ src/external/bsd/tmux/dist/key-bindings.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tmux/dist/cmd-display-message.c \ src/external/bsd/tmux/dist/cmd-if-shell.c \ src/external/bsd/tmux/dist/environ.c src/external/bsd/tmux/dist/format.c \ src/external/bsd/tmux/dist/options.c src/external/bsd/tmux/dist/tmux.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tmux/dist/cmd-queue.c \ src/external/bsd/tmux/dist/mode-tree.c \ src/external/bsd/tmux/dist/window-buffer.c \ src/external/bsd/tmux/dist/window-client.c \ src/external/bsd/tmux/dist/xmalloc.h cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/tmux/dist/cmd-show-options.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tmux/dist/cmd-string.c \ src/external/bsd/tmux/dist/job.c \ src/external/bsd/tmux/dist/screen-write.c \ src/external/bsd/tmux/dist/screen.c \ src/external/bsd/tmux/dist/server-fn.c \ src/external/bsd/tmux/dist/session.c src/external/bsd/tmux/dist/tmux.1 \ src/external/bsd/tmux/dist/window-copy.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tmux/dist/input.c cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/tmux/dist/style.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/tmux/dist/tmux.h cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tmux/dist/tty-keys.c \ src/external/bsd/tmux/dist/tty-term.c src/external/bsd/tmux/dist/window.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/dist/tty.c \ src/external/bsd/tmux/dist/utf8.c \ src/external/bsd/tmux/dist/window-tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: christos Date: Tue Nov 12 21:02:46 UTC 2019 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: new files and bump version To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Tue Nov 12 20:59:46 UTC 2019
Modified Files:
src/lib/libedit: terminal.c
Log Message:
PR/54654: Soren Tempel: Make sure el_cursor.v < el_terminal.t_size.v when
moving around.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/lib/libedit/terminal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.40 src/lib/libedit/terminal.c:1.41
--- src/lib/libedit/terminal.c:1.40 Sun Sep 15 17:09:11 2019
+++ src/lib/libedit/terminal.c Tue Nov 12 15:59:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.40 2019/09/15 21:09:11 christos Exp $ */
+/* $NetBSD: terminal.c,v 1.41 2019/11/12 20:59:46 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
#else
-__RCSID("$NetBSD: terminal.c,v 1.40 2019/09/15 21:09:11 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.41 2019/11/12 20:59:46 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -497,7 +497,7 @@ terminal_move_to_line(EditLine *el, int
if (where == el->el_cursor.v)
return;
- if (where > el->el_terminal.t_size.v) {
+ if (where >= el->el_terminal.t_size.v) {
#ifdef DEBUG_SCREEN
(void) fprintf(el->el_errfile,
"%s: where is ridiculous: %d\r\n", __func__, where);
@@ -647,7 +647,8 @@ terminal_overwrite(EditLine *el, const w
if (el->el_cursor.h >= el->el_terminal.t_size.h) { /* wrap? */
if (EL_HAS_AUTO_MARGINS) { /* yes */
el->el_cursor.h = 0;
- el->el_cursor.v++;
+ if (el->el_cursor.v + 1 < el->el_terminal.t_size.v)
+el->el_cursor.v++;
if (EL_HAS_MAGIC_MARGINS) {
/* force the wrap to avoid the "magic"
* situation */
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Tue Nov 12 20:59:46 UTC 2019 Modified Files: src/lib/libedit: terminal.c Log Message: PR/54654: Soren Tempel: Make sure el_cursor.v < el_terminal.t_size.v when moving around. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/lib/libedit/terminal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/x86
Hi, On Tue, Nov 12, 2019 at 06:00:13PM +, Maxime Villard wrote: > Committed By: maxv > Date: Tue Nov 12 18:00:13 UTC 2019 > Modified Files: > src/sys/arch/x86/include: specialreg.h > src/sys/arch/x86/x86: spectre.c > Log Message: > Mitigation for CVE-2019-11135: TSX Asynchronous Abort (TAA). are you planing to document the new sysctls properly? Preferably without TLA-soup. --chris
CVS commit: src/sys/dev/pci
Module Name:src Committed By: maya Date: Tue Nov 12 19:44:46 UTC 2019 Modified Files: src/sys/dev/pci: if_vte.c Log Message: Fix whitespace. From vezhlys To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_vte.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_vte.c diff -u src/sys/dev/pci/if_vte.c:1.27 src/sys/dev/pci/if_vte.c:1.28 --- src/sys/dev/pci/if_vte.c:1.27 Wed Oct 30 07:26:28 2019 +++ src/sys/dev/pci/if_vte.c Tue Nov 12 19:44:46 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vte.c,v 1.27 2019/10/30 07:26:28 msaitoh Exp $ */ +/* $NetBSD: if_vte.c,v 1.28 2019/11/12 19:44:46 maya Exp $ */ /* * Copyright (c) 2011 Manuel Bouyer. All rights reserved. @@ -55,7 +55,7 @@ /* Driver for DM Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.27 2019/10/30 07:26:28 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.28 2019/11/12 19:44:46 maya Exp $"); #include #include @@ -847,7 +847,7 @@ vte_mediachange(struct ifnet *ifp) aprint_error_dev(sc->vte_dev, "could not set media\n"); return error; } - return 0; + return 0; }
CVS commit: src/sys/dev/pci
Module Name:src Committed By: maya Date: Tue Nov 12 19:44:46 UTC 2019 Modified Files: src/sys/dev/pci: if_vte.c Log Message: Fix whitespace. From vezhlys To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_vte.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Nov 12 19:24:08 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1433 To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.62 src/doc/CHANGES-8.2:1.1.2.63 --- src/doc/CHANGES-8.2:1.1.2.62 Mon Nov 11 17:18:14 2019 +++ src/doc/CHANGES-8.2 Tue Nov 12 19:24:08 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.62 2019/11/11 17:18:14 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.63 2019/11/12 19:24:08 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1507,3 +1507,9 @@ sys/dev/ic/nvme.c1.47 queues. [nonaka, ticket #1432] +sys/arch/x86/include/specialreg.h 1.157 (patch) +sys/arch/x86/x86/spectre.c 1.31 (patch) + + Mitigation for CVE-2019-11135: TSX Asynchronous Abort (TAA). + [maxv, ticket #1433] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Nov 12 19:24:08 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1433 To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/tmux/dist
Module Name:src Committed By: christos Date: Tue Nov 12 19:18:23 UTC 2019 Update of /cvsroot/src/external/bsd/tmux/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28080 Log Message: CHANGES FROM 2.9 to 2.9a * Fix bugs in select-pane and the main-horizontal and main-vertical layouts. CHANGES FROM 2.8 to 2.9 * Attempt to preserve horizontal cursor position as well as vertical with reflow. * Rewrite main-vertical and horizontal and change layouts to better handle the case where all panes won't fit into the window size, reduce problems with pane border status lines and fix other bugs mostly found by Thomas Sattler. * Add format variables for the default formats in the various modes (tree_mode_format and so on) and add a -a flag to display-message to list variables with values. * Add a -v flag to display-message to show verbose messages as the format is parsed, this allows formats to be debugged * Add support for HPA (\033[`). * Add support for origin mode (\033[?6h). * No longer clear history on RIS. * Extend the #[] style syntax and use that together with previous format changes to allow the status line to be entirely configured with a single option. Now that it is possible to configure their content, enable the existing code that lets the status line be multiple lines in height. The status option can now take a value of 2, 3, 4 or 5 (as well as the previous on or off) to configure more than one line. The new status-format array option configures the format of each line, the default just references the existing status-* options, although some of the more obscure status options may be eliminated in time. Additions to the #[] syntax are: "align" to specify alignment (left, centre, right), "list" for the window list and "range" to configure ranges of text for the mouse bindings. The "align" keyword can also be used to specify alignment of entries in tree mode and the pane status lines. * Add E: and T: format modifiers to expand a format twice (useful to expand the value of an option). * The individual -fg, -bg and -attr options have been removed; they were superseded by -style options in tmux 1.9. * Allow more than one mode to be opened in a pane. Modes are kept on a stack and retrieved if the same mode is entered again. Exiting the active mode goes back to the previous one. * When showing command output in copy mode, call it view mode instead (affects pane_mode format). * Add -b to display-panes like run-shell. * Handle UTF-8 in word-separators option. * New "terminal" colour allowing options to use the terminal default colour rather than inheriting the default from a parent option. * Do not move the cursor in copy mode when the mouse wheel is used. * Use the same working directory rules for jobs as new windows rather than always starting in the user's home. * Allow panes to be one line or column in size. * Go to last line when goto-line number is out of range in copy mode. * Yank previously cut text if any with C-y in the command prompt, only use the buffer if no text has been cut. * Add q: format modifier to quote shell special characters. * Add StatusLeft and StatusRight mouse locations (keys such as MouseDown1StatusLeft) for the status-left and status-right areas of the status line. * Add -Z to find-window. * Support for windows larger than the client. This adds two new options, window-size and default-size, and a new command, resize-window. The force-width and force-height options and the session_width and session_height formats have been removed. The new window-size option tells tmux how to work out the size of windows: largest means it picks the size of the largest session, smallest the smallest session (similar to the old behaviour) and manual means that it does not automatically resize windows. aggressive-resize modifies the choice of session for largest and smallest as it did before. If a window is in a session attached to a client that is too small, only part of the window is shown. tmux attempts to keep the cursor visible, so the part of the window displayed is changed as the cursor moves (with a small delay, to try and avoid excess redrawing when applications redraw status lines or similar that are not currently visible). Drawing windows which are larger than the client is not as efficient as those which fit, particularly when the cursor moves, so it is recommended to avoid using this on slow machines or networks (set window-size to smallest or manual). The resize-window command can be used to resize a window manually. If it is used, the window-size option is automatically set to manual for the window (undo this with "setw -u window-size"). resize-window works in a similar way to resize-pane (-U -D -L -R -x -y flags) but also has -a and -A flags. -a sets the window to the size of the smallest client (what it would be if window-size was
CVS import: src/external/bsd/tmux/dist
Module Name:src Committed By: christos Date: Tue Nov 12 19:18:23 UTC 2019 Update of /cvsroot/src/external/bsd/tmux/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28080 Log Message: CHANGES FROM 2.9 to 2.9a * Fix bugs in select-pane and the main-horizontal and main-vertical layouts. CHANGES FROM 2.8 to 2.9 * Attempt to preserve horizontal cursor position as well as vertical with reflow. * Rewrite main-vertical and horizontal and change layouts to better handle the case where all panes won't fit into the window size, reduce problems with pane border status lines and fix other bugs mostly found by Thomas Sattler. * Add format variables for the default formats in the various modes (tree_mode_format and so on) and add a -a flag to display-message to list variables with values. * Add a -v flag to display-message to show verbose messages as the format is parsed, this allows formats to be debugged * Add support for HPA (\033[`). * Add support for origin mode (\033[?6h). * No longer clear history on RIS. * Extend the #[] style syntax and use that together with previous format changes to allow the status line to be entirely configured with a single option. Now that it is possible to configure their content, enable the existing code that lets the status line be multiple lines in height. The status option can now take a value of 2, 3, 4 or 5 (as well as the previous on or off) to configure more than one line. The new status-format array option configures the format of each line, the default just references the existing status-* options, although some of the more obscure status options may be eliminated in time. Additions to the #[] syntax are: "align" to specify alignment (left, centre, right), "list" for the window list and "range" to configure ranges of text for the mouse bindings. The "align" keyword can also be used to specify alignment of entries in tree mode and the pane status lines. * Add E: and T: format modifiers to expand a format twice (useful to expand the value of an option). * The individual -fg, -bg and -attr options have been removed; they were superseded by -style options in tmux 1.9. * Allow more than one mode to be opened in a pane. Modes are kept on a stack and retrieved if the same mode is entered again. Exiting the active mode goes back to the previous one. * When showing command output in copy mode, call it view mode instead (affects pane_mode format). * Add -b to display-panes like run-shell. * Handle UTF-8 in word-separators option. * New "terminal" colour allowing options to use the terminal default colour rather than inheriting the default from a parent option. * Do not move the cursor in copy mode when the mouse wheel is used. * Use the same working directory rules for jobs as new windows rather than always starting in the user's home. * Allow panes to be one line or column in size. * Go to last line when goto-line number is out of range in copy mode. * Yank previously cut text if any with C-y in the command prompt, only use the buffer if no text has been cut. * Add q: format modifier to quote shell special characters. * Add StatusLeft and StatusRight mouse locations (keys such as MouseDown1StatusLeft) for the status-left and status-right areas of the status line. * Add -Z to find-window. * Support for windows larger than the client. This adds two new options, window-size and default-size, and a new command, resize-window. The force-width and force-height options and the session_width and session_height formats have been removed. The new window-size option tells tmux how to work out the size of windows: largest means it picks the size of the largest session, smallest the smallest session (similar to the old behaviour) and manual means that it does not automatically resize windows. aggressive-resize modifies the choice of session for largest and smallest as it did before. If a window is in a session attached to a client that is too small, only part of the window is shown. tmux attempts to keep the cursor visible, so the part of the window displayed is changed as the cursor moves (with a small delay, to try and avoid excess redrawing when applications redraw status lines or similar that are not currently visible). Drawing windows which are larger than the client is not as efficient as those which fit, particularly when the cursor moves, so it is recommended to avoid using this on slow machines or networks (set window-size to smallest or manual). The resize-window command can be used to resize a window manually. If it is used, the window-size option is automatically set to manual for the window (undo this with "setw -u window-size"). resize-window works in a similar way to resize-pane (-U -D -L -R -x -y flags) but also has -a and -A flags. -a sets the window to the size of the smallest client (what it would be if window-size was
CVS commit: src/tests/usr.bin/printf
Module Name:src
Committed By: kre
Date: Tue Nov 12 18:59:52 UTC 2019
Modified Files:
src/tests/usr.bin/printf: printf.sh
Log Message:
Add a missing ("quoting") '>' in an atf_fail error message string.
Since the tests don't (usually) fail no-one ever noticed the missing char.
That is, the "received this" and "expected this" strings were supposed
to appear in the output err message as "<>" but one of those
closing '>' chars was missing.
No-one should ever notice this change in normal operation, as the tests
are not intended to fail.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/printf/printf.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/printf
Module Name:src
Committed By: kre
Date: Tue Nov 12 18:59:52 UTC 2019
Modified Files:
src/tests/usr.bin/printf: printf.sh
Log Message:
Add a missing ("quoting") '>' in an atf_fail error message string.
Since the tests don't (usually) fail no-one ever noticed the missing char.
That is, the "received this" and "expected this" strings were supposed
to appear in the output err message as "<>" but one of those
closing '>' chars was missing.
No-one should ever notice this change in normal operation, as the tests
are not intended to fail.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/printf/printf.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/printf/printf.sh
diff -u src/tests/usr.bin/printf/printf.sh:1.4 src/tests/usr.bin/printf/printf.sh:1.5
--- src/tests/usr.bin/printf/printf.sh:1.4 Sun Jul 21 15:25:59 2019
+++ src/tests/usr.bin/printf/printf.sh Tue Nov 12 18:59:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: printf.sh,v 1.4 2019/07/21 15:25:59 kre Exp $
+# $NetBSD: printf.sh,v 1.5 2019/11/12 18:59:51 kre Exp $
#
# Copyright (c) 2018 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -118,7 +118,7 @@ expect()
(${WANT})
;;
(*)
- atf_fail "$* ... Expected <<${WANT}>> Received <<${RES}>"
+ atf_fail "$* ... Expected <<${WANT}>> Received <<${RES}>>"
;;
esac
fi
CVS commit: [netbsd-8] src/sys/arch/x86
Module Name:src
Committed By: martin
Date: Tue Nov 12 18:28:40 UTC 2019
Modified Files:
src/sys/arch/x86/include [netbsd-8]: specialreg.h
src/sys/arch/x86/x86 [netbsd-8]: spectre.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1433):
sys/arch/x86/include/specialreg.h: revision 1.157
sys/arch/x86/x86/spectre.c: revision 1.31
Mitigation for CVE-2019-11135: TSX Asynchronous Abort (TAA).
Two sysctls are added:
machdep.taa.mitigated = {0/1} user-settable
machdep.taa.method = {string} constructed by the kernel
There are two cases:
(1) If the CPU is affected by MDS, then the MDS mitigation will also
mitigate TAA, and we have nothing else to do. We make the 'mitigated' leaf
read-only, and force:
machdep.taa.mitigated = machdep.mds.mitigated
machdep.taa.method = [MDS]
The kernel already enables the MDS mitigation by default.
(2) If the CPU is not affected by MDS but is affected by TAA, then we use
the new TSX_CTRL MSR to disable RTM. This MSR is provided via a microcode
update, now available on the Intel website. The kernel will automatically
enable the TAA mitigation if the updated microcode is present. If the new
microcode is not present, the user can load it via cpuctl, and set
machdep.taa.mitigated=1.
To generate a diff of this commit:
cvs rdiff -u -r1.98.2.15 -r1.98.2.16 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.19.2.4 -r1.19.2.5 src/sys/arch/x86/x86/spectre.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.98.2.15 src/sys/arch/x86/include/specialreg.h:1.98.2.16
--- src/sys/arch/x86/include/specialreg.h:1.98.2.15 Fri Aug 16 15:36:17 2019
+++ src/sys/arch/x86/include/specialreg.h Tue Nov 12 18:28:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.98.2.15 2019/08/16 15:36:17 martin Exp $ */
+/* $NetBSD: specialreg.h,v 1.98.2.16 2019/11/12 18:28:40 martin Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -762,9 +762,14 @@
#define IA32_ARCH_SKIP_L1DFL_VMENTRY 0x08
#define IA32_ARCH_SSB_NO 0x10
#define IA32_ARCH_MDS_NO 0x20
+#define IA32_ARCH_TSX_CTRL 0x80
+#define IA32_ARCH_TAA_NO 0x100
#define MSR_IA32_FLUSH_CMD 0x10b
#define IA32_FLUSH_CMD_L1D_FLUSH 0x01
#define MSR_TSX_FORCE_ABORT 0x10f
+#define MSR_IA32_TSX_CTRL 0x122
+#define IA32_TSX_CTRL_RTM_DISABLE __BIT(0)
+#define IA32_TSX_CTRL_TSX_CPUID_CLEAR __BIT(1)
#define MSR_BBL_CR_ADDR 0x116 /* PII+ only */
#define MSR_BBL_CR_DECC 0x118 /* PII+ only */
#define MSR_BBL_CR_CTL 0x119 /* PII+ only */
Index: src/sys/arch/x86/x86/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.19.2.4 src/sys/arch/x86/x86/spectre.c:1.19.2.5
--- src/sys/arch/x86/x86/spectre.c:1.19.2.4 Sun Jun 2 08:29:30 2019
+++ src/sys/arch/x86/x86/spectre.c Tue Nov 12 18:28:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spectre.c,v 1.19.2.4 2019/06/02 08:29:30 martin Exp $ */
+/* $NetBSD: spectre.c,v 1.19.2.5 2019/11/12 18:28:40 martin Exp $ */
/*
* Copyright (c) 2018 NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
*/
/*
- * Mitigations for the SpectreV2 and SpectreV4 CPU flaws.
+ * Mitigations for the SpectreV2, SpectreV4, MDS and TAA CPU flaws.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.19.2.4 2019/06/02 08:29:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.19.2.5 2019/11/12 18:28:40 martin Exp $");
#include "opt_spectre.h"
@@ -652,14 +652,194 @@ sysctl_machdep_mds_mitigated(SYSCTLFN_AR
/* -- */
+enum taa_mitigation {
+ TAA_MITIGATION_NONE,
+ TAA_MITIGATION_TAA_NO,
+ TAA_MITIGATION_MDS,
+ TAA_MITIGATION_RTM_DISABLE
+};
+
+static char taa_mitigation_name[64] = "(none)";
+
+static enum taa_mitigation taa_mitigation_method = TAA_MITIGATION_NONE;
+static bool taa_mitigation_enabled __read_mostly = false;
+static bool *taa_mitigation_enabled_ptr = _mitigation_enabled;
+
+static void
+mitigation_taa_apply_cpu(struct cpu_info *ci, bool enabled)
+{
+ uint64_t msr;
+
+ switch (taa_mitigation_method) {
+ case TAA_MITIGATION_NONE:
+ case TAA_MITIGATION_TAA_NO:
+ case TAA_MITIGATION_MDS:
+ panic("impossible");
+ case TAA_MITIGATION_RTM_DISABLE:
+ msr = rdmsr(MSR_IA32_TSX_CTRL);
+ if (enabled) {
+ msr |= IA32_TSX_CTRL_RTM_DISABLE;
+ } else {
+ msr &= ~IA32_TSX_CTRL_RTM_DISABLE;
+ }
+ wrmsr(MSR_IA32_TSX_CTRL, msr);
+ break;
+ }
+}
+
+static void
+mitigation_taa_change_cpu(void *arg1, void *arg2)
+{
+ struct cpu_info *ci = curcpu();
+ bool enabled = (bool)arg1;
+
+ mitigation_taa_apply_cpu(ci, enabled);
+}
+
+static void
+taa_detect_method(void)
+{
+ u_int descs[4];
+ uint64_t msr;
+
+ taa_mitigation_enabled_ptr = _mitigation_enabled;
+
+ if (cpu_vendor != CPUVENDOR_INTEL) {
+ taa_mitigation_method = TAA_MITIGATION_TAA_NO;
+
CVS commit: [netbsd-8] src/sys/arch/x86
Module Name:src
Committed By: martin
Date: Tue Nov 12 18:28:40 UTC 2019
Modified Files:
src/sys/arch/x86/include [netbsd-8]: specialreg.h
src/sys/arch/x86/x86 [netbsd-8]: spectre.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1433):
sys/arch/x86/include/specialreg.h: revision 1.157
sys/arch/x86/x86/spectre.c: revision 1.31
Mitigation for CVE-2019-11135: TSX Asynchronous Abort (TAA).
Two sysctls are added:
machdep.taa.mitigated = {0/1} user-settable
machdep.taa.method = {string} constructed by the kernel
There are two cases:
(1) If the CPU is affected by MDS, then the MDS mitigation will also
mitigate TAA, and we have nothing else to do. We make the 'mitigated' leaf
read-only, and force:
machdep.taa.mitigated = machdep.mds.mitigated
machdep.taa.method = [MDS]
The kernel already enables the MDS mitigation by default.
(2) If the CPU is not affected by MDS but is affected by TAA, then we use
the new TSX_CTRL MSR to disable RTM. This MSR is provided via a microcode
update, now available on the Intel website. The kernel will automatically
enable the TAA mitigation if the updated microcode is present. If the new
microcode is not present, the user can load it via cpuctl, and set
machdep.taa.mitigated=1.
To generate a diff of this commit:
cvs rdiff -u -r1.98.2.15 -r1.98.2.16 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.19.2.4 -r1.19.2.5 src/sys/arch/x86/x86/spectre.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Nov 12 18:25:33 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #419 To generate a diff of this commit: cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.99 src/doc/CHANGES-9.0:1.1.2.100 --- src/doc/CHANGES-9.0:1.1.2.99 Mon Nov 11 19:52:59 2019 +++ src/doc/CHANGES-9.0 Tue Nov 12 18:25:33 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.99 2019/11/11 19:52:59 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.100 2019/11/12 18:25:33 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -5642,3 +5642,9 @@ sys/external/bsd/ipf/netinet/ip_fil.h 1 ipf(8): fix binary compatibility (accidently broken in rev. 1.7). [chs, ticket #418] +sys/arch/x86/include/specialreg.h 1.157 +sys/arch/x86/x86/spectre.c 1.31 + + Mitigation for CVE-2019-11135: TSX Asynchronous Abort (TAA). + [maxv, ticket #419] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Nov 12 18:25:33 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #419 To generate a diff of this commit: cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/x86
Module Name:src
Committed By: martin
Date: Tue Nov 12 18:24:37 UTC 2019
Modified Files:
src/sys/arch/x86/include [netbsd-9]: specialreg.h
src/sys/arch/x86/x86 [netbsd-9]: spectre.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #419):
sys/arch/x86/include/specialreg.h: revision 1.157
sys/arch/x86/x86/spectre.c: revision 1.31
Mitigation for CVE-2019-11135: TSX Asynchronous Abort (TAA).
Two sysctls are added:
machdep.taa.mitigated = {0/1} user-settable
machdep.taa.method = {string} constructed by the kernel
There are two cases:
(1) If the CPU is affected by MDS, then the MDS mitigation will also
mitigate TAA, and we have nothing else to do. We make the 'mitigated' leaf
read-only, and force:
machdep.taa.mitigated = machdep.mds.mitigated
machdep.taa.method = [MDS]
The kernel already enables the MDS mitigation by default.
(2) If the CPU is not affected by MDS but is affected by TAA, then we use
the new TSX_CTRL MSR to disable RTM. This MSR is provided via a microcode
update, now available on the Intel website. The kernel will automatically
enable the TAA mitigation if the updated microcode is present. If the new
microcode is not present, the user can load it via cpuctl, and set
machdep.taa.mitigated=1.
To generate a diff of this commit:
cvs rdiff -u -r1.150.2.3 -r1.150.2.4 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.29.2.1 -r1.29.2.2 src/sys/arch/x86/x86/spectre.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.150.2.3 src/sys/arch/x86/include/specialreg.h:1.150.2.4
--- src/sys/arch/x86/include/specialreg.h:1.150.2.3 Sun Nov 10 13:06:46 2019
+++ src/sys/arch/x86/include/specialreg.h Tue Nov 12 18:24:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.150.2.3 2019/11/10 13:06:46 martin Exp $ */
+/* $NetBSD: specialreg.h,v 1.150.2.4 2019/11/12 18:24:37 martin Exp $ */
/*
* Copyright (c) 2014-2019 The NetBSD Foundation, Inc.
@@ -853,9 +853,14 @@
#define IA32_ARCH_SKIP_L1DFL_VMENTRY 0x08
#define IA32_ARCH_SSB_NO 0x10
#define IA32_ARCH_MDS_NO 0x20
+#define IA32_ARCH_TSX_CTRL 0x80
+#define IA32_ARCH_TAA_NO 0x100
#define MSR_IA32_FLUSH_CMD 0x10b
#define IA32_FLUSH_CMD_L1D_FLUSH 0x01
#define MSR_TSX_FORCE_ABORT 0x10f
+#define MSR_IA32_TSX_CTRL 0x122
+#define IA32_TSX_CTRL_RTM_DISABLE __BIT(0)
+#define IA32_TSX_CTRL_TSX_CPUID_CLEAR __BIT(1)
#define MSR_SYSENTER_CS 0x174 /* PII+ only */
#define MSR_SYSENTER_ESP 0x175 /* PII+ only */
#define MSR_SYSENTER_EIP 0x176 /* PII+ only */
Index: src/sys/arch/x86/x86/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.29.2.1 src/sys/arch/x86/x86/spectre.c:1.29.2.2
--- src/sys/arch/x86/x86/spectre.c:1.29.2.1 Thu Sep 26 18:47:14 2019
+++ src/sys/arch/x86/x86/spectre.c Tue Nov 12 18:24:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spectre.c,v 1.29.2.1 2019/09/26 18:47:14 martin Exp $ */
+/* $NetBSD: spectre.c,v 1.29.2.2 2019/11/12 18:24:37 martin Exp $ */
/*
* Copyright (c) 2018-2019 NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
*/
/*
- * Mitigations for the SpectreV2, SpectreV4 and MDS CPU flaws.
+ * Mitigations for the SpectreV2, SpectreV4, MDS and TAA CPU flaws.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.29.2.1 2019/09/26 18:47:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.29.2.2 2019/11/12 18:24:37 martin Exp $");
#include "opt_spectre.h"
@@ -773,6 +773,185 @@ sysctl_machdep_mds_mitigated(SYSCTLFN_AR
/* -- */
+enum taa_mitigation {
+ TAA_MITIGATION_NONE,
+ TAA_MITIGATION_TAA_NO,
+ TAA_MITIGATION_MDS,
+ TAA_MITIGATION_RTM_DISABLE
+};
+
+static char taa_mitigation_name[64] = "(none)";
+
+static enum taa_mitigation taa_mitigation_method = TAA_MITIGATION_NONE;
+static bool taa_mitigation_enabled __read_mostly = false;
+static bool *taa_mitigation_enabled_ptr = _mitigation_enabled;
+
+static void
+mitigation_taa_apply_cpu(struct cpu_info *ci, bool enabled)
+{
+ uint64_t msr;
+
+ switch (taa_mitigation_method) {
+ case TAA_MITIGATION_NONE:
+ case TAA_MITIGATION_TAA_NO:
+ case TAA_MITIGATION_MDS:
+ panic("impossible");
+ case TAA_MITIGATION_RTM_DISABLE:
+ msr = rdmsr(MSR_IA32_TSX_CTRL);
+ if (enabled) {
+ msr |= IA32_TSX_CTRL_RTM_DISABLE;
+ } else {
+ msr &= ~IA32_TSX_CTRL_RTM_DISABLE;
+ }
+ wrmsr(MSR_IA32_TSX_CTRL, msr);
+ break;
+ }
+}
+
+static void
+mitigation_taa_change_cpu(void *arg1, void *arg2)
+{
+ struct cpu_info *ci = curcpu();
+ bool enabled = (bool)arg1;
+
+ mitigation_taa_apply_cpu(ci, enabled);
+}
+
+static void
+taa_detect_method(void)
+{
+ u_int descs[4];
+ uint64_t msr;
+
+ taa_mitigation_enabled_ptr = _mitigation_enabled;
+
+ if (cpu_vendor != CPUVENDOR_INTEL) {
+ taa_mitigation_method = TAA_MITIGATION_TAA_NO;
+
CVS commit: [netbsd-9] src/sys/arch/x86
Module Name:src
Committed By: martin
Date: Tue Nov 12 18:24:37 UTC 2019
Modified Files:
src/sys/arch/x86/include [netbsd-9]: specialreg.h
src/sys/arch/x86/x86 [netbsd-9]: spectre.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #419):
sys/arch/x86/include/specialreg.h: revision 1.157
sys/arch/x86/x86/spectre.c: revision 1.31
Mitigation for CVE-2019-11135: TSX Asynchronous Abort (TAA).
Two sysctls are added:
machdep.taa.mitigated = {0/1} user-settable
machdep.taa.method = {string} constructed by the kernel
There are two cases:
(1) If the CPU is affected by MDS, then the MDS mitigation will also
mitigate TAA, and we have nothing else to do. We make the 'mitigated' leaf
read-only, and force:
machdep.taa.mitigated = machdep.mds.mitigated
machdep.taa.method = [MDS]
The kernel already enables the MDS mitigation by default.
(2) If the CPU is not affected by MDS but is affected by TAA, then we use
the new TSX_CTRL MSR to disable RTM. This MSR is provided via a microcode
update, now available on the Intel website. The kernel will automatically
enable the TAA mitigation if the updated microcode is present. If the new
microcode is not present, the user can load it via cpuctl, and set
machdep.taa.mitigated=1.
To generate a diff of this commit:
cvs rdiff -u -r1.150.2.3 -r1.150.2.4 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.29.2.1 -r1.29.2.2 src/sys/arch/x86/x86/spectre.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: kamil Date: Tue Nov 12 18:18:04 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c t_ptrace_wait.h Log Message: Rework thread_concurrent_signals and trace_thread_lwpcreate_and_exit Change the code to remove the LWP id assumptions that broke after src/sys/kern/kern_lwp.c r. 1.206. Original code by , tested and tweaked by myself. To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 src/tests/lib/libc/sys/t_ptrace_wait.c cvs rdiff -u -r1.17 -r1.18 src/tests/lib/libc/sys/t_ptrace_wait.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kamil
Date: Tue Nov 12 18:18:04 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c t_ptrace_wait.h
Log Message:
Rework thread_concurrent_signals and trace_thread_lwpcreate_and_exit
Change the code to remove the LWP id assumptions that broke after
src/sys/kern/kern_lwp.c r. 1.206.
Original code by , tested and tweaked by myself.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/tests/lib/libc/sys/t_ptrace_wait.c
cvs rdiff -u -r1.17 -r1.18 src/tests/lib/libc/sys/t_ptrace_wait.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.140 src/tests/lib/libc/sys/t_ptrace_wait.c:1.141
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.140 Mon Oct 21 18:36:08 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Tue Nov 12 18:18:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.140 2019/10/21 18:36:08 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.141 2019/11/12 18:18:04 kamil Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.140 2019/10/21 18:36:08 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.141 2019/11/12 18:18:04 kamil Exp $");
#include
#include
@@ -5478,7 +5478,7 @@ trace_threads(bool trace_create, bool tr
lwpid_t lid;
/* Track created and exited threads */
- bool traced_lwps[__arraycount(t)];
+ struct lwp_event_count traced_lwps[__arraycount(t)] = {{0, 0}};
DPRINTF("Before forking process PID=%d\n", getpid());
SYSCALL_REQUIRE((child = fork()) != -1);
@@ -5541,8 +5541,6 @@ trace_threads(bool trace_create, bool tr
"without signal to be sent\n");
SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
- memset(traced_lwps, 0, sizeof(traced_lwps));
-
for (n = 0; n < (trace_create ? __arraycount(t) : 0); n++) {
DPRINTF("Before calling %s() for the child - expected stopped "
"SIGTRAP\n", TWAIT_FNAME);
@@ -5574,7 +5572,7 @@ trace_threads(bool trace_create, bool tr
lid = state.pe_lwp;
DPRINTF("Reported PTRACE_LWP_CREATE event with lid %d\n", lid);
- traced_lwps[lid - 1] = true;
+ *FIND_EVENT_COUNT(traced_lwps, lid) += 1;
DPRINTF("Before resuming the child process where it left off "
"and without signal to be sent\n");
@@ -5613,8 +5611,9 @@ trace_threads(bool trace_create, bool tr
DPRINTF("Reported PTRACE_LWP_EXIT event with lid %d\n", lid);
if (trace_create) {
- ATF_REQUIRE(traced_lwps[lid - 1] == true);
- traced_lwps[lid - 1] = false;
+ int *count = FIND_EVENT_COUNT(traced_lwps, lid);
+ ATF_REQUIRE_EQ(*count, 1);
+ *count = 0;
}
DPRINTF("Before resuming the child process where it left off "
@@ -7738,7 +7737,8 @@ ATF_TC_BODY(thread_concurrent_signals, t
const int sigval = SIGSTOP;
pid_t child, wpid;
int status;
- int signal_counts[THREAD_CONCURRENT_SIGNALS_NUM] = {0};
+ struct lwp_event_count signal_counts[THREAD_CONCURRENT_SIGNALS_NUM]
+ = {{0, 0}};
unsigned int i;
DPRINTF("Before forking process PID=%d\n", getpid());
@@ -7816,21 +7816,16 @@ ATF_TC_BODY(thread_concurrent_signals, t
"lwp=%d, expected %d, got %d", info.psi_lwpid,
expected_sig, WSTOPSIG(status));
- /* We assume that LWPs will be given successive numbers starting
- * from 2.
- */
- ATF_REQUIRE(info.psi_lwpid >= 2);
- ATF_REQUIRE((unsigned int)info.psi_lwpid <
- __arraycount(signal_counts)+2);
- signal_counts[info.psi_lwpid-2]++;
+ *FIND_EVENT_COUNT(signal_counts, info.psi_lwpid) += 1;
DPRINTF("Before resuming the child process\n");
SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
}
for (i = 0; i < __arraycount(signal_counts); i++)
- ATF_CHECK_EQ_MSG(signal_counts[i], 1, "signal_counts[%d]=%d",
- i, signal_counts[i]);
+ ATF_CHECK_EQ_MSG(signal_counts[i].lec_count, 1,
+ "signal_counts[%d].lec_count=%d; lec_lwp=%d",
+ i, signal_counts[i].lec_count, signal_counts[i].lec_lwp);
validate_status_exited(status, exitval);
}
Index: src/tests/lib/libc/sys/t_ptrace_wait.h
diff -u src/tests/lib/libc/sys/t_ptrace_wait.h:1.17 src/tests/lib/libc/sys/t_ptrace_wait.h:1.18
--- src/tests/lib/libc/sys/t_ptrace_wait.h:1.17 Sat May 25 03:22:53 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.h Tue Nov 12 18:18:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.h,v 1.17 2019/05/25 03:22:53 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.h,v 1.18 2019/11/12 18:18:04 kamil Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -674,6 +674,30 @@ trigger_bus(void)
*p = 'a';
}
+struct lwp_event_count {
+ lwpid_t lec_lwp;
+ int lec_count;
+};
+
+static int *
+find_event_count(struct lwp_event_count list[], lwpid_t lwp, size_t max_lwps)
+{
+ size_t i;
+
+ for (i = 0; i < max_lwps; i++) {
+
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Nov 12 18:04:37 UTC 2019 Modified Files: src/usr.sbin/sysinst: util.c Log Message: PR 54467: we trust our own sets, extract them with -P to allow symlink redirection (especially for updates and chroot services - back out once a better solution for those is implemented) To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/util.c diff -u src/usr.sbin/sysinst/util.c:1.35 src/usr.sbin/sysinst/util.c:1.36 --- src/usr.sbin/sysinst/util.c:1.35 Tue Nov 12 16:33:14 2019 +++ src/usr.sbin/sysinst/util.c Tue Nov 12 18:04:37 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.35 2019/11/12 16:33:14 martin Exp $ */ +/* $NetBSD: util.c,v 1.36 2019/11/12 18:04:37 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -975,7 +975,7 @@ extract_file(distinfo *dist, int update) /* now extract set files into "./". */ rval = run_program(RUN_DISPLAY | RUN_PROGRESS, - "progress -zf %s tar --chroot -xpf -", path); + "progress -zf %s tar --chroot -xpPf -", path); chdir(owd); free(owd);
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Nov 12 18:04:37 UTC 2019 Modified Files: src/usr.sbin/sysinst: util.c Log Message: PR 54467: we trust our own sets, extract them with -P to allow symlink redirection (especially for updates and chroot services - back out once a better solution for those is implemented) To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: maxv
Date: Tue Nov 12 18:00:13 UTC 2019
Modified Files:
src/sys/arch/x86/include: specialreg.h
src/sys/arch/x86/x86: spectre.c
Log Message:
Mitigation for CVE-2019-11135: TSX Asynchronous Abort (TAA).
Two sysctls are added:
machdep.taa.mitigated = {0/1} user-settable
machdep.taa.method = {string} constructed by the kernel
There are two cases:
(1) If the CPU is affected by MDS, then the MDS mitigation will also
mitigate TAA, and we have nothing else to do. We make the 'mitigated' leaf
read-only, and force:
machdep.taa.mitigated = machdep.mds.mitigated
machdep.taa.method = [MDS]
The kernel already enables the MDS mitigation by default.
(2) If the CPU is not affected by MDS but is affected by TAA, then we use
the new TSX_CTRL MSR to disable RTM. This MSR is provided via a microcode
update, now available on the Intel website. The kernel will automatically
enable the TAA mitigation if the updated microcode is present. If the new
microcode is not present, the user can load it via cpuctl, and set
machdep.taa.mitigated=1.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x86/x86/spectre.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.156 src/sys/arch/x86/include/specialreg.h:1.157
--- src/sys/arch/x86/include/specialreg.h:1.156 Wed Oct 30 05:35:36 2019
+++ src/sys/arch/x86/include/specialreg.h Tue Nov 12 18:00:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.156 2019/10/30 05:35:36 msaitoh Exp $ */
+/* $NetBSD: specialreg.h,v 1.157 2019/11/12 18:00:13 maxv Exp $ */
/*
* Copyright (c) 2014-2019 The NetBSD Foundation, Inc.
@@ -853,9 +853,14 @@
#define IA32_ARCH_SKIP_L1DFL_VMENTRY 0x08
#define IA32_ARCH_SSB_NO 0x10
#define IA32_ARCH_MDS_NO 0x20
+#define IA32_ARCH_TSX_CTRL 0x80
+#define IA32_ARCH_TAA_NO 0x100
#define MSR_IA32_FLUSH_CMD 0x10b
#define IA32_FLUSH_CMD_L1D_FLUSH 0x01
#define MSR_TSX_FORCE_ABORT 0x10f
+#define MSR_IA32_TSX_CTRL 0x122
+#define IA32_TSX_CTRL_RTM_DISABLE __BIT(0)
+#define IA32_TSX_CTRL_TSX_CPUID_CLEAR __BIT(1)
#define MSR_SYSENTER_CS 0x174 /* PII+ only */
#define MSR_SYSENTER_ESP 0x175 /* PII+ only */
#define MSR_SYSENTER_EIP 0x176 /* PII+ only */
Index: src/sys/arch/x86/x86/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.30 src/sys/arch/x86/x86/spectre.c:1.31
--- src/sys/arch/x86/x86/spectre.c:1.30 Fri Aug 30 13:29:17 2019
+++ src/sys/arch/x86/x86/spectre.c Tue Nov 12 18:00:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spectre.c,v 1.30 2019/08/30 13:29:17 msaitoh Exp $ */
+/* $NetBSD: spectre.c,v 1.31 2019/11/12 18:00:13 maxv Exp $ */
/*
* Copyright (c) 2018-2019 NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
*/
/*
- * Mitigations for the SpectreV2, SpectreV4 and MDS CPU flaws.
+ * Mitigations for the SpectreV2, SpectreV4, MDS and TAA CPU flaws.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.30 2019/08/30 13:29:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.31 2019/11/12 18:00:13 maxv Exp $");
#include "opt_spectre.h"
@@ -773,6 +773,185 @@ sysctl_machdep_mds_mitigated(SYSCTLFN_AR
/* -- */
+enum taa_mitigation {
+ TAA_MITIGATION_NONE,
+ TAA_MITIGATION_TAA_NO,
+ TAA_MITIGATION_MDS,
+ TAA_MITIGATION_RTM_DISABLE
+};
+
+static char taa_mitigation_name[64] = "(none)";
+
+static enum taa_mitigation taa_mitigation_method = TAA_MITIGATION_NONE;
+static bool taa_mitigation_enabled __read_mostly = false;
+static bool *taa_mitigation_enabled_ptr = _mitigation_enabled;
+
+static void
+mitigation_taa_apply_cpu(struct cpu_info *ci, bool enabled)
+{
+ uint64_t msr;
+
+ switch (taa_mitigation_method) {
+ case TAA_MITIGATION_NONE:
+ case TAA_MITIGATION_TAA_NO:
+ case TAA_MITIGATION_MDS:
+ panic("impossible");
+ case TAA_MITIGATION_RTM_DISABLE:
+ msr = rdmsr(MSR_IA32_TSX_CTRL);
+ if (enabled) {
+ msr |= IA32_TSX_CTRL_RTM_DISABLE;
+ } else {
+ msr &= ~IA32_TSX_CTRL_RTM_DISABLE;
+ }
+ wrmsr(MSR_IA32_TSX_CTRL, msr);
+ break;
+ }
+}
+
+static void
+mitigation_taa_change_cpu(void *arg1, void *arg2)
+{
+ struct cpu_info *ci = curcpu();
+ bool enabled = (bool)arg1;
+
+ mitigation_taa_apply_cpu(ci, enabled);
+}
+
+static void
+taa_detect_method(void)
+{
+ u_int descs[4];
+ uint64_t msr;
+
+ taa_mitigation_enabled_ptr = _mitigation_enabled;
+
+ if (cpu_vendor != CPUVENDOR_INTEL) {
+ taa_mitigation_method = TAA_MITIGATION_TAA_NO;
+ return;
+ }
+ if (!(cpu_feature[5] & CPUID_SEF_RTM)) {
+ taa_mitigation_method = TAA_MITIGATION_TAA_NO;
+ return;
+ }
+
+ /*
+ * If the CPU doesn't have MDS_NO set, then the TAA mitigation is based
+ * on the MDS mitigation.
+ */
+ if (cpuid_level < 7) {
+
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: maxv
Date: Tue Nov 12 18:00:13 UTC 2019
Modified Files:
src/sys/arch/x86/include: specialreg.h
src/sys/arch/x86/x86: spectre.c
Log Message:
Mitigation for CVE-2019-11135: TSX Asynchronous Abort (TAA).
Two sysctls are added:
machdep.taa.mitigated = {0/1} user-settable
machdep.taa.method = {string} constructed by the kernel
There are two cases:
(1) If the CPU is affected by MDS, then the MDS mitigation will also
mitigate TAA, and we have nothing else to do. We make the 'mitigated' leaf
read-only, and force:
machdep.taa.mitigated = machdep.mds.mitigated
machdep.taa.method = [MDS]
The kernel already enables the MDS mitigation by default.
(2) If the CPU is not affected by MDS but is affected by TAA, then we use
the new TSX_CTRL MSR to disable RTM. This MSR is provided via a microcode
update, now available on the Intel website. The kernel will automatically
enable the TAA mitigation if the updated microcode is present. If the new
microcode is not present, the user can load it via cpuctl, and set
machdep.taa.mitigated=1.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x86/x86/spectre.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Tue Nov 12 17:27:59 UTC 2019 Modified Files: src/sys/arch/macppc/conf: POWERMAC_G5_11_2 Log Message: add missing usb at ehci thanks Romain Dolbeau for noticing To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/macppc/conf/POWERMAC_G5_11_2 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/macppc/conf/POWERMAC_G5_11_2 diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.13 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.14 --- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.13 Wed Aug 1 20:04:12 2018 +++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2 Tue Nov 12 17:27:59 2019 @@ -143,6 +143,7 @@ ohci* at pci? dev ? function ? # USB Ope ehci* at pci? dev ? function ? # USB Enhanced Host Controller usb* at ohci? # USB bus support +usb* at ehci? # USB bus support uhub* at usb? # USB Hubs uhub* at uhub? port ? uhidev* at uhub? port ? configuration ? interface ? # USB HID device
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Tue Nov 12 17:27:59 UTC 2019 Modified Files: src/sys/arch/macppc/conf: POWERMAC_G5_11_2 Log Message: add missing usb at ehci thanks Romain Dolbeau for noticing To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/macppc/conf/POWERMAC_G5_11_2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Tue Nov 12 16:33:14 UTC 2019
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c defs.h disklabel.c disks.c gpt.c
install.c label.c main.c mbr.c mbr.h msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl part_edit.c partitions.c partitions.h util.c
src/usr.sbin/sysinst/arch/i386: md.c
Log Message:
Add options to the various partitioning stages that allow cloning of
alien partitions (optionally including data).
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/bsddisklabel.c
cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sysinst/disklabel.c
cvs rdiff -u -r1.54 -r1.55 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/gpt.c \
src/usr.sbin/sysinst/install.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/label.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/sysinst/main.c \
src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/mbr.c \
src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/mbr.h
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/part_edit.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/partitions.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/partitions.h
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/sysinst/util.c
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/arch/i386/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.29 src/usr.sbin/sysinst/bsddisklabel.c:1.30
--- src/usr.sbin/sysinst/bsddisklabel.c:1.29 Fri Oct 25 12:24:34 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Tue Nov 12 16:33:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.29 2019/10/25 12:24:34 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.30 2019/11/12 16:33:14 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -251,6 +251,11 @@ draw_size_menu_line(menudesc *m, int opt
mount = swap;
} else if (pset->infos[opt].mount[0]) {
mount = pset->infos[opt].mount;
+ } else if (pset->infos[opt].flags & PUIFLG_CLONE_PARTS) {
+ snprintf(swap, sizeof swap, "%zu %s",
+ pset->infos[opt].clone_src->num_sel,
+ msg_string(MSG_clone_target_disp));
+ mount = swap;
} else {
mount = NULL;
if (pset->infos[opt].parts->pscheme->other_partition_identifier
@@ -319,7 +324,7 @@ add_other_ptn_size(menudesc *menu, void
break;
}
- m = realloc(pset->menu_opts, (pset->num+4)*sizeof(*pset->menu_opts));
+ m = realloc(pset->menu_opts, (pset->num+5)*sizeof(*pset->menu_opts));
if (m == NULL)
return 0;
p = realloc(pset->infos, (pset->num+1)*sizeof(*pset->infos));
@@ -348,6 +353,84 @@ add_other_ptn_size(menudesc *menu, void
return -1;
}
+static int
+inst_ext_clone(menudesc *menu, void *arg)
+{
+ struct selected_partitions selected;
+ struct clone_target_menu_data data;
+ struct partition_usage_set *pset = arg;
+ struct part_usage_info *p;
+ menu_ent *men;
+ int num_men, i;
+
+ if (!select_partitions(, pm->parts))
+ return 0;
+
+ num_men = pset->num+1;
+ men = calloc(num_men, sizeof *men);
+ if (men == NULL)
+ return 0;
+ for (i = 0; i < num_men; i++)
+ men[i].opt_action = clone_target_select;
+ men[num_men-1].opt_name = MSG_clone_target_end;
+
+ memset(, 0, sizeof data);
+ data.usage = *pset;
+ data.res = -1;
+
+ data.usage.menu = new_menu(MSG_clone_target_hdr,
+ men, num_men, 3, 2, 0, 65, MC_SCROLL,
+ NULL, draw_size_menu_line, NULL, NULL, MSG_cancel);
+ process_menu(data.usage.menu, );
+ free_menu(data.usage.menu);
+ free(men);
+
+ if (data.res < 0)
+ goto err;
+
+ /* insert clone record */
+ men = realloc(pset->menu_opts, (pset->num+5)*sizeof(*pset->menu_opts));
+ if (men == NULL)
+ goto err;
+ pset->menu_opts = men;
+ menu->opts = men;
+ menu->numopts = pset->num+4;
+
+ p = realloc(pset->infos, (pset->num+1)*sizeof(*pset->infos));
+ if (p == NULL)
+ goto err;
+ pset->infos = p;
+
+ men += data.res;
+ p += data.res;
+ memmove(men+1, men, sizeof(*men)*((pset->num+4)-data.res));
+ memmove(p+1, p, sizeof(*p)*((pset->num)-data.res));
+ memset(men, 0, sizeof(*men));
+ memset(p, 0, sizeof(*p));
+ p->flags = PUIFLG_CLONE_PARTS;
+ p->cur_part_id = NO_PART;
+ p->clone_src = malloc(sizeof(selected));
+ if (p->clone_src != NULL) {
+ *p->clone_src = selected;
+ p->clone_ndx = ~0U;
+ p->size = selected_parts_size();
+ p->parts = pset->parts;
+ } else {
+ p->clone_ndx = 0;
+ free_selected_partitions();
+ }
+
+ menu->cursel = data.res == 0 ? 1 : 0;
+ pset->num++;
+ fill_ptn_menu(pset);
+
+ return -1;
+
+err:
+ free_selected_partitions();
+ return 0;
+}
+
static size_t
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Nov 12 16:33:14 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c defs.h disklabel.c disks.c gpt.c install.c label.c main.c mbr.c mbr.h msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl part_edit.c partitions.c partitions.h util.c src/usr.sbin/sysinst/arch/i386: md.c Log Message: Add options to the various partitioning stages that allow cloning of alien partitions (optionally including data). To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/bsddisklabel.c cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sysinst/disklabel.c cvs rdiff -u -r1.54 -r1.55 src/usr.sbin/sysinst/disks.c cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/gpt.c \ src/usr.sbin/sysinst/install.c cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/label.c cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/sysinst/main.c \ src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/mbr.c \ src/usr.sbin/sysinst/msg.mi.fr cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/mbr.h cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/sysinst/msg.mi.en cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/sysinst/msg.mi.pl cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/part_edit.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/partitions.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/partitions.h cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/sysinst/util.c cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/arch/i386/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src [llvm]
Le 12/11/2019 à 16:06, Maxime Villard a écrit : Le 12/11/2019 à 14:37, Joerg Sonnenberger a écrit : On Tue, Nov 12, 2019 at 11:39:09AM +0100, Maxime Villard wrote: Le 11/11/2019 à 23:45, Joerg Sonnenberger a écrit : Module Name: src Committed By: joerg Date: Mon Nov 11 22:45:32 UTC 2019 [...] Log Message: Update LLVM to 10.0.0git (01f3a59fb3e2542fce74c768718f594d0debd0da) Since this change, I cannot cross-compile GENERIC amd64 from Linux: What non-standard settings are you using? amd64 is certainly on my list of architectures to test. No particular settings. Just the latest src/ compiled unchanged with ./build.sh -j4 -U -O ../obj -V MKLLVM=yes -V MKGCC=no -V HAVE_LLVM=yes -m amd64 kernel=GENERIC I'm also having the same issue on a NetBSD-amd64 host, with again an unchanged src/ and the same command
Re: CVS commit: src [llvm]
Le 12/11/2019 à 14:37, Joerg Sonnenberger a écrit : On Tue, Nov 12, 2019 at 11:39:09AM +0100, Maxime Villard wrote: Le 11/11/2019 à 23:45, Joerg Sonnenberger a écrit : Module Name:src Committed By: joerg Date: Mon Nov 11 22:45:32 UTC 2019 [...] Log Message: Update LLVM to 10.0.0git (01f3a59fb3e2542fce74c768718f594d0debd0da) Since this change, I cannot cross-compile GENERIC amd64 from Linux: What non-standard settings are you using? amd64 is certainly on my list of architectures to test. No particular settings. Just the latest src/ compiled unchanged with ./build.sh -j4 -U -O ../obj -V MKLLVM=yes -V MKGCC=no -V HAVE_LLVM=yes -m amd64 kernel=GENERIC
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Tue Nov 12 14:07:09 UTC 2019 Modified Files: src/sys/dev/mii: ipgphyreg.h Log Message: - Define IPGPHY_SCR's address. - Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/ipgphyreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Tue Nov 12 14:07:09 UTC 2019 Modified Files: src/sys/dev/mii: ipgphyreg.h Log Message: - Define IPGPHY_SCR's address. - Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/ipgphyreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/ipgphyreg.h diff -u src/sys/dev/mii/ipgphyreg.h:1.1 src/sys/dev/mii/ipgphyreg.h:1.2 --- src/sys/dev/mii/ipgphyreg.h:1.1 Mon Oct 7 11:53:40 2019 +++ src/sys/dev/mii/ipgphyreg.h Tue Nov 12 14:07:09 2019 @@ -36,48 +36,48 @@ */ /* PHY specific control & status register. IP1001 only. */ -#define IPGPHY_SCSR 0x10 -#define IPGPHY_SCSR_RXPHASE_SEL 0x0001 -#define IPGPHY_SCSR_TXPHASE_SEL 0x0002 +#define IPGPHY_SCSR 0x10 +#define IPGPHY_SCSR_RXPHASE_SEL 0x0001 +#define IPGPHY_SCSR_TXPHASE_SEL 0x0002 #define IPGPHY_SCSR_REPEATOR_MODE 0x0004 #define IPGPHY_SCSR_RESERVED1_DEF 0x0008 #define IPGPHY_SCSR_RXCLK_DRV_MASK 0x0060 #define IPGPHY_SCSR_RXCLK_DRV_DEF 0x0040 #define IPGPHY_SCSR_RXD_DRV_MASK 0x0180 -#define IPGPHY_SCSR_RXD_DRV_DEF 0x0100 -#define IPGPHY_SCSR_JABBER_ENB 0x0200 +#define IPGPHY_SCSR_RXD_DRV_DEF 0x0100 +#define IPGPHY_SCSR_JABBER_ENB 0x0200 #define IPGPHY_SCSR_HEART_BEAT_ENB 0x0400 #define IPGPHY_SCSR_DOWNSHIFT_ENB 0x0800 #define IPGPHY_SCSR_RESERVED2_DEF 0x1000 -#define IPGPHY_SCSR_LED_DRV_4MA 0x -#define IPGPHY_SCSR_LED_DRV_8MA 0x2000 +#define IPGPHY_SCSR_LED_DRV_4MA 0x +#define IPGPHY_SCSR_LED_DRV_8MA 0x2000 #define IPGPHY_SCSR_LED_MODE_MASK 0xC000 #define IPGPHY_SCSR_LED_MODE_DEF 0x /* PHY link status register. IP1001 only. */ -#define IPGPHY_LSR 0x11 -#define IPGPHY_LSR_JABBER_DET 0x0200 +#define IPGPHY_LSR 0x11 +#define IPGPHY_LSR_JABBER_DET 0x0200 #define IPGPHY_LSR_APS_SLEEP 0x0400 -#define IPGPHY_LSR_MDIX 0x0800 -#define IPGPHY_LSR_FULL_DUPLEX 0x1000 +#define IPGPHY_LSR_MDIX 0x0800 +#define IPGPHY_LSR_FULL_DUPLEX 0x1000 #define IPGPHY_LSR_SPEED_10 0x #define IPGPHY_LSR_SPEED_100 0x2000 -#define IPGPHY_LSR_SPEED_1000 0x4000 -#define IPGPHY_LSR_SPEED_MASK 0x6000 +#define IPGPHY_LSR_SPEED_1000 0x4000 +#define IPGPHY_LSR_SPEED_MASK 0x6000 #define IPGPHY_LSR_LINKUP 0x8000 /* PHY specific control register 2. IP1001 only. */ -#define IPGPHY_SCR +#define IPGPHY_SCR 0x14 #define IPGPHY_SCR_SEW_RATE_MASK 0x0003 -#define IPGPHY_SCR_SEW_RATE_DEF 0x0003 -#define IPGPHY_SCR_AUTO_XOVER 0x0004 +#define IPGPHY_SCR_SEW_RATE_DEF 0x0003 +#define IPGPHY_SCR_AUTO_XOVER 0x0004 #define IPGPHY_SCR_SPEED_10_100_ENB 0x0040 #define IPGPHY_SCR_FIFO_LATENCY_2 0x #define IPGPHY_SCR_FIFO_LATENCY_3 0x0080 #define IPGPHY_SCR_FIFO_LATENCY_4 0x0100 #define IPGPHY_SCR_FIFO_LATENCY_5 0x0180 #define IPGPHY_SCR_MDIX_ENB 0x0200 -#define IPGPHY_SCR_RESERVED_DEF 0x0400 +#define IPGPHY_SCR_RESERVED_DEF 0x0400 #define IPGPHY_SCR_APS_ON 0x0800 #endif /* _DEV_MII_IPGPHYREG_H_ */
Re: CVS commit: src [llvm]
On Tue, Nov 12, 2019 at 11:39:09AM +0100, Maxime Villard wrote: > Le 11/11/2019 à 23:45, Joerg Sonnenberger a écrit : > > Module Name:src > > Committed By: joerg > > Date: Mon Nov 11 22:45:32 UTC 2019 > > > > [...] > > Log Message: > > Update LLVM to 10.0.0git (01f3a59fb3e2542fce74c768718f594d0debd0da) > > Since this change, I cannot cross-compile GENERIC amd64 from Linux: What non-standard settings are you using? amd64 is certainly on my list of architectures to test. > Preprocessed source(s) and associated run script(s) are located at: > x86_64--netbsd-clang: note: diagnostic msg: /tmp/assym-5fcf44.c > x86_64--netbsd-clang: note: diagnostic msg: /tmp/assym-5fcf44.sh Both files would otherwise be a starting point... Joerg
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Tue Nov 12 13:17:44 UTC 2019 Modified Files: src/sys/arch/amiga/dev: if_qn.c zssc.c src/sys/arch/mac68k/obio: iwm_fd.c src/sys/arch/mvme68k/dev: wdsc.c src/sys/arch/next68k/dev: nextdisplay.c src/sys/dev/gpib: ct.c mt.c ppi.c src/sys/dev/isa: if_iy.c mcd.c tcic2_isa.c src/sys/dev/pci: neo.c src/sys/dev/pcmcia: if_tr_pcmcia.c src/sys/dev/sbus: sio16.c Log Message: Add missing initialization of sc_dev. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amiga/dev/if_qn.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amiga/dev/zssc.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/mac68k/obio/iwm_fd.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvme68k/dev/wdsc.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/next68k/dev/nextdisplay.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/gpib/ct.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/gpib/mt.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/gpib/ppi.c cvs rdiff -u -r1.110 -r1.111 src/sys/dev/isa/if_iy.c cvs rdiff -u -r1.118 -r1.119 src/sys/dev/isa/mcd.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/isa/tcic2_isa.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/neo.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pcmcia/if_tr_pcmcia.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/sbus/sio16.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: msaitoh
Date: Tue Nov 12 13:17:44 UTC 2019
Modified Files:
src/sys/arch/amiga/dev: if_qn.c zssc.c
src/sys/arch/mac68k/obio: iwm_fd.c
src/sys/arch/mvme68k/dev: wdsc.c
src/sys/arch/next68k/dev: nextdisplay.c
src/sys/dev/gpib: ct.c mt.c ppi.c
src/sys/dev/isa: if_iy.c mcd.c tcic2_isa.c
src/sys/dev/pci: neo.c
src/sys/dev/pcmcia: if_tr_pcmcia.c
src/sys/dev/sbus: sio16.c
Log Message:
Add missing initialization of sc_dev.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amiga/dev/if_qn.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amiga/dev/zssc.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/mac68k/obio/iwm_fd.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvme68k/dev/wdsc.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/next68k/dev/nextdisplay.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/gpib/ct.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/gpib/mt.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/gpib/ppi.c
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/isa/if_iy.c
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/isa/mcd.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/isa/tcic2_isa.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/neo.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pcmcia/if_tr_pcmcia.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/sbus/sio16.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/amiga/dev/if_qn.c
diff -u src/sys/arch/amiga/dev/if_qn.c:1.47 src/sys/arch/amiga/dev/if_qn.c:1.48
--- src/sys/arch/amiga/dev/if_qn.c:1.47 Tue Feb 5 06:17:00 2019
+++ src/sys/arch/amiga/dev/if_qn.c Tue Nov 12 13:17:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qn.c,v 1.47 2019/02/05 06:17:00 msaitoh Exp $ */
+/* $NetBSD: if_qn.c,v 1.48 2019/11/12 13:17:43 msaitoh Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.47 2019/02/05 06:17:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.48 2019/11/12 13:17:43 msaitoh Exp $");
#include "qn.h"
#if NQN > 0
@@ -195,6 +195,7 @@ qnattach(device_t parent, device_t self,
struct ifnet *ifp = >sc_ethercom.ec_if;
u_int8_t myaddr[ETHER_ADDR_LEN];
+ sc->sc_dev = self;
zap = (struct zbus_args *)aux;
sc->sc_base = zap->va;
Index: src/sys/arch/amiga/dev/zssc.c
diff -u src/sys/arch/amiga/dev/zssc.c:1.45 src/sys/arch/amiga/dev/zssc.c:1.46
--- src/sys/arch/amiga/dev/zssc.c:1.45 Sat Oct 27 17:17:32 2012
+++ src/sys/arch/amiga/dev/zssc.c Tue Nov 12 13:17:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: zssc.c,v 1.45 2012/10/27 17:17:32 chs Exp $ */
+/* $NetBSD: zssc.c,v 1.46 2019/11/12 13:17:43 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.45 2012/10/27 17:17:32 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.46 2019/11/12 13:17:43 msaitoh Exp $");
#include
#include
@@ -103,15 +103,15 @@ zsscmatch(device_t parent, cfdata_t cf,
void
zsscattach(device_t parent, device_t self, void *aux)
{
- struct siop_softc *sc;
+ struct siop_softc *sc = device_private(self);
struct zbus_args *zap;
siop_regmap_p rp;
printf("\n");
+ sc->sc_dev = self;
zap = aux;
- sc = device_private(self);
sc->sc_siopp = rp = (siop_regmap_p)((char *)zap->va + 0x4000);
/*
Index: src/sys/arch/mac68k/obio/iwm_fd.c
diff -u src/sys/arch/mac68k/obio/iwm_fd.c:1.56 src/sys/arch/mac68k/obio/iwm_fd.c:1.57
--- src/sys/arch/mac68k/obio/iwm_fd.c:1.56 Sun Apr 26 15:15:19 2015
+++ src/sys/arch/mac68k/obio/iwm_fd.c Tue Nov 12 13:17:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iwm_fd.c,v 1.56 2015/04/26 15:15:19 mlelstv Exp $ */
+/* $NetBSD: iwm_fd.c,v 1.57 2019/11/12 13:17:43 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.56 2015/04/26 15:15:19 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.57 2019/11/12 13:17:43 msaitoh Exp $");
#include "locators.h"
@@ -441,6 +441,7 @@ fd_attach(device_t parent, device_t self
iwm = device_private(parent);
fd = device_private(self);
+ fd->sc_dev = self;
ia = aux;
driveInfo = iwmCheckDrive(ia->unit);
Index: src/sys/arch/mvme68k/dev/wdsc.c
diff -u src/sys/arch/mvme68k/dev/wdsc.c:1.32 src/sys/arch/mvme68k/dev/wdsc.c:1.33
--- src/sys/arch/mvme68k/dev/wdsc.c:1.32 Sat Oct 27 17:18:04 2012
+++ src/sys/arch/mvme68k/dev/wdsc.c Tue Nov 12 13:17:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wdsc.c,v 1.32 2012/10/27 17:18:04 chs Exp $ */
+/* $NetBSD: wdsc.c,v 1.33 2019/11/12 13:17:43 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.32 2012/10/27 17:18:04 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.33 2019/11/12 13:17:43 msaitoh Exp
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: msaitoh
Date: Tue Nov 12 13:10:51 UTC 2019
Modified Files:
src/sys/dev/isa: uha_isa.c
Log Message:
Initialize sc_dev correctly to avoid null pointer dereference when
bus_space_map() failed.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/isa/uha_isa.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/isa/uha_isa.c
diff -u src/sys/dev/isa/uha_isa.c:1.41 src/sys/dev/isa/uha_isa.c:1.42
--- src/sys/dev/isa/uha_isa.c:1.41 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/isa/uha_isa.c Tue Nov 12 13:10:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_isa.c,v 1.41 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: uha_isa.c,v 1.42 2019/11/12 13:10:51 msaitoh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.41 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.42 2019/11/12 13:10:51 msaitoh Exp $");
#include "opt_ddb.h"
@@ -143,6 +143,7 @@ uha_isa_attach(device_t parent, device_t
isa_chipset_tag_t ic = ia->ia_ic;
int error;
+ sc->sc_dev = self;
printf("\n");
if (bus_space_map(iot, ia->ia_io[0].ir_addr, UHA_ISA_IOSIZE, 0, )) {
@@ -150,7 +151,6 @@ uha_isa_attach(device_t parent, device_t
return;
}
- sc->sc_dev = self;
sc->sc_iot = iot;
sc->sc_ioh = ioh;
sc->sc_dmat = dmat;
CVS commit: src/sys/dev/isa
Module Name:src Committed By: msaitoh Date: Tue Nov 12 13:10:51 UTC 2019 Modified Files: src/sys/dev/isa: uha_isa.c Log Message: Initialize sc_dev correctly to avoid null pointer dereference when bus_space_map() failed. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/dev/isa/uha_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/audio/play
Module Name:src Committed By: wiz Date: Tue Nov 12 12:50:30 UTC 2019 Modified Files: src/usr.bin/audio/play: audioplay.1 Log Message: Remove list of audio drivers, moved to audio(4). To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/audio/play/audioplay.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/audio/play/audioplay.1 diff -u src/usr.bin/audio/play/audioplay.1:1.28 src/usr.bin/audio/play/audioplay.1:1.29 --- src/usr.bin/audio/play/audioplay.1:1.28 Mon Nov 11 11:04:15 2019 +++ src/usr.bin/audio/play/audioplay.1 Tue Nov 12 12:50:30 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: audioplay.1,v 1.28 2019/11/11 11:04:15 wiz Exp $ +.\" $NetBSD: audioplay.1,v 1.29 2019/11/12 12:50:30 wiz Exp $ .\" .\" Copyright (c) 1998, 1999, 2002, 2010, 2019 Matthew R. Green .\" All rights reserved. @@ -191,55 +191,7 @@ hardware driver. .Sh SEE ALSO .Xr audioctl 1 , .Xr audiorecord 1 , -.Xr arcofi 4 , -.Xr aria 4 , -.Xr audio 4 , -.Xr auich 4 , -.Xr auixp 4 , -.\" .Xr ausoc 4 , -.Xr autri 4 , -.Xr auvia 4 , -.Xr bba 4 , -.Xr btsco 4 , -.Xr clcs 4 , -.Xr clct 4 , -.Xr cmpci 4 , -.Xr dreamcast/aica 4 , -.Xr eap 4 , -.Xr emuxki 4 , -.Xr esm 4 , -.Xr eso 4 , -.Xr ess 4 , -.Xr fms 4 , -.Xr gcscaudio 4 , -.Xr gus 4 , -.Xr guspnp 4 , -.Xr hdafg 4 , -.Xr hppa/harmony 4 , -.Xr macppc/awacs 4 , -.Xr macppc/snapper 4 , -.Xr neo 4 , -.Xr pad 4 , -.Xr pas 4 , -.\" .Xr paud 4 , -.\" .Xr repluse 4 , -.Xr sb 4 , -.Xr sgimips/haltwo 4 , -.Xr sgimips/mavb 4 , -.Xr sparc/audioamd 4 , -.Xr sparc/dbri 4 , -.Xr sv 4 , -.\" .Xr toccata 4 , -.Xr uaudio 4 , -.\" .Xr vaudio 4 , -.\" .Xr vcaudio 4 , -.\" .Xr vraiu 4 , -.\" .Xr vsaudio 4 , -.Xr wss 4 , -.Xr x68k/vs 4 , -.Xr yds 4 , -.Xr ym 4 -.\" .Xr zaudio 4 +.Xr audio 4 .Sh HISTORY The .Nm
CVS commit: src/usr.bin/audio/play
Module Name:src Committed By: wiz Date: Tue Nov 12 12:50:30 UTC 2019 Modified Files: src/usr.bin/audio/play: audioplay.1 Log Message: Remove list of audio drivers, moved to audio(4). To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/audio/play/audioplay.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Nov 12 12:50:04 UTC 2019 Modified Files: src/share/man/man4: audio.4 Log Message: Remove self-reference To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/share/man/man4/audio.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/audio.4 diff -u src/share/man/man4/audio.4:1.91 src/share/man/man4/audio.4:1.92 --- src/share/man/man4/audio.4:1.91 Tue Nov 12 12:49:06 2019 +++ src/share/man/man4/audio.4 Tue Nov 12 12:50:04 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.4,v 1.91 2019/11/12 12:49:06 wiz Exp $ +.\" $NetBSD: audio.4,v 1.92 2019/11/12 12:50:04 wiz Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -760,7 +760,6 @@ string values. .Xr arcofi 4 , .Xr aria 4 , .Xr auacer 4 , -.Xr audio 4 , .Xr auich 4 , .Xr auixp 4 , .\" .Xr ausoc 4 ,
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Nov 12 12:50:04 UTC 2019 Modified Files: src/share/man/man4: audio.4 Log Message: Remove self-reference To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/share/man/man4/audio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Nov 12 12:49:07 UTC 2019 Modified Files: src/share/man/man4: audio.4 Log Message: Update list of audio drivers in SEE ALSO. Based on audioplay(1) man page, where I'll remove them shortly. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/share/man/man4/audio.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/audio.4 diff -u src/share/man/man4/audio.4:1.90 src/share/man/man4/audio.4:1.91 --- src/share/man/man4/audio.4:1.90 Thu May 9 09:35:29 2019 +++ src/share/man/man4/audio.4 Tue Nov 12 12:49:06 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.4,v 1.90 2019/05/09 09:35:29 wiz Exp $ +.\" $NetBSD: audio.4,v 1.91 2019/11/12 12:49:06 wiz Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 8, 2019 +.Dd November 12, 2019 .Dt AUDIO 4 .Os .Sh NAME @@ -752,43 +752,65 @@ string values. .Sh SEE ALSO .Xr audiocfg 1 , .Xr audioctl 1 , +.Xr audioplay 1 , +.Xr audiorecord 1 , .Xr mixerctl 1 , .Xr ioctl 2 , .Xr ossaudio 3 , -.Xr midi 4 , -.Xr radio 4 , -.Ss ISA bus +.Xr arcofi 4 , .Xr aria 4 , -.Xr ess 4 , -.Xr gus 4 , -.Xr guspnp 4 , -.Xr pas 4 , -.Xr sb 4 , -.Xr wss 4 , -.Xr ym 4 -.Ss PCI bus .Xr auacer 4 , +.Xr audio 4 , .Xr auich 4 , .Xr auixp 4 , +.\" .Xr ausoc 4 , .Xr autri 4 , .Xr auvia 4 , .Xr azalia 4 , +.Xr bba 4 , +.Xr btsco 4 , .Xr clcs 4 , .Xr clct 4 , .Xr cmpci 4 , +.Xr dreamcast/aica 4 , .Xr eap 4 , .Xr emuxki 4 , .Xr esa 4 , .Xr esm 4 , .Xr eso 4 , +.Xr ess 4 , .Xr fms 4 , +.Xr gcscaudio 4 , +.Xr gus 4 , +.Xr guspnp 4 , +.Xr hdafg 4 , +.Xr hppa/harmony 4 , +.Xr macppc/awacs 4 , +.Xr macppc/snapper 4 , +.Xr midi 4 , .Xr neo 4 , +.Xr pad 4 , +.Xr pas 4 , +.\" .Xr paud 4 , +.Xr radio 4 , +.\" .Xr repluse 4 , +.Xr sb 4 , +.Xr sgimips/haltwo 4 , +.Xr sgimips/mavb 4 , +.Xr sparc/audioamd 4 , +.Xr sparc/dbri 4 , .Xr sv 4 , -.Xr yds 4 -.Ss TURBOchannel -.Xr bba 4 -.Ss USB -.Xr uaudio 4 +.\" .Xr toccata 4 , +.Xr uaudio 4 , +.\" .Xr vaudio 4 , +.\" .Xr vcaudio 4 , +.\" .Xr vraiu 4 , +.\" .Xr vsaudio 4 , +.Xr wss 4 , +.Xr x68k/vs 4 , +.Xr yds 4 , +.Xr ym 4 +.\" .Xr zaudio 4 .Sh HISTORY Support for virtual channels and mixing first appeared in .Nx 8.0 .
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Nov 12 12:49:07 UTC 2019 Modified Files: src/share/man/man4: audio.4 Log Message: Update list of audio drivers in SEE ALSO. Based on audioplay(1) man page, where I'll remove them shortly. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/share/man/man4/audio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src [llvm]
Le 11/11/2019 à 23:45, Joerg Sonnenberger a écrit :
Module Name:src
Committed By: joerg
Date: Mon Nov 11 22:45:32 UTC 2019
[...]
Log Message:
Update LLVM to 10.0.0git (01f3a59fb3e2542fce74c768718f594d0debd0da)
Since this change, I cannot cross-compile GENERIC amd64 from Linux:
1. /netbsd-llvm/src/sys/sys/time.h:112:14: current parser token ';'
2. /netbsd-llvm/src/sys/sys/time.h:109:1: parsing function body
'bintime_addx'
3. /netbsd-llvm/src/sys/sys/time.h:109:1: in compound statement ('{}')
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x3cdd568]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x3cdb774]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x3cdb8d5]
/lib64/libpthread.so.0(+0x12e70)[0x7fe616827e70]
/lib64/libc.so.6(gsignal+0x10f)[0x7fe61634e57f]
/lib64/libc.so.6(abort+0x127)[0x7fe616338895]
/lib64/libc.so.6(+0x22769)[0x7fe616338769]
/lib64/libc.so.6(+0x30a26)[0x7fe616346a26]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x1b8f672]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x1b8e6c7]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x1b8e89d]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x1b8e95a]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x1b8eba2]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x15f496d]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x15f549f]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x15a8848]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x15ab06f]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x15aec92]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x15af1a6]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11e6741]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11e1a80]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11e3d91]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11e3fd4]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11e5c49]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x1221858]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x1fe]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x1222ae9]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x1227012]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x122941b]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11a74e3]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11c6487]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11a2a81]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11a3081]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11a7e48]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11a8ac8]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x11a058a]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0xcb3178]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x4e9c99]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x4ab006]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x48a72f]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x47d21a]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x4120c4]
/lib64/libc.so.6(__libc_start_main+0xf3)[0x7fe61633a413]
/netbsd-llvm/obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin/x86_64--netbsd-clang[0x47a10e]
x86_64--netbsd-clang: error: unable to execute command: Aborted (core dumped)
x86_64--netbsd-clang: error: clang frontend command failed due to signal (use
-v to see invocation)
clang version 9.0.0 (01f3a59fb3e2542fce74c768718f594d0debd0da)
Target: x86_64-unknown-netbsd
Thread model: posix
InstalledDir:
/netbsd-llvm/src/../obj/tooldir.Linux-5.3.6-100.fc29.x86_64-x86_64/bin
x86_64--netbsd-clang: note: diagnostic msg: PLEASE submit a bug report to
http://llvm.org/bugs/ and include the crash backtrace, preprocessed source, and
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: uki Date: Tue Nov 12 10:14:11 UTC 2019 Modified Files: src/distrib/sets/lists/xcomp: mi Log Message: Give syspkg names to lintlib packages To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/distrib/sets/lists/xcomp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.213 src/distrib/sets/lists/xcomp/mi:1.214 --- src/distrib/sets/lists/xcomp/mi:1.213 Tue Oct 22 03:01:53 2019 +++ src/distrib/sets/lists/xcomp/mi Tue Nov 12 10:14:11 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.213 2019/10/22 03:01:53 uki Exp $ +# $NetBSD: mi,v 1.214 2019/11/12 10:14:11 uki Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4324,91 +4324,91 @@ ./usr/X11R7/share/xcb/xtest.xmlxcomp-xcb-proto-share xorg ./usr/X11R7/share/xcb/xv.xmlxcomp-xcb-proto-share xorg ./usr/X11R7/share/xcb/xvmc.xmlxcomp-xcb-proto-share xorg -./usr/libdata/lint/llib-lFS.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lGLU.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lGLw.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lICE.ln-unknown- lint,xorg +./usr/libdata/lint/llib-lFS.lnxcomp-libFS-lintlib lint,xorg +./usr/libdata/lint/llib-lGLU.lnxcomp-libGLU-lintlib lint,xorg +./usr/libdata/lint/llib-lGLw.lnxcomp-libGLw-lintlib lint,xorg +./usr/libdata/lint/llib-lICE.lnxcomp-libICE-lintlib lint,xorg ./usr/libdata/lint/llib-lOSMesa.ln xcomp-obsolete obsolete -./usr/libdata/lint/llib-lSM.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lX11.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lXRes.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXTrap.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXau.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lXaw7.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lSM.lnxcomp-libSM-lintlib lint,xorg +./usr/libdata/lint/llib-lX11.lnxcomp-libX11-lintlib lint,xorg +./usr/libdata/lint/llib-lXRes.ln xcomp-libXRes-lintlib lint,xorg +./usr/libdata/lint/llib-lXTrap.ln xcomp-libXTrap-lintlib lint,xorg +./usr/libdata/lint/llib-lXau.lnxcomp-libXau-lintlib lint,xorg +./usr/libdata/lint/llib-lXaw7.ln xcomp-libXaw-lintlib lint,xorg ./usr/libdata/lint/llib-lXaw8.ln xcomp-obsolete obsolete -./usr/libdata/lint/llib-lXcomposite.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXcursor.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXdamage.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXdmGreet.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXdmcp.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXevie.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXext.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXfixes.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXfont.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXfont2.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lXcomposite.ln xcomp-libXcomposite-lintlib lint,xorg +./usr/libdata/lint/llib-lXcursor.ln xcomp-libXcursor-lintlib lint,xorg +./usr/libdata/lint/llib-lXdamage.ln xcomp-libXdamage-lintlib lint,xorg +./usr/libdata/lint/llib-lXdmGreet.ln xcomp-libXdmGreet-lintlib lint,xorg +./usr/libdata/lint/llib-lXdmcp.ln xcomp-Xdmcp-lintlib lint,xorg +./usr/libdata/lint/llib-lXevie.ln xcomp-libXevie-lintlib lint,xorg +./usr/libdata/lint/llib-lXext.ln xcomp-libXext-lintlib lint,xorg +./usr/libdata/lint/llib-lXfixes.ln xcomp-libXfixes-lintlib lint,xorg +./usr/libdata/lint/llib-lXfont.ln xcomp-libXfont-lintlib lint,xorg +./usr/libdata/lint/llib-lXfont2.ln xcomp-libXfont2-lintlib lint,xorg ./usr/libdata/lint/llib-lXfontcache.ln xcomp-obsolete obsolete -./usr/libdata/lint/llib-lXft.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lXi.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lXinerama.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXmu.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lXmuu.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lXft.lnxcomp-libXft-lintlib lint,xorg +./usr/libdata/lint/llib-lXi.lnxcomp-libXi-lintlib lint,xorg +./usr/libdata/lint/llib-lXinerama.ln xcomp-libXinerama-lintlib lint,xorg +./usr/libdata/lint/llib-lXmu.lnxcomp-libXmu-lintlib lint,xorg +./usr/libdata/lint/llib-lXmuu.ln xcomp-libXmuu-lintlib lint,xorg ./usr/libdata/lint/llib-lXp.lnxcomp-obsolete obsolete,xorg -./usr/libdata/lint/llib-lXpm.ln-unknown- lint,xorg -./usr/libdata/lint/llib-lXpresent.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lXpm.lnxcomp-libXpm-lintlib lint,xorg +./usr/libdata/lint/llib-lXpresent.ln xcomp-libXpresent-lintlib lint,xorg ./usr/libdata/lint/llib-lXprintAppUtil.ln xcomp-obsolete obsolete ./usr/libdata/lint/llib-lXprintUtil.ln xcomp-obsolete obsolete -./usr/libdata/lint/llib-lXrandr.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lXrender.ln
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: uki Date: Tue Nov 12 10:14:11 UTC 2019 Modified Files: src/distrib/sets/lists/xcomp: mi Log Message: Give syspkg names to lintlib packages To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/distrib/sets/lists/xcomp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/imx/fdt
Module Name:src Committed By: hkenken Date: Tue Nov 12 08:40:57 UTC 2019 Modified Files: src/sys/arch/arm/imx/fdt: if_enet_imx.c Log Message: Fixed bug. * typo To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/fdt/if_enet_imx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/imx/fdt
Module Name:src
Committed By: hkenken
Date: Tue Nov 12 08:40:57 UTC 2019
Modified Files:
src/sys/arch/arm/imx/fdt: if_enet_imx.c
Log Message:
Fixed bug.
* typo
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/fdt/if_enet_imx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/imx/fdt/if_enet_imx.c
diff -u src/sys/arch/arm/imx/fdt/if_enet_imx.c:1.5 src/sys/arch/arm/imx/fdt/if_enet_imx.c:1.6
--- src/sys/arch/arm/imx/fdt/if_enet_imx.c:1.5 Tue Nov 12 05:09:29 2019
+++ src/sys/arch/arm/imx/fdt/if_enet_imx.c Tue Nov 12 08:40:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_enet_imx.c,v 1.5 2019/11/12 05:09:29 hkenken Exp $ */
+/* $NetBSD: if_enet_imx.c,v 1.6 2019/11/12 08:40:57 hkenken Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.5 2019/11/12 05:09:29 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.6 2019/11/12 08:40:57 hkenken Exp $");
#include "opt_fdt.h"
@@ -91,7 +91,7 @@ enet_attach(device_t parent, device_t se
}
sc->sc_clk_ipg = fdtbus_clock_get(phandle, "ipg");
- if (sc->sc_clk_enet == NULL) {
+ if (sc->sc_clk_ipg == NULL) {
aprint_error(": couldn't get clock ipg\n");
goto failure;
}
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Tue Nov 12 08:35:57 UTC 2019 Modified Files: src/doc: CHANGES CHANGES.prev Log Message: fix the date for mos(4) import, and mention moscom(4) removal in prev. To generate a diff of this commit: cvs rdiff -u -r1.2610 -r1.2611 src/doc/CHANGES cvs rdiff -u -r1.148 -r1.149 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Tue Nov 12 08:35:57 UTC 2019 Modified Files: src/doc: CHANGES CHANGES.prev Log Message: fix the date for mos(4) import, and mention moscom(4) removal in prev. To generate a diff of this commit: cvs rdiff -u -r1.2610 -r1.2611 src/doc/CHANGES cvs rdiff -u -r1.148 -r1.149 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2610 src/doc/CHANGES:1.2611 --- src/doc/CHANGES:1.2610 Thu Nov 7 02:34:44 2019 +++ src/doc/CHANGES Tue Nov 12 08:35:56 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2610 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2611 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -39,7 +39,7 @@ Changes from NetBSD 9.0 to NetBSD 10.0: kernel: Add vHCI, a driver that allows to send and receive USB packets from userland. [maxv 20190914] mos(4): Ported driver for MosChip MCS7730/7830/7832 USB ethernet. - [mrg 20190814] + [mrg 20190920] libpcap: Import 1.9.1. [christos 20191001] tcpdump(8): Import 4.9.3. [christos 20191001] rescue(8): Moved into a separate, rescue-only set. [maya 20191001] Index: src/doc/CHANGES.prev diff -u src/doc/CHANGES.prev:1.148 src/doc/CHANGES.prev:1.149 --- src/doc/CHANGES.prev:1.148 Thu Oct 17 23:10:23 2019 +++ src/doc/CHANGES.prev Tue Nov 12 08:35:56 2019 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.148 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.149 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -12594,6 +12594,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0: SIGTRAP and si_code TRAP_SCE/TRAP_SCX. [kamil 20190506] installboot(8): Add support for NetBSD/evbarm boards that use u-boot for bootstrap. [thorpej 20190506] + moscom(4): Obsoleted by umcs(4). [mrg 20190507] ifmedia(4): Extend Ethernet's ifmedia word's subword up to 255. [msaitoh 20190517] mount_9p(8): Initial support for 9P2000.u. [ozaki-r 20190517]
CVS commit: src/sys/netinet6
Module Name:src
Committed By: maxv
Date: Tue Nov 12 08:11:55 UTC 2019
Modified Files:
src/sys/netinet6: ip6_input.c
Log Message:
Add more checks in ip6_pullexthdr, to prevent a panic in m_copydata. The
Rip6 entry point could see a garbage Hop6 option.
Not a big issue, since it's a clean panic only triggerable if the socket
has the IN6P_DSTOPTS/IN6P_RTHDR option.
Reported-by: syzbot+3b07b3511b4ceb8bf...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/sys/netinet6/ip6_input.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/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.214 src/sys/netinet6/ip6_input.c:1.215
--- src/sys/netinet6/ip6_input.c:1.214 Fri Oct 18 04:33:53 2019
+++ src/sys/netinet6/ip6_input.c Tue Nov 12 08:11:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.214 2019/10/18 04:33:53 ozaki-r Exp $ */
+/* $NetBSD: ip6_input.c,v 1.215 2019/11/12 08:11:55 maxv Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.214 2019/10/18 04:33:53 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.215 2019/11/12 08:11:55 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -1056,6 +1056,8 @@ ip6_savecontrol(struct in6pcb *in6p, str
#define IS2292(x, y) (y)
#endif
+ KASSERT(m->m_flags & M_PKTHDR);
+
if (SOOPT_TIMESTAMP(so->so_options))
mp = sbsavetimestamp(so->so_options, mp);
@@ -1297,12 +1299,18 @@ ip6_pullexthdr(struct mbuf *m, size_t of
size_t elen;
struct mbuf *n;
+ if (off + sizeof(ip6e) > m->m_pkthdr.len)
+ return NULL;
+
m_copydata(m, off, sizeof(ip6e), (void *));
if (nxt == IPPROTO_AH)
elen = (ip6e.ip6e_len + 2) << 2;
else
elen = (ip6e.ip6e_len + 1) << 3;
+ if (off + elen > m->m_pkthdr.len)
+ return NULL;
+
MGET(n, M_DONTWAIT, MT_DATA);
if (n && elen >= MLEN) {
MCLGET(n, M_DONTWAIT);
CVS commit: src/sys/netinet6
Module Name:src Committed By: maxv Date: Tue Nov 12 08:11:55 UTC 2019 Modified Files: src/sys/netinet6: ip6_input.c Log Message: Add more checks in ip6_pullexthdr, to prevent a panic in m_copydata. The Rip6 entry point could see a garbage Hop6 option. Not a big issue, since it's a clean panic only triggerable if the socket has the IN6P_DSTOPTS/IN6P_RTHDR option. Reported-by: syzbot+3b07b3511b4ceb8bf...@syzkaller.appspotmail.com To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/sys/netinet6/ip6_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
