CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Sep 18 05:32:15 UTC 2019
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Fix a bug that the multicast filter isn't correctly initialized when
the total number of the Ethernet multicast addresses is just 128.
Changing "<" with "<=" fixes this problem, but it's better to check
ETHER_F_ALLMULTI than it because it's straightforward.
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.210 src/sys/dev/pci/ixgbe/ixgbe.c:1.211
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.210 Fri Sep 13 07:55:07 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Sep 18 05:32:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.210 2019/09/13 07:55:07 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.211 2019/09/18 05:32:15 msaitoh Exp $ */
/**
@@ -4429,15 +4429,17 @@ ixgbe_set_multi(struct adapter *adapter)
else if (ec->ec_flags & ETHER_F_ALLMULTI) {
fctrl |= IXGBE_FCTRL_MPE;
}
- ETHER_UNLOCK(ec);
IXGBE_WRITE_REG(>hw, IXGBE_FCTRL, fctrl);
- if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) {
+ /* Update multicast filter entries only when it's not ALLMULTI */
+ if ((ec->ec_flags & ETHER_F_ALLMULTI) == 0) {
+ ETHER_UNLOCK(ec);
update_ptr = (u8 *)mta;
ixgbe_update_mc_addr_list(>hw, update_ptr, mcnt,
ixgbe_mc_array_itr, TRUE);
- }
+ } else
+ ETHER_UNLOCK(ec);
} /* ixgbe_set_multi */
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Sep 18 05:32:15 UTC 2019 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: Fix a bug that the multicast filter isn't correctly initialized when the total number of the Ethernet multicast addresses is just 128. Changing "<" with "<=" fixes this problem, but it's better to check ETHER_F_ALLMULTI than it because it's straightforward. To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.211 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src Committed By: nonaka Date: Wed Sep 18 05:16:15 UTC 2019 Modified Files: src/etc/rc.d: Makefile Log Message: Moved zfs out of MKX11 block. Fix build failure without X11. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/etc/rc.d/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src
Committed By: nonaka
Date: Wed Sep 18 05:16:15 UTC 2019
Modified Files:
src/etc/rc.d: Makefile
Log Message:
Moved zfs out of MKX11 block.
Fix build failure without X11.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/etc/rc.d/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.105 src/etc/rc.d/Makefile:1.106
--- src/etc/rc.d/Makefile:1.105 Sun Sep 15 19:38:09 2019
+++ src/etc/rc.d/Makefile Wed Sep 18 05:16:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2019/09/15 19:38:09 brad Exp $
+# $NetBSD: Makefile,v 1.106 2019/09/18 05:16:15 nonaka Exp $
.include
@@ -54,14 +54,14 @@ FILESBUILD_xdm= yes
FILESBUILD_xfs= yes
FILESBUILD_fccache= yes
-.if ${MKZFS} != "no"
-CONFIGFILES+= zfs
-.endif
-
.SUFFIXES: .in
.in:
${_MKTARGET_CREATE}
${TOOL_SED} -e 's,@X11ROOTDIR@,${X11ROOTDIR},g' < ${.IMPSRC} > ${.TARGET}
.endif
+.if ${MKZFS} != "no"
+CONFIGFILES+= zfs
+.endif
+
.include
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Wed Sep 18 04:57:54 UTC 2019 Modified Files: src/lib/libc/sys: execve.2 Log Message: Sort errors; remove two more duplicates. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/lib/libc/sys/execve.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Wed Sep 18 04:57:54 UTC 2019 Modified Files: src/lib/libc/sys: execve.2 Log Message: Sort errors; remove two more duplicates. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/lib/libc/sys/execve.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/execve.2 diff -u src/lib/libc/sys/execve.2:1.44 src/lib/libc/sys/execve.2:1.45 --- src/lib/libc/sys/execve.2:1.44 Mon Sep 16 11:03:08 2019 +++ src/lib/libc/sys/execve.2 Wed Sep 18 04:57:53 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: execve.2,v 1.44 2019/09/16 11:03:08 christos Exp $ +.\" $NetBSD: execve.2,v 1.45 2019/09/18 04:57:53 wiz Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -257,6 +257,18 @@ The system call will fail and return to the calling process if: .Bl -tag -width Er +.It Bq Er E2BIG +The number of bytes in the new process' argument list +is larger than the system-imposed limit. +The default compile time limit is 262144 bytes and is specified +in the variable +.Dv NCARGS +in +.Aq Pa sys/param.h +and get be read from the +.Xr sysctl 3 +MIB variable +.Dv KERN_ARGMAX . .It Bq Er EACCES Search permission is denied for a component of the path prefix, the new process file is not an ordinary file, @@ -274,11 +286,12 @@ processes it is allowed to run concurren .It Bq Er EFAULT The new process file is not as long as indicated by the size values in its header; or +the .Fa path , .Fa argv , or .Fa envp -point to an illegal address. +arguments point to an illegal address. .It Bq Er EIO An I/O error occurred while reading from the file system. .It Bq Er ELOOP @@ -306,32 +319,6 @@ A component of the path prefix is not a .It Bq Er ETXTBSY The new process file is a pure procedure (shared text) file that is currently open for writing or reading by some process. -.It Bq Er E2BIG -The number of bytes in the new process' argument list -is larger than the system-imposed limit. -The default compile time limit is 262144 bytes and is specified -in the variable -.Dv NCARGS -in -.Ao Pa sys/param.h Ac -and get be read from the -.Xr sysctl 3 -MIB variable -.Dv KERN_ARGMAX . -.It Bq Er EFAULT -The new process file is not as long as indicated by -the size values in its header. -.It Bq Er EFAULT -The -.Fa path , -.Fa argv , -or -.Fa envp -arguments -point -to an illegal address. -.It Bq Er EIO -An I/O error occurred while reading from the file system. .El .Pp In addition, the
Re: Leak Sanitizer - how to suppress leaks
On Sep 16, 3:02am, Kamil Rytarowski wrote: } On 16.09.2019 02:47, Robert Elz wrote: } > Expecting any unix program (even the simplest) to simply compile and run } > in a non-kernel environment is pointless, they simply won't work. } } As a non-trivial no-kernel example, nethack on rump unikernel: } } https://github.com/anttikantee/rumprun-nethack This is certainly an interesting case. However, in this case, the "kernel", becomes part of the application. As soon as the application exits, the kernel exits as well, so all memory ceases to exist. }-- End of excerpt from Kamil Rytarowski
Re: Leak Sanitizer - how to suppress leaks
On Sep 16, 7:47am, Robert Elz wrote: } } I used to program such things in the past (distant past) - one of the } requirements of the particular system I was using was that processes } were not allowed to run for "too long" before calling the system process } switch function (no kernel running clock interrupts to do time slicing). That was Windows for a very long time, i.e. co-operative multi-tasking. I wrote one Windows app in the Windows 3.1/95 era. I hated it. Terrible programming environment. Heck, all of Windows would stop running when you ran the application under a debugger. At least I figured out a dual monitor setup (Windows running on a VGA adapter and the debugger running on a Hercules adapter). } | In cases where it _is_ expensive, or at least where it's expensive to } | figure out, the same argument applies as against garbage collection: } | if you aren't sure what the lifetime of that object is, and the } | program isn't structured in a way that allows being reasomably sure it } | is disposed of exactly once, how can you have confidence in any other } | correctness properties? } } That isn't the issue at all - in the programs in question, there's no } issue with the lifetimes of objects, it is from creation until something } explicitly makes them go away, or process exit, whichever comes first. Process exit does it much more efficiently as well. Instead of trying to find every object and free memory a few bytes at a time, the entire address space is freed in fell swoop. }-- End of excerpt from Robert Elz
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Sep 18 00:09:42 UTC 2019 Modified Files: src/sys/dev/pci: if_lii.c Log Message: Use unsigned to avoid undefined behavior in lii_setmulti(). To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_lii.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_lii.c diff -u src/sys/dev/pci/if_lii.c:1.26 src/sys/dev/pci/if_lii.c:1.27 --- src/sys/dev/pci/if_lii.c:1.26 Thu May 30 02:32:18 2019 +++ src/sys/dev/pci/if_lii.c Wed Sep 18 00:09:42 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_lii.c,v 1.26 2019/05/30 02:32:18 msaitoh Exp $ */ +/* $NetBSD: if_lii.c,v 1.27 2019/09/18 00:09:42 msaitoh Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.26 2019/05/30 02:32:18 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.27 2019/09/18 00:09:42 msaitoh Exp $"); #include @@ -1186,10 +1186,10 @@ lii_setmulti(struct lii_softc *sc) crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN); - if (crc & (1 << 31)) - mht1 |= (1 << ((crc >> 26) & 0x001f)); + if (crc & (1U << 31)) + mht1 |= (1U << ((crc >> 26) & 0x001f)); else - mht0 |= (1 << ((crc >> 26) & 0x001f)); + mht0 |= (1U << ((crc >> 26) & 0x001f)); ETHER_NEXT_MULTI(step, enm); }
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Sep 18 00:09:42 UTC 2019 Modified Files: src/sys/dev/pci: if_lii.c Log Message: Use unsigned to avoid undefined behavior in lii_setmulti(). To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_lii.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: bouyer Date: Tue Sep 17 21:50:14 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Fix typo for 207 To generate a diff of this commit: cvs rdiff -u -r1.1.2.51 -r1.1.2.52 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: bouyer Date: Tue Sep 17 21:50:14 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Fix typo for 207 To generate a diff of this commit: cvs rdiff -u -r1.1.2.51 -r1.1.2.52 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.51 src/doc/CHANGES-9.0:1.1.2.52 --- src/doc/CHANGES-9.0:1.1.2.51 Tue Sep 17 19:57:08 2019 +++ src/doc/CHANGES-9.0 Tue Sep 17 21:50:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.51 2019/09/17 19:57:08 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.52 2019/09/17 21:50:14 bouyer Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -3735,7 +3735,7 @@ external/mit/xorg/tools/fc-cache/Makefil sys/arch/evbarm/conf/files.generic 1.8 - Add missing inlcude of external/bsd/sljit/conf/files.sljit. + Add missing include of external/bsd/sljit/conf/files.sljit. [bouyer, ticket #207] sys/netinet/ip_input.c1.390
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Sep 17 19:57:09 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #201 - #208 To generate a diff of this commit: cvs rdiff -u -r1.1.2.50 -r1.1.2.51 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src
Committed By: martin
Date: Tue Sep 17 19:57:09 UTC 2019
Modified Files:
src/doc [netbsd-9]: CHANGES-9.0
Log Message:
Tickets #201 - #208
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.50 -r1.1.2.51 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.50 src/doc/CHANGES-9.0:1.1.2.51
--- src/doc/CHANGES-9.0:1.1.2.50 Fri Sep 13 07:02:22 2019
+++ src/doc/CHANGES-9.0 Tue Sep 17 19:57:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.0,v 1.1.2.50 2019/09/13 07:02:22 martin Exp $
+# $NetBSD: CHANGES-9.0,v 1.1.2.51 2019/09/17 19:57:08 martin Exp $
A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30
until the 9.0 release:
@@ -3557,3 +3557,191 @@ sys/arch/i386/stand/lib/biosdisk.h 1.11
Add GPT and RAIDframe support to bootloaders.
[manu, ticket #200]
+common/lib/libc/arch/aarch64/atomic/atomic_or_64.S 1.2
+
+ aarch64: fix __sync_or_and_fetch_8 return value.
+ [skrll, ticket #201]
+
+common/lib/libc/arch/arm/atomic/atomic_or_64.S 1.11
+common/lib/libc/arch/arm/atomic/atomic_xor_64.S 1.4
+
+ arm: fix __sync_{,x}or_and_fetch_8 return value.
+ [skrll, ticket #202]
+
+share/man/man8/man8.x86/boot.8 1.20
+sys/arch/i386/include/Makefile 1.50
+sys/arch/i386/include/multiboot2.h 1.1
+sys/arch/i386/stand/boot/Makefile.boot 1.73
+sys/arch/i386/stand/dosboot/Makefile 1.32
+sys/arch/i386/stand/efiboot/Makefile.efiboot 1.16
+sys/arch/i386/stand/efiboot/boot.c 1.16
+sys/arch/i386/stand/efiboot/bootia32/Makefile 1.3
+sys/arch/i386/stand/efiboot/bootia32/efibootia32.c 1.5
+sys/arch/i386/stand/efiboot/bootia32/multiboot32.S 1.1
+sys/arch/i386/stand/efiboot/bootx64/Makefile 1.2
+sys/arch/i386/stand/efiboot/bootx64/efibootx64.c 1.5
+sys/arch/i386/stand/efiboot/bootx64/multiboot64.S 1.1
+sys/arch/i386/stand/efiboot/efiboot.c 1.11
+sys/arch/i386/stand/efiboot/efiboot.h 1.10
+sys/arch/i386/stand/efiboot/eficons.c 1.7
+sys/arch/i386/stand/efiboot/efimemory.c 1.9
+sys/arch/i386/stand/lib/Makefile 1.47
+sys/arch/i386/stand/lib/biosdisk.c 1.52
+sys/arch/i386/stand/lib/biosdisk.h 1.12
+sys/arch/i386/stand/lib/bootinfo_memmap.c 1.6
+sys/arch/i386/stand/lib/exec.c 1.74
+sys/arch/i386/stand/lib/exec_multiboot1.c 1.1
+sys/arch/i386/stand/lib/exec_multiboot2.c 1.1
+sys/arch/i386/stand/lib/exec_multiboot2.c 1.2
+sys/arch/i386/stand/lib/libi386.h 1.45
+sys/arch/i386/stand/lib/multiboot.S 1.3
+sys/arch/i386/stand/lib/pread.c 1.8
+sys/arch/i386/stand/netboot/Makefile.netboot 1.11
+sys/arch/i386/stand/pxeboot/Makefile 1.26
+
+ Add multiboot 2 support to x86 bootloaders.
+ [manu, ticket #203]
+
+sys/arch/x86/acpi/acpi_machdep.c 1.27,1.28
+
+ Attempt to obtain ACPI RSDP from the hypervisor for Xen PV.
+ [manu, ticket #204]
+
+share/man/man8/man8.x86/boot.8 1.18
+sys/kern/kern_subr.c1.227
+
+ Accept root device specification as NAME=label.
+ Document that bootdev option accepts device specification as NAME=label.
+ [manu, ticket #205]
+
+external/mit/expat/dist/conftools/test-driver up to 1.1.1.1
+external/mit/expat/dist/conftools/ar-libup to 1.1.1.1
+external/mit/expat/dist/conftools/ax-append-compile-flags.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-append-flag.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-append-link-flags.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-check-compile-flag.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-check-link-flag.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-require-defined.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/compile up to 1.1.1.1
+external/mit/expat/dist/conftools/depcomp up to 1.1.1.1
+external/mit/expat/dist/conftools/missing up to 1.1.1.1
+external/mit/expat/dist/conftools/expatcfg-compiler-supports-visibility.m4 up to 1.1.1.1
+external/mit/expat/dist/doc/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/doc/Makefile.in up to 1.1.1.1
+external/mit/expat/dist/examples/Makefile.amup to 1.1.1.1
+external/mit/expat/dist/examples/Makefile.inup to 1.1.1.1
+external/mit/expat/dist/lib/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/lib/Makefile.in up to 1.1.1.1
+external/mit/expat/dist/tests/benchmark/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/tests/benchmark/Makefile.in up to 1.1.1.1
+external/mit/expat/dist/tests/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/tests/Makefile.in up to 1.1.1.1
+external/mit/expat/dist/tests/structdata.c up to 1.1.1.1
+external/mit/expat/dist/tests/structdata.h up to 1.1.1.1
+external/mit/expat/dist/tests/udiffer.pyup to 1.1.1.1
+external/mit/expat/dist/tests/xmltest.log.expected up to 1.1.1.1
+external/mit/expat/dist/win32/build_expat_iss.bat up to 1.1.1.1
+external/mit/expat/dist/xmlwf/Makefile.am up to 1.1.1.1
CVS commit: [netbsd-9] src/sys
Module Name:src Committed By: martin Date: Tue Sep 17 19:55:43 UTC 2019 Modified Files: src/sys/netinet [netbsd-9]: ip_input.c src/sys/netinet6 [netbsd-9]: ip6_input.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #208): sys/netinet6/ip6_input.c: revision 1.209 sys/netinet/ip_input.c: revision 1.390 Packet filters can return an mbuf chain with fragmented headers, so m_pullup() it if needed and remove the KASSERT()s. To generate a diff of this commit: cvs rdiff -u -r1.389 -r1.389.2.1 src/sys/netinet/ip_input.c cvs rdiff -u -r1.208 -r1.208.2.1 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.
CVS commit: [netbsd-9] src/sys
Module Name:src
Committed By: martin
Date: Tue Sep 17 19:55:43 UTC 2019
Modified Files:
src/sys/netinet [netbsd-9]: ip_input.c
src/sys/netinet6 [netbsd-9]: ip6_input.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #208):
sys/netinet6/ip6_input.c: revision 1.209
sys/netinet/ip_input.c: revision 1.390
Packet filters can return an mbuf chain with fragmented headers, so
m_pullup() it if needed and remove the KASSERT()s.
To generate a diff of this commit:
cvs rdiff -u -r1.389 -r1.389.2.1 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.208 -r1.208.2.1 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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.389 src/sys/netinet/ip_input.c:1.389.2.1
--- src/sys/netinet/ip_input.c:1.389 Mon May 13 07:47:59 2019
+++ src/sys/netinet/ip_input.c Tue Sep 17 19:55:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.389 2019/05/13 07:47:59 ozaki-r Exp $ */
+/* $NetBSD: ip_input.c,v 1.389.2.1 2019/09/17 19:55:43 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.389 2019/05/13 07:47:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.389.2.1 2019/09/17 19:55:43 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -581,10 +581,25 @@ ip_input(struct mbuf *m)
IP_STATINC(IP_STAT_PFILDROP_IN);
goto out;
}
- KASSERT(m->m_len >= sizeof(struct ip));
+ if (__predict_false(m->m_len < sizeof(struct ip))) {
+ if ((m = m_pullup(m, sizeof(struct ip))) == NULL) {
+IP_STATINC(IP_STAT_TOOSMALL);
+goto out;
+ }
+ }
ip = mtod(m, struct ip *);
hlen = ip->ip_hl << 2;
- KASSERT(m->m_len >= hlen);
+ if (hlen < sizeof(struct ip)) { /* minimum header length */
+ IP_STATINC(IP_STAT_BADHLEN);
+ goto out;
+ }
+ if (hlen > m->m_len) {
+ if ((m = m_pullup(m, hlen)) == NULL) {
+IP_STATINC(IP_STAT_BADHLEN);
+goto out;
+ }
+ ip = mtod(m, struct ip *);
+ }
/*
* XXX The setting of "srcrt" here is to prevent ip_forward()
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.208 src/sys/netinet6/ip6_input.c:1.208.2.1
--- src/sys/netinet6/ip6_input.c:1.208 Mon May 13 07:47:59 2019
+++ src/sys/netinet6/ip6_input.c Tue Sep 17 19:55:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.208 2019/05/13 07:47:59 ozaki-r Exp $ */
+/* $NetBSD: ip6_input.c,v 1.208.2.1 2019/09/17 19:55:43 martin 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.208 2019/05/13 07:47:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.208.2.1 2019/09/17 19:55:43 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -356,7 +356,13 @@ ip6_input(struct mbuf *m, struct ifnet *
IP6_STATINC(IP6_STAT_PFILDROP_IN);
return;
}
- KASSERT(m->m_len >= sizeof(struct ip6_hdr));
+ if (m->m_len < sizeof(struct ip6_hdr)) {
+ if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == NULL) {
+IP6_STATINC(IP6_STAT_TOOSMALL);
+in6_ifstat_inc(rcvif, ifs6_in_hdrerr);
+return;
+ }
+ }
ip6 = mtod(m, struct ip6_hdr *);
srcrt = !IN6_ARE_ADDR_EQUAL(, >ip6_dst);
}
CVS commit: [netbsd-9] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Tue Sep 17 19:54:10 UTC 2019 Modified Files: src/sys/arch/evbarm/conf [netbsd-9]: files.generic Log Message: Pull up following revision(s) (requested by bouyer in ticket #207): sys/arch/evbarm/conf/files.generic: revision 1.8 Inlcude external/bsd/sljit/conf/files.sljit, so that it's possible to build a kernel with options SLJIT To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/arch/evbarm/conf/files.generic 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/evbarm/conf/files.generic diff -u src/sys/arch/evbarm/conf/files.generic:1.7 src/sys/arch/evbarm/conf/files.generic:1.7.2.1 --- src/sys/arch/evbarm/conf/files.generic:1.7 Tue Jun 11 13:01:48 2019 +++ src/sys/arch/evbarm/conf/files.generic Tue Sep 17 19:54:10 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.generic,v 1.7 2019/06/11 13:01:48 skrll Exp $ +# $NetBSD: files.generic,v 1.7.2.1 2019/09/17 19:54:10 martin Exp $ # # A generic (aarch32) kernel configuration info # @@ -26,3 +26,9 @@ include "arch/arm/sunxi/files.sunxi" include "arch/arm/vexpress/files.vexpress" include "arch/arm/virt/files.virt" include "arch/arm/xilinx/files.zynq" + +# +# Stack-less Just-In-Time compiler +# + +include "external/bsd/sljit/conf/files.sljit"
CVS commit: [netbsd-9] src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Tue Sep 17 19:54:10 UTC 2019 Modified Files: src/sys/arch/evbarm/conf [netbsd-9]: files.generic Log Message: Pull up following revision(s) (requested by bouyer in ticket #207): sys/arch/evbarm/conf/files.generic: revision 1.8 Inlcude external/bsd/sljit/conf/files.sljit, so that it's possible to build a kernel with options SLJIT To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/arch/evbarm/conf/files.generic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Sep 17 19:51:15 UTC 2019 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/external/mit/expat/dist [netbsd-9]: CMake.README CMakeLists.txt Changes ConfigureChecks.cmake Makefile.in aclocal.m4 configure configure.ac expat_config.h.cmake expat_config.h.in src/external/mit/expat/dist/conftools [netbsd-9]: config.guess config.sub get-version.sh install-sh ltmain.sh src/external/mit/expat/dist/doc [netbsd-9]: reference.html xmlwf.1 xmlwf.xml src/external/mit/expat/dist/examples [netbsd-9]: elements.c outline.c src/external/mit/expat/dist/lib [netbsd-9]: ascii.h asciitab.h expat.h expat_external.h iasciitab.h internal.h latin1tab.h libexpat.def libexpatw.def nametab.h siphash.h utf8tab.h winconfig.h xmlparse.c xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c src/external/mit/expat/dist/tests [netbsd-9]: chardata.c chardata.h memcheck.c memcheck.h minicheck.c minicheck.h runtests.c runtestspp.cpp xmltest.sh src/external/mit/expat/dist/tests/benchmark [netbsd-9]: benchmark.c src/external/mit/expat/dist/win32 [netbsd-9]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-9]: codepage.c codepage.h ct.c filemap.h readfilemap.c unixfilemap.c win32filemap.c xmlfile.c xmlfile.h xmlmime.c xmlmime.h xmltchar.h xmlwf.c src/external/mit/expat/lib/libexpat [netbsd-9]: expat_config.h src/external/mit/xorg/tools/fc-cache [netbsd-9]: Makefile Added Files: src/external/mit/expat/dist [netbsd-9]: Makefile.am README.md acinclude.m4 fix-xmltest-log.sh test-driver-wrapper.sh src/external/mit/expat/dist/cmake [netbsd-9]: expat-config.cmake.in mingw-toolchain.cmake src/external/mit/expat/dist/conftools [netbsd-9]: ar-lib ax-append-compile-flags.m4 ax-append-flag.m4 ax-append-link-flags.m4 ax-check-compile-flag.m4 ax-check-link-flag.m4 ax-require-defined.m4 compile depcomp expatcfg-compiler-supports-visibility.m4 missing test-driver src/external/mit/expat/dist/doc [netbsd-9]: Makefile.am Makefile.in src/external/mit/expat/dist/examples [netbsd-9]: Makefile.am Makefile.in src/external/mit/expat/dist/lib [netbsd-9]: Makefile.am Makefile.in src/external/mit/expat/dist/tests [netbsd-9]: Makefile.am Makefile.in structdata.c structdata.h udiffer.py xmltest.log.expected src/external/mit/expat/dist/tests/benchmark [netbsd-9]: Makefile.am Makefile.in src/external/mit/expat/dist/win32 [netbsd-9]: build_expat_iss.bat src/external/mit/expat/dist/xmlwf [netbsd-9]: Makefile.am Makefile.in xmlwf_helpgen.py xmlwf_helpgen.sh Removed Files: src/external/mit/expat/dist [netbsd-9]: MANIFEST README src/external/mit/expat/dist/conftools [netbsd-9]: ac_c_bigendian_cross.m4 mkinstalldirs src/external/mit/expat/dist/xmlwf [netbsd-9]: xmlurl.h xmlwin32url.cxx Log Message: Sync to current and pull up the following revisions, requested by maya in ticket #206: external/mit/expat/dist/conftools/test-driver up to 1.1.1.1 external/mit/expat/dist/conftools/ar-libup to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-compile-flags.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-link-flags.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-check-compile-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-check-link-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-require-defined.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/compile up to 1.1.1.1 external/mit/expat/dist/conftools/depcomp up to 1.1.1.1 external/mit/expat/dist/conftools/missing up to 1.1.1.1 external/mit/expat/dist/conftools/expatcfg-compiler-supports-visibility.m4 up to 1.1.1.1 external/mit/expat/dist/doc/Makefile.am up to 1.1.1.1 external/mit/expat/dist/doc/Makefile.in up to 1.1.1.1 external/mit/expat/dist/examples/Makefile.amup to 1.1.1.1 external/mit/expat/dist/examples/Makefile.inup to 1.1.1.1 external/mit/expat/dist/lib/Makefile.am up to 1.1.1.1 external/mit/expat/dist/lib/Makefile.in up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/Makefile.am up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/Makefile.in up to 1.1.1.1 external/mit/expat/dist/tests/Makefile.am up to 1.1.1.1 external/mit/expat/dist/tests/Makefile.in up to 1.1.1.1
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Sep 17 19:51:15 UTC 2019 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/external/mit/expat/dist [netbsd-9]: CMake.README CMakeLists.txt Changes ConfigureChecks.cmake Makefile.in aclocal.m4 configure configure.ac expat_config.h.cmake expat_config.h.in src/external/mit/expat/dist/conftools [netbsd-9]: config.guess config.sub get-version.sh install-sh ltmain.sh src/external/mit/expat/dist/doc [netbsd-9]: reference.html xmlwf.1 xmlwf.xml src/external/mit/expat/dist/examples [netbsd-9]: elements.c outline.c src/external/mit/expat/dist/lib [netbsd-9]: ascii.h asciitab.h expat.h expat_external.h iasciitab.h internal.h latin1tab.h libexpat.def libexpatw.def nametab.h siphash.h utf8tab.h winconfig.h xmlparse.c xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c src/external/mit/expat/dist/tests [netbsd-9]: chardata.c chardata.h memcheck.c memcheck.h minicheck.c minicheck.h runtests.c runtestspp.cpp xmltest.sh src/external/mit/expat/dist/tests/benchmark [netbsd-9]: benchmark.c src/external/mit/expat/dist/win32 [netbsd-9]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-9]: codepage.c codepage.h ct.c filemap.h readfilemap.c unixfilemap.c win32filemap.c xmlfile.c xmlfile.h xmlmime.c xmlmime.h xmltchar.h xmlwf.c src/external/mit/expat/lib/libexpat [netbsd-9]: expat_config.h src/external/mit/xorg/tools/fc-cache [netbsd-9]: Makefile Added Files: src/external/mit/expat/dist [netbsd-9]: Makefile.am README.md acinclude.m4 fix-xmltest-log.sh test-driver-wrapper.sh src/external/mit/expat/dist/cmake [netbsd-9]: expat-config.cmake.in mingw-toolchain.cmake src/external/mit/expat/dist/conftools [netbsd-9]: ar-lib ax-append-compile-flags.m4 ax-append-flag.m4 ax-append-link-flags.m4 ax-check-compile-flag.m4 ax-check-link-flag.m4 ax-require-defined.m4 compile depcomp expatcfg-compiler-supports-visibility.m4 missing test-driver src/external/mit/expat/dist/doc [netbsd-9]: Makefile.am Makefile.in src/external/mit/expat/dist/examples [netbsd-9]: Makefile.am Makefile.in src/external/mit/expat/dist/lib [netbsd-9]: Makefile.am Makefile.in src/external/mit/expat/dist/tests [netbsd-9]: Makefile.am Makefile.in structdata.c structdata.h udiffer.py xmltest.log.expected src/external/mit/expat/dist/tests/benchmark [netbsd-9]: Makefile.am Makefile.in src/external/mit/expat/dist/win32 [netbsd-9]: build_expat_iss.bat src/external/mit/expat/dist/xmlwf [netbsd-9]: Makefile.am Makefile.in xmlwf_helpgen.py xmlwf_helpgen.sh Removed Files: src/external/mit/expat/dist [netbsd-9]: MANIFEST README src/external/mit/expat/dist/conftools [netbsd-9]: ac_c_bigendian_cross.m4 mkinstalldirs src/external/mit/expat/dist/xmlwf [netbsd-9]: xmlurl.h xmlwin32url.cxx Log Message: Sync to current and pull up the following revisions, requested by maya in ticket #206: external/mit/expat/dist/conftools/test-driver up to 1.1.1.1 external/mit/expat/dist/conftools/ar-libup to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-compile-flags.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-link-flags.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-check-compile-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-check-link-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-require-defined.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/compile up to 1.1.1.1 external/mit/expat/dist/conftools/depcomp up to 1.1.1.1 external/mit/expat/dist/conftools/missing up to 1.1.1.1 external/mit/expat/dist/conftools/expatcfg-compiler-supports-visibility.m4 up to 1.1.1.1 external/mit/expat/dist/doc/Makefile.am up to 1.1.1.1 external/mit/expat/dist/doc/Makefile.in up to 1.1.1.1 external/mit/expat/dist/examples/Makefile.amup to 1.1.1.1 external/mit/expat/dist/examples/Makefile.inup to 1.1.1.1 external/mit/expat/dist/lib/Makefile.am up to 1.1.1.1 external/mit/expat/dist/lib/Makefile.in up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/Makefile.am up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/Makefile.in up to 1.1.1.1 external/mit/expat/dist/tests/Makefile.am up to 1.1.1.1 external/mit/expat/dist/tests/Makefile.in up to 1.1.1.1
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Sep 17 19:45:03 UTC 2019 Modified Files: src/share/man/man8/man8.x86 [netbsd-9]: boot.8 src/sys/kern [netbsd-9]: kern_subr.c Log Message: Pull up following revision(s) (requested by manu in ticket #205): share/man/man8/man8.x86/boot.8: revision 1.18 sys/kern/kern_subr.c: revision 1.227 Accept root device specification as NAME=label Document that bootdev option accepts device specification as NAME=label To generate a diff of this commit: cvs rdiff -u -r1.15.2.2 -r1.15.2.3 src/share/man/man8/man8.x86/boot.8 cvs rdiff -u -r1.223 -r1.223.4.1 src/sys/kern/kern_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Tue Sep 17 19:45:03 UTC 2019
Modified Files:
src/share/man/man8/man8.x86 [netbsd-9]: boot.8
src/sys/kern [netbsd-9]: kern_subr.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #205):
share/man/man8/man8.x86/boot.8: revision 1.18
sys/kern/kern_subr.c: revision 1.227
Accept root device specification as NAME=label
Document that bootdev option accepts device specification as NAME=label
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.2 -r1.15.2.3 src/share/man/man8/man8.x86/boot.8
cvs rdiff -u -r1.223 -r1.223.4.1 src/sys/kern/kern_subr.c
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/man8/man8.x86/boot.8
diff -u src/share/man/man8/man8.x86/boot.8:1.15.2.2 src/share/man/man8/man8.x86/boot.8:1.15.2.3
--- src/share/man/man8/man8.x86/boot.8:1.15.2.2 Tue Sep 17 19:32:00 2019
+++ src/share/man/man8/man8.x86/boot.8 Tue Sep 17 19:45:02 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: boot.8,v 1.15.2.2 2019/09/17 19:32:00 martin Exp $
+.\" $NetBSD: boot.8,v 1.15.2.3 2019/09/17 19:45:02 martin Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -436,7 +436,11 @@ being separated with spaces
.It Ic bootdev Ns = Ns Ar dev Po or Ic root Ns = Ns Ar dev Pc
Override the default boot device.
.Ar dev
-can be a unit name
+is of the form
+.Va NAME=partition_label
+for
+.Xr gpt 8
+partitionned disks. It can also be a unit name
.Po Dq wd0
.Pc ,
or an interface name
Index: src/sys/kern/kern_subr.c
diff -u src/sys/kern/kern_subr.c:1.223 src/sys/kern/kern_subr.c:1.223.4.1
--- src/sys/kern/kern_subr.c:1.223 Sun Jan 27 02:08:43 2019
+++ src/sys/kern/kern_subr.c Tue Sep 17 19:45:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_subr.c,v 1.223 2019/01/27 02:08:43 pgoyette Exp $ */
+/* $NetBSD: kern_subr.c,v 1.223.4.1 2019/09/17 19:45:03 martin Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.223 2019/01/27 02:08:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.223.4.1 2019/09/17 19:45:03 martin Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -679,13 +679,18 @@ getdisk(char *str, int len, int defpart,
static const char *
getwedgename(const char *name, int namelen)
{
- const char *wpfx = "wedge:";
- const int wpfxlen = strlen(wpfx);
+ const char *wpfx1 = "wedge:";
+ const char *wpfx2 = "NAME=";
+ const int wpfx1len = strlen(wpfx1);
+ const int wpfx2len = strlen(wpfx2);
- if (namelen < wpfxlen || strncmp(name, wpfx, wpfxlen) != 0)
- return NULL;
+ if (namelen > wpfx1len && strncmp(name, wpfx1, wpfx1len) == 0)
+ return name + wpfx1len;
- return name + wpfxlen;
+ if (namelen > wpfx2len && strncasecmp(name, wpfx2, wpfx2len) == 0)
+ return name + wpfx2len;
+
+ return NULL;
}
static device_t
CVS commit: [netbsd-9] src/sys/arch/x86/acpi
Module Name:src
Committed By: martin
Date: Tue Sep 17 19:41:45 UTC 2019
Modified Files:
src/sys/arch/x86/acpi [netbsd-9]: acpi_machdep.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #204):
sys/arch/x86/acpi/acpi_machdep.c: revision 1.27
sys/arch/x86/acpi/acpi_machdep.c: revision 1.28
Attempt to obtain ACPI RSDP from the hypervisor for Xen PV
There are three possible way of obtaining the ACPI RSDP
- From Extended BIOS Data Area (EBDA) when kernel or Xen was booted from
BIOS bootstrap
- From EFI SystemTable when kernel is booted from EFI bootstrap
- When Xen is booted from EFI bootstrap, EBDA is not mapped, and EFI
SystemTable is not passed to the kernel. The only way to go is to
obtain ACPI RSDP trhough an hypercall.
Note: EFI bootstrap support for booting Xen has not yet been committed.
Cast physical addresses via uintptr_t to ACPI_PHYSICAL_ADDRESS to deal
with all size variants of the types used here in different builds.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/x86/acpi/acpi_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_machdep.c
diff -u src/sys/arch/x86/acpi/acpi_machdep.c:1.26 src/sys/arch/x86/acpi/acpi_machdep.c:1.26.2.1
--- src/sys/arch/x86/acpi/acpi_machdep.c:1.26 Wed May 1 07:26:28 2019
+++ src/sys/arch/x86/acpi/acpi_machdep.c Tue Sep 17 19:41:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.26 2019/05/01 07:26:28 mlelstv Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.26.2.1 2019/09/17 19:41:45 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.26 2019/05/01 07:26:28 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.26.2.1 2019/09/17 19:41:45 martin Exp $");
#include
#include
@@ -100,8 +100,61 @@ acpi_md_OsGetRootPointer(void)
ACPI_PHYSICAL_ADDRESS PhysicalAddress;
ACPI_STATUS Status;
-#ifndef XENPV
- /* If EFI is available, attempt to use it to locate the ACPI table. */
+#ifdef XENPV
+ /*
+ * Obtain the ACPI RSDP from the hypervisor.
+ * This is the only way to go if Xen booted from EFI: the
+ * Extended BIOS Data Area (EBDA) is not mapped, and Xen
+ * does not pass an EFI SystemTable to the kernel.
+ */
+struct xen_platform_op op = {
+.cmd = XENPF_firmware_info,
+.u.firmware_info = {
+.type = XEN_FW_EFI_INFO,
+.index = XEN_FW_EFI_CONFIG_TABLE
+}
+};
+union xenpf_efi_info *info = _info.u.efi_info;
+
+if (HYPERVISOR_platform_op() == 0) {
+ struct efi_cfgtbl *ct;
+ int i;
+
+ ct = AcpiOsMapMemory(info->cfg.addr,
+ sizeof(*ct) * info->cfg.nent);
+
+ for (i = 0; i < info->cfg.nent; i++) {
+ if (memcmp([i].ct_uuid,
+ _UUID_ACPI20, sizeof(EFI_UUID_ACPI20)) == 0) {
+PhysicalAddress = (ACPI_PHYSICAL_ADDRESS)
+(uintptr_t)ct[i].ct_data;
+if (PhysicalAddress)
+ goto out;
+
+ }
+ }
+
+ for (i = 0; i < info->cfg.nent; i++) {
+ if (memcmp([i].ct_uuid,
+ _UUID_ACPI10, sizeof(EFI_UUID_ACPI10)) == 0) {
+PhysicalAddress = (ACPI_PHYSICAL_ADDRESS)
+(uintptr_t)ct[i].ct_data;
+if (PhysicalAddress)
+ goto out;
+
+ }
+ }
+out:
+ AcpiOsUnmapMemory(ct, sizeof(*ct) * info->cfg.nent);
+
+ if (PhysicalAddress)
+ return PhysicalAddress;
+ }
+#else
+ /*
+ * Get the ACPI RSDP from EFI SystemTable. This works when the
+ * kernel was loaded from EFI bootloader.
+ */
if (efi_probe()) {
PhysicalAddress = efi_getcfgtblpa(_UUID_ACPI20);
if (!PhysicalAddress)
@@ -111,6 +164,11 @@ acpi_md_OsGetRootPointer(void)
}
#endif
+ /*
+ * Find ACPI RSDP from Extended BIOS Data Area (EBDA). This
+ * works when the kernel was started from BIOS bootloader,
+ * or for Xen PV when Xen was started from BIOS bootloader.
+ */
Status = AcpiFindRootPointer();
if (ACPI_FAILURE(Status))
PhysicalAddress = 0;
CVS commit: [netbsd-9] src/sys/arch/x86/acpi
Module Name:src Committed By: martin Date: Tue Sep 17 19:41:45 UTC 2019 Modified Files: src/sys/arch/x86/acpi [netbsd-9]: acpi_machdep.c Log Message: Pull up following revision(s) (requested by manu in ticket #204): sys/arch/x86/acpi/acpi_machdep.c: revision 1.27 sys/arch/x86/acpi/acpi_machdep.c: revision 1.28 Attempt to obtain ACPI RSDP from the hypervisor for Xen PV There are three possible way of obtaining the ACPI RSDP - From Extended BIOS Data Area (EBDA) when kernel or Xen was booted from BIOS bootstrap - From EFI SystemTable when kernel is booted from EFI bootstrap - When Xen is booted from EFI bootstrap, EBDA is not mapped, and EFI SystemTable is not passed to the kernel. The only way to go is to obtain ACPI RSDP trhough an hypercall. Note: EFI bootstrap support for booting Xen has not yet been committed. Cast physical addresses via uintptr_t to ACPI_PHYSICAL_ADDRESS to deal with all size variants of the types used here in different builds. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/x86/acpi/acpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Sep 17 19:32:01 UTC 2019 Modified Files: src/share/man/man8/man8.x86 [netbsd-9]: boot.8 src/sys/arch/i386/include [netbsd-9]: Makefile src/sys/arch/i386/stand/boot [netbsd-9]: Makefile.boot src/sys/arch/i386/stand/dosboot [netbsd-9]: Makefile src/sys/arch/i386/stand/efiboot [netbsd-9]: Makefile.efiboot boot.c efiboot.c efiboot.h eficons.c efimemory.c src/sys/arch/i386/stand/efiboot/bootia32 [netbsd-9]: Makefile efibootia32.c src/sys/arch/i386/stand/efiboot/bootx64 [netbsd-9]: Makefile efibootx64.c src/sys/arch/i386/stand/lib [netbsd-9]: Makefile biosdisk.c biosdisk.h bootinfo_memmap.c exec.c libi386.h multiboot.S pread.c src/sys/arch/i386/stand/netboot [netbsd-9]: Makefile.netboot src/sys/arch/i386/stand/pxeboot [netbsd-9]: Makefile Added Files: src/sys/arch/i386/include [netbsd-9]: multiboot2.h src/sys/arch/i386/stand/efiboot/bootia32 [netbsd-9]: multiboot32.S src/sys/arch/i386/stand/efiboot/bootx64 [netbsd-9]: multiboot64.S src/sys/arch/i386/stand/lib [netbsd-9]: exec_multiboot1.c exec_multiboot2.c Log Message: Pull up following revision(s) (requested by manu in ticket #203): sys/arch/i386/include/multiboot2.h: revision 1.1 sys/arch/i386/stand/lib/exec.c: revision 1.74 sys/arch/i386/stand/efiboot/efiboot.c: revision 1.11 sys/arch/i386/stand/efiboot/bootia32/multiboot32.S: revision 1.1 sys/arch/i386/stand/lib/biosdisk.c: revision 1.52 sys/arch/i386/stand/efiboot/bootx64/efibootx64.c: revision 1.5 sys/arch/i386/stand/efiboot/eficons.c: revision 1.7 sys/arch/i386/stand/efiboot/bootia32/efibootia32.c: revision 1.5 sys/arch/i386/stand/lib/libi386.h: revision 1.45 sys/arch/i386/stand/lib/bootinfo_memmap.c: revision 1.6 sys/arch/i386/stand/lib/pread.c: revision 1.8 sys/arch/i386/stand/efiboot/efiboot.h: revision 1.10 sys/arch/i386/stand/efiboot/bootia32/Makefile: revision 1.3 sys/arch/i386/stand/lib/Makefile: revision 1.47 sys/arch/i386/stand/efiboot/bootx64/Makefile: revision 1.2 sys/arch/i386/stand/lib/multiboot.S: revision 1.3 sys/arch/i386/stand/efiboot/bootx64/multiboot64.S: revision 1.1 sys/arch/i386/stand/efiboot/efimemory.c: revision 1.9 sys/arch/i386/stand/efiboot/boot.c: revision 1.16 sys/arch/i386/include/Makefile: revision 1.50 sys/arch/i386/stand/efiboot/Makefile.efiboot: revision 1.16 share/man/man8/man8.x86/boot.8: revision 1.20 sys/arch/i386/stand/boot/Makefile.boot: revision 1.73 sys/arch/i386/stand/pxeboot/Makefile: revision 1.26 sys/arch/i386/stand/lib/exec_multiboot1.c: revision 1.1 sys/arch/i386/stand/netboot/Makefile.netboot: revision 1.11 sys/arch/i386/stand/lib/exec_multiboot2.c: revision 1.1 sys/arch/i386/stand/lib/biosdisk.h: revision 1.12 sys/arch/i386/stand/lib/exec_multiboot2.c: revision 1.2 sys/arch/i386/stand/dosboot/Makefile: revision 1.32 Add multiboot 2 support to x86 bootloaders multiboot 2 is required to boot Xen on an EFI system. This also require a kernel patch for properly discovering the ACPI RSDP, which is available after 20190912, in src/sys/arch/x86/acpi/acpi_machdep.c 1.26-1.28 There are a few missing bit in this multiboot 2 implementation (which are unused by Xen): - Header tags Address, Freambuffer, and Relocatable are ignored - Tags APM and Network are not provided - Tags ACPI old and ACP new are only provided for ACPI boot - Tag boot device does not provides the subpart (BSD disklabel partition) Notes: - multiboot2 is disabled in dosboot, otherwise the binary gets too big and build fails. - in src/sys/arch/i386/stand/efiboot, consinit() is renamed as efi_consinit() to avoid prototype conflicts in src/sys/sys/systm.h Remove debug define. It remained there unseen because it was misspelled! Remove obsoeolete BUGS note that UEFI bootloader does not support multiboot To generate a diff of this commit: cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/share/man/man8/man8.x86/boot.8 cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/arch/i386/include/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/i386/include/multiboot2.h cvs rdiff -u -r1.72 -r1.72.4.1 src/sys/arch/i386/stand/boot/Makefile.boot cvs rdiff -u -r1.31 -r1.31.6.1 src/sys/arch/i386/stand/dosboot/Makefile cvs rdiff -u -r1.15 -r1.15.2.1 \ src/sys/arch/i386/stand/efiboot/Makefile.efiboot cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/arch/i386/stand/efiboot/boot.c cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/arch/i386/stand/efiboot/efiboot.c cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/i386/stand/efiboot/efiboot.h cvs rdiff -u -r1.6 -r1.6.6.1 src/sys/arch/i386/stand/efiboot/eficons.c cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/arch/i386/stand/efiboot/efimemory.c cvs
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Sep 17 19:32:01 UTC 2019 Modified Files: src/share/man/man8/man8.x86 [netbsd-9]: boot.8 src/sys/arch/i386/include [netbsd-9]: Makefile src/sys/arch/i386/stand/boot [netbsd-9]: Makefile.boot src/sys/arch/i386/stand/dosboot [netbsd-9]: Makefile src/sys/arch/i386/stand/efiboot [netbsd-9]: Makefile.efiboot boot.c efiboot.c efiboot.h eficons.c efimemory.c src/sys/arch/i386/stand/efiboot/bootia32 [netbsd-9]: Makefile efibootia32.c src/sys/arch/i386/stand/efiboot/bootx64 [netbsd-9]: Makefile efibootx64.c src/sys/arch/i386/stand/lib [netbsd-9]: Makefile biosdisk.c biosdisk.h bootinfo_memmap.c exec.c libi386.h multiboot.S pread.c src/sys/arch/i386/stand/netboot [netbsd-9]: Makefile.netboot src/sys/arch/i386/stand/pxeboot [netbsd-9]: Makefile Added Files: src/sys/arch/i386/include [netbsd-9]: multiboot2.h src/sys/arch/i386/stand/efiboot/bootia32 [netbsd-9]: multiboot32.S src/sys/arch/i386/stand/efiboot/bootx64 [netbsd-9]: multiboot64.S src/sys/arch/i386/stand/lib [netbsd-9]: exec_multiboot1.c exec_multiboot2.c Log Message: Pull up following revision(s) (requested by manu in ticket #203): sys/arch/i386/include/multiboot2.h: revision 1.1 sys/arch/i386/stand/lib/exec.c: revision 1.74 sys/arch/i386/stand/efiboot/efiboot.c: revision 1.11 sys/arch/i386/stand/efiboot/bootia32/multiboot32.S: revision 1.1 sys/arch/i386/stand/lib/biosdisk.c: revision 1.52 sys/arch/i386/stand/efiboot/bootx64/efibootx64.c: revision 1.5 sys/arch/i386/stand/efiboot/eficons.c: revision 1.7 sys/arch/i386/stand/efiboot/bootia32/efibootia32.c: revision 1.5 sys/arch/i386/stand/lib/libi386.h: revision 1.45 sys/arch/i386/stand/lib/bootinfo_memmap.c: revision 1.6 sys/arch/i386/stand/lib/pread.c: revision 1.8 sys/arch/i386/stand/efiboot/efiboot.h: revision 1.10 sys/arch/i386/stand/efiboot/bootia32/Makefile: revision 1.3 sys/arch/i386/stand/lib/Makefile: revision 1.47 sys/arch/i386/stand/efiboot/bootx64/Makefile: revision 1.2 sys/arch/i386/stand/lib/multiboot.S: revision 1.3 sys/arch/i386/stand/efiboot/bootx64/multiboot64.S: revision 1.1 sys/arch/i386/stand/efiboot/efimemory.c: revision 1.9 sys/arch/i386/stand/efiboot/boot.c: revision 1.16 sys/arch/i386/include/Makefile: revision 1.50 sys/arch/i386/stand/efiboot/Makefile.efiboot: revision 1.16 share/man/man8/man8.x86/boot.8: revision 1.20 sys/arch/i386/stand/boot/Makefile.boot: revision 1.73 sys/arch/i386/stand/pxeboot/Makefile: revision 1.26 sys/arch/i386/stand/lib/exec_multiboot1.c: revision 1.1 sys/arch/i386/stand/netboot/Makefile.netboot: revision 1.11 sys/arch/i386/stand/lib/exec_multiboot2.c: revision 1.1 sys/arch/i386/stand/lib/biosdisk.h: revision 1.12 sys/arch/i386/stand/lib/exec_multiboot2.c: revision 1.2 sys/arch/i386/stand/dosboot/Makefile: revision 1.32 Add multiboot 2 support to x86 bootloaders multiboot 2 is required to boot Xen on an EFI system. This also require a kernel patch for properly discovering the ACPI RSDP, which is available after 20190912, in src/sys/arch/x86/acpi/acpi_machdep.c 1.26-1.28 There are a few missing bit in this multiboot 2 implementation (which are unused by Xen): - Header tags Address, Freambuffer, and Relocatable are ignored - Tags APM and Network are not provided - Tags ACPI old and ACP new are only provided for ACPI boot - Tag boot device does not provides the subpart (BSD disklabel partition) Notes: - multiboot2 is disabled in dosboot, otherwise the binary gets too big and build fails. - in src/sys/arch/i386/stand/efiboot, consinit() is renamed as efi_consinit() to avoid prototype conflicts in src/sys/sys/systm.h Remove debug define. It remained there unseen because it was misspelled! Remove obsoeolete BUGS note that UEFI bootloader does not support multiboot To generate a diff of this commit: cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/share/man/man8/man8.x86/boot.8 cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/arch/i386/include/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/i386/include/multiboot2.h cvs rdiff -u -r1.72 -r1.72.4.1 src/sys/arch/i386/stand/boot/Makefile.boot cvs rdiff -u -r1.31 -r1.31.6.1 src/sys/arch/i386/stand/dosboot/Makefile cvs rdiff -u -r1.15 -r1.15.2.1 \ src/sys/arch/i386/stand/efiboot/Makefile.efiboot cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/arch/i386/stand/efiboot/boot.c cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/arch/i386/stand/efiboot/efiboot.c cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/i386/stand/efiboot/efiboot.h cvs rdiff -u -r1.6 -r1.6.6.1 src/sys/arch/i386/stand/efiboot/eficons.c cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/arch/i386/stand/efiboot/efimemory.c cvs
CVS commit: [netbsd-9] src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: martin
Date: Tue Sep 17 19:25:18 UTC 2019
Modified Files:
src/common/lib/libc/arch/arm/atomic [netbsd-9]: atomic_or_64.S
atomic_xor_64.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #202):
common/lib/libc/arch/arm/atomic/atomic_xor_64.S: revision 1.4
common/lib/libc/arch/arm/atomic/atomic_or_64.S: revision 1.11
__sync_{,x}or_and_fetch_8 should return new value... make it so.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.28.1 \
src/common/lib/libc/arch/arm/atomic/atomic_or_64.S
cvs rdiff -u -r1.3 -r1.3.32.1 \
src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-9] src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: martin
Date: Tue Sep 17 19:25:18 UTC 2019
Modified Files:
src/common/lib/libc/arch/arm/atomic [netbsd-9]: atomic_or_64.S
atomic_xor_64.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #202):
common/lib/libc/arch/arm/atomic/atomic_xor_64.S: revision 1.4
common/lib/libc/arch/arm/atomic/atomic_or_64.S: revision 1.11
__sync_{,x}or_and_fetch_8 should return new value... make it so.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.28.1 \
src/common/lib/libc/arch/arm/atomic/atomic_or_64.S
cvs rdiff -u -r1.3 -r1.3.32.1 \
src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_or_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_or_64.S:1.10 src/common/lib/libc/arch/arm/atomic/atomic_or_64.S:1.10.28.1
--- src/common/lib/libc/arch/arm/atomic/atomic_or_64.S:1.10 Tue Mar 4 16:15:28 2014
+++ src/common/lib/libc/arch/arm/atomic/atomic_or_64.S Tue Sep 17 19:25:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_or_64.S,v 1.10 2014/03/04 16:15:28 matt Exp $ */
+/* $NetBSD: atomic_or_64.S,v 1.10.28.1 2019/09/17 19:25:18 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -57,6 +57,6 @@ END(_atomic_or_64_nv)
STRONG_ALIAS(_atomic_or_64,_atomic_or_64_nv)
ATOMIC_OP_ALIAS(atomic_or_64_nv,_atomic_or_64_nv)
ATOMIC_OP_ALIAS(atomic_or_64,_atomic_or_64)
-CRT_ALIAS(__sync_or_and_fetch_8,_atomic_or_64)
+CRT_ALIAS(__sync_or_and_fetch_8,_atomic_or_64_nv)
#endif /* _ARM_ARCH_6 */
Index: src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S:1.3.32.1
--- src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S:1.3 Tue Mar 4 16:15:28 2014
+++ src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S Tue Sep 17 19:25:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_xor_64.S,v 1.3 2014/03/04 16:15:28 matt Exp $ */
+/* $NetBSD: atomic_xor_64.S,v 1.3.32.1 2019/09/17 19:25:18 martin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -57,6 +57,6 @@ END(_atomic_xor_64_nv)
STRONG_ALIAS(_atomic_xor_64,_atomic_xor_64_nv)
ATOMIC_OP_ALIAS(atomic_xor_64_nv,_atomic_xor_64_nv)
ATOMIC_OP_ALIAS(atomic_xor_64,_atomic_xor_64)
-CRT_ALIAS(__sync_xor_and_fetch_8,_atomic_xor_64)
+CRT_ALIAS(__sync_xor_and_fetch_8,_atomic_xor_64_nv)
#endif /* _ARM_ARCH_6 */
CVS commit: [netbsd-9] src/common/lib/libc/arch/aarch64/atomic
Module Name:src Committed By: martin Date: Tue Sep 17 19:23:23 UTC 2019 Modified Files: src/common/lib/libc/arch/aarch64/atomic [netbsd-9]: atomic_or_64.S Log Message: Pull up following revision(s) (requested by skrll in ticket #201): common/lib/libc/arch/aarch64/atomic/atomic_or_64.S: revision 1.2 __sync_or_and_fetch_8 should return new value... make it do that. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.28.1 \ src/common/lib/libc/arch/aarch64/atomic/atomic_or_64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/aarch64/atomic/atomic_or_64.S diff -u src/common/lib/libc/arch/aarch64/atomic/atomic_or_64.S:1.1 src/common/lib/libc/arch/aarch64/atomic/atomic_or_64.S:1.1.28.1 --- src/common/lib/libc/arch/aarch64/atomic/atomic_or_64.S:1.1 Sun Aug 10 05:47:35 2014 +++ src/common/lib/libc/arch/aarch64/atomic/atomic_or_64.S Tue Sep 17 19:23:23 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or_64.S,v 1.1 2014/08/10 05:47:35 matt Exp $ */ +/* $NetBSD: atomic_or_64.S,v 1.1.28.1 2019/09/17 19:23:23 martin Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -43,4 +43,4 @@ ATOMIC_OP64_NV(or, orr) STRONG_ALIAS(_atomic_or_ulong_nv,_atomic_or_64_nv) ATOMIC_OP_ALIAS(atomic_or_64_nv,_atomic_or_64_nv) ATOMIC_OP_ALIAS(atomic_or_ulong_nv,_atomic_or_64_nv) -STRONG_ALIAS(__sync_or_and_fetch_8,_atomic_or_64) +STRONG_ALIAS(__sync_or_and_fetch_8,_atomic_or_64_nv)
CVS commit: [netbsd-9] src/common/lib/libc/arch/aarch64/atomic
Module Name:src Committed By: martin Date: Tue Sep 17 19:23:23 UTC 2019 Modified Files: src/common/lib/libc/arch/aarch64/atomic [netbsd-9]: atomic_or_64.S Log Message: Pull up following revision(s) (requested by skrll in ticket #201): common/lib/libc/arch/aarch64/atomic/atomic_or_64.S: revision 1.2 __sync_or_and_fetch_8 should return new value... make it do that. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.28.1 \ src/common/lib/libc/arch/aarch64/atomic/atomic_or_64.S 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 Sep 17 18:59:49 UTC 2019
Modified Files:
src/doc [netbsd-8]: CHANGES-8.2
Log Message:
Tickets #1373, #1375, #1376, #1377 and #1378
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.36 -r1.1.2.37 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.36 src/doc/CHANGES-8.2:1.1.2.37
--- src/doc/CHANGES-8.2:1.1.2.36 Tue Sep 10 16:04:59 2019
+++ src/doc/CHANGES-8.2 Tue Sep 17 18:59:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.2,v 1.1.2.36 2019/09/10 16:04:59 martin Exp $
+# $NetBSD: CHANGES-8.2,v 1.1.2.37 2019/09/17 18:59:49 martin Exp $
A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2
release:
@@ -891,3 +891,155 @@ sys/netipsec/key.c1.266
Fix info leaks.
[maxv, ticket #1372]
+share/man/man8/man8.x86/boot.8 1.16,1.17
+sys/arch/i386/stand/boot/boot2.c 1.71,1.72 (patch)
+sys/arch/i386/stand/boot/devopen.c 1.9
+sys/arch/i386/stand/boot/devopen.h 1.5
+sys/arch/i386/stand/efiboot/boot.c 1.14,1.15 (patch)
+sys/arch/i386/stand/efiboot/devopen.c 1.6,1.7
+sys/arch/i386/stand/efiboot/devopen.h 1.4
+sys/arch/i386/stand/efiboot/efidisk.c 1.8
+sys/arch/i386/stand/lib/Makefile 1.46
+sys/arch/i386/stand/lib/biosdisk.c 1.50,1.51
+sys/arch/i386/stand/lib/biosdisk.h 1.11
+
+ Add GPT and RAIDframe support to bootloaders.
+ [manu, ticket #1373]
+
+common/lib/libc/arch/arm/atomic/atomic_or_64.S 1.11
+common/lib/libc/arch/arm/atomic/atomic_xor_64.S 1.4
+
+ arm: fix return values of __sync_{,x}or_and_fetch_8.
+ [skrll, ticket #1375]
+
+external/mit/expat/dist/conftools/test-driver up to 1.1.1.1
+external/mit/expat/dist/conftools/ar-libup to 1.1.1.1
+external/mit/expat/dist/conftools/ax-append-compile-flags.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-append-flag.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-append-link-flags.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-check-compile-flag.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-check-link-flag.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/ax-require-defined.m4 up to 1.1.1.1
+external/mit/expat/dist/conftools/compile up to 1.1.1.1
+external/mit/expat/dist/conftools/depcomp up to 1.1.1.1
+external/mit/expat/dist/conftools/missing up to 1.1.1.1
+external/mit/expat/dist/conftools/expatcfg-compiler-supports-visibility.m4 up to 1.1.1.1
+external/mit/expat/dist/doc/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/doc/Makefile.in up to 1.1.1.1
+external/mit/expat/dist/examples/Makefile.amup to 1.1.1.1
+external/mit/expat/dist/examples/Makefile.inup to 1.1.1.1
+external/mit/expat/dist/lib/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/lib/Makefile.in up to 1.1.1.1
+external/mit/expat/dist/tests/benchmark/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/tests/benchmark/Makefile.in up to 1.1.1.1
+external/mit/expat/dist/tests/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/tests/Makefile.in up to 1.1.1.1
+external/mit/expat/dist/tests/structdata.c up to 1.1.1.1
+external/mit/expat/dist/tests/structdata.h up to 1.1.1.1
+external/mit/expat/dist/tests/udiffer.pyup to 1.1.1.1
+external/mit/expat/dist/tests/xmltest.log.expected up to 1.1.1.1
+external/mit/expat/dist/win32/build_expat_iss.bat up to 1.1.1.1
+external/mit/expat/dist/xmlwf/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/xmlwf/Makefile.in up to 1.1.1.1
+external/mit/expat/dist/xmlwf/xmlwf_helpgen.py up to 1.1.1.1
+external/mit/expat/dist/xmlwf/xmlwf_helpgen.sh up to 1.1.1.1
+external/mit/expat/dist/Makefile.am up to 1.1.1.1
+external/mit/expat/dist/README.md up to 1.1.1.1
+external/mit/expat/dist/cmake/expat-config.cmake.in up to 1.1.1.1
+external/mit/expat/dist/cmake/mingw-toolchain.cmake up to 1.1.1.1
+external/mit/expat/dist/acinclude.m4up to 1.1.1.1
+external/mit/expat/dist/fix-xmltest-log.sh up to 1.1.1.1
+external/mit/expat/dist/test-driver-wrapper.sh up to 1.1.1.1
+external/mit/expat/dist/MANIFESTdelete
+external/mit/expat/dist/README delete
+external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 delete
+external/mit/expat/dist/conftools/mkinstalldirs delete
+external/mit/expat/dist/xmlwf/xmlurl.h delete
+external/mit/expat/dist/xmlwf/xmlwin32url.cxx delete
+external/mit/expat/dist/CMake.READMEup to 1.1.1.5
+external/mit/expat/dist/CMakeLists.txt up to 1.1.1.5
+external/mit/expat/dist/Changes up to 1.1.1.6
+external/mit/expat/dist/ConfigureChecks.cmake up to 1.1.1.2
+external/mit/expat/dist/Makefile.in up to 1.1.1.6
+external/mit/expat/dist/aclocal.m4 up to 1.1.1.4
+external/mit/expat/dist/configure up to
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Sep 17 18:59:49 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1373, #1375, #1376, #1377 and #1378 To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys
Module Name:src Committed By: martin Date: Tue Sep 17 18:57:23 UTC 2019 Modified Files: src/sys/netinet [netbsd-8]: ip_input.c src/sys/netinet6 [netbsd-8]: ip6_input.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1378): sys/netinet6/ip6_input.c: revision 1.209 (patch) sys/netinet/ip_input.c: revision 1.390 (patch) Packet filters can return an mbuf chain with fragmented headers, so m_pullup() it if needed and remove the KASSERT()s. To generate a diff of this commit: cvs rdiff -u -r1.355.2.6 -r1.355.2.7 src/sys/netinet/ip_input.c cvs rdiff -u -r1.178.2.7 -r1.178.2.8 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.
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Tue Sep 17 18:57:23 UTC 2019
Modified Files:
src/sys/netinet [netbsd-8]: ip_input.c
src/sys/netinet6 [netbsd-8]: ip6_input.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1378):
sys/netinet6/ip6_input.c: revision 1.209 (patch)
sys/netinet/ip_input.c: revision 1.390 (patch)
Packet filters can return an mbuf chain with fragmented headers, so
m_pullup() it if needed and remove the KASSERT()s.
To generate a diff of this commit:
cvs rdiff -u -r1.355.2.6 -r1.355.2.7 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.178.2.7 -r1.178.2.8 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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.355.2.6 src/sys/netinet/ip_input.c:1.355.2.7
--- src/sys/netinet/ip_input.c:1.355.2.6 Sun Mar 18 10:57:01 2018
+++ src/sys/netinet/ip_input.c Tue Sep 17 18:57:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.355.2.6 2018/03/18 10:57:01 martin Exp $ */
+/* $NetBSD: ip_input.c,v 1.355.2.7 2019/09/17 18:57:23 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.355.2.6 2018/03/18 10:57:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.355.2.7 2019/09/17 18:57:23 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -620,8 +620,25 @@ ip_input(struct mbuf *m)
m = NULL;
goto out;
}
+ if (__predict_false(m->m_len < sizeof (struct ip))) {
+ if ((m = m_pullup(m, sizeof (struct ip))) == NULL) {
+IP_STATINC(IP_STAT_TOOSMALL);
+goto out;
+ }
+ }
ip = mtod(m, struct ip *);
hlen = ip->ip_hl << 2;
+ if (hlen < sizeof(struct ip)) { /* minimum header length */
+ IP_STATINC(IP_STAT_BADHLEN);
+ goto out;
+ }
+ if (hlen > m->m_len) {
+ if ((m = m_pullup(m, hlen)) == NULL) {
+IP_STATINC(IP_STAT_BADHLEN);
+goto out;
+ }
+ ip = mtod(m, struct ip *);
+ }
/*
* XXX The setting of "srcrt" here is to prevent ip_forward()
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.178.2.7 src/sys/netinet6/ip6_input.c:1.178.2.8
--- src/sys/netinet6/ip6_input.c:1.178.2.7 Mon Apr 9 13:34:10 2018
+++ src/sys/netinet6/ip6_input.c Tue Sep 17 18:57:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.178.2.7 2018/04/09 13:34:10 bouyer Exp $ */
+/* $NetBSD: ip6_input.c,v 1.178.2.8 2019/09/17 18:57:23 martin 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.178.2.7 2018/04/09 13:34:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.178.2.8 2019/09/17 18:57:23 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -358,6 +358,13 @@ ip6_input(struct mbuf *m, struct ifnet *
return;
if (m == NULL)
return;
+ if (__predict_false(m->m_len < sizeof(struct ip6_hdr))) {
+ if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == NULL) {
+IP6_STATINC(IP6_STAT_TOOSMALL);
+in6_ifstat_inc(rcvif, ifs6_in_hdrerr);
+return;
+ }
+ }
ip6 = mtod(m, struct ip6_hdr *);
srcrt = !IN6_ARE_ADDR_EQUAL(, >ip6_dst);
}
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Tue Sep 17 18:53:52 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-8]: xhci.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1377):
sys/dev/usb/xhci.c: revision 1.113
sys/dev/usb/xhci.c: revision 1.109
match xhci version 3.10. allows properly finding all the USB
busses on new ryzen 3 based systems.
unfortunately, the USB busses are still non-functional.
-
fix ryzen usb issue: we set TD size to '1', where has xhci spec 4.11.2.4
says final TRB for a TD should have this set to '0'. since we currently
only generate sinel TRB TDs, set this to 0.
XXX: pullup-all
from sc.dying
To generate a diff of this commit:
cvs rdiff -u -r1.72.2.10 -r1.72.2.11 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.72.2.10 src/sys/dev/usb/xhci.c:1.72.2.11
--- src/sys/dev/usb/xhci.c:1.72.2.10 Fri Jan 4 14:55:40 2019
+++ src/sys/dev/usb/xhci.c Tue Sep 17 18:53:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.72.2.10 2019/01/04 14:55:40 martin Exp $ */
+/* $NetBSD: xhci.c,v 1.72.2.11 2019/09/17 18:53:52 martin Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.72.2.10 2019/01/04 14:55:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.72.2.11 2019/09/17 18:53:52 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -755,6 +755,8 @@ hexdump(const char *msg, const void *bas
static void
xhci_id_protocols(struct xhci_softc *sc, bus_size_t ecp)
{
+ XHCIHIST_FUNC(); XHCIHIST_CALLED();
+
/* XXX Cache this lot */
const uint32_t w0 = xhci_read_4(sc, ecp);
@@ -778,6 +780,7 @@ xhci_id_protocols(struct xhci_softc *sc,
case 0x0200:
case 0x0300:
case 0x0301:
+ case 0x0310:
aprint_debug_dev(sc->sc_dev, " %s ports %d - %d\n",
major == 3 ? "ss" : "hs", cpo, cpo + cpc -1);
break;
@@ -3832,7 +3835,7 @@ xhci_device_ctrl_start(struct usbd_xfer
parameter = DMAADDR(dma, 0);
KASSERTMSG(len <= 0x1, "len %d", len);
status = XHCI_TRB_2_IRQ_SET(0) |
- XHCI_TRB_2_TDSZ_SET(1) |
+ XHCI_TRB_2_TDSZ_SET(0) |
XHCI_TRB_2_BYTES_SET(len);
control = (isread ? XHCI_TRB_3_DIR_IN : 0) |
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_DATA_STAGE) |
@@ -3963,7 +3966,7 @@ xhci_device_bulk_start(struct usbd_xfer
*/
KASSERTMSG(len <= 0x1, "len %d", len);
status = XHCI_TRB_2_IRQ_SET(0) |
- XHCI_TRB_2_TDSZ_SET(1) |
+ XHCI_TRB_2_TDSZ_SET(0) |
XHCI_TRB_2_BYTES_SET(len);
control = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL) |
(usbd_xfer_isread(xfer) ? XHCI_TRB_3_ISP_BIT : 0) |
@@ -4075,7 +4078,7 @@ xhci_device_intr_start(struct usbd_xfer
parameter = DMAADDR(dma, 0);
KASSERTMSG(len <= 0x1, "len %d", len);
status = XHCI_TRB_2_IRQ_SET(0) |
- XHCI_TRB_2_TDSZ_SET(1) |
+ XHCI_TRB_2_TDSZ_SET(0) |
XHCI_TRB_2_BYTES_SET(len);
control = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL) |
(usbd_xfer_isread(xfer) ? XHCI_TRB_3_ISP_BIT : 0) |
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src Committed By: martin Date: Tue Sep 17 18:53:52 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-8]: xhci.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1377): sys/dev/usb/xhci.c: revision 1.113 sys/dev/usb/xhci.c: revision 1.109 match xhci version 3.10. allows properly finding all the USB busses on new ryzen 3 based systems. unfortunately, the USB busses are still non-functional. - fix ryzen usb issue: we set TD size to '1', where has xhci spec 4.11.2.4 says final TRB for a TD should have this set to '0'. since we currently only generate sinel TRB TDs, set this to 0. XXX: pullup-all from sc.dying To generate a diff of this commit: cvs rdiff -u -r1.72.2.10 -r1.72.2.11 src/sys/dev/usb/xhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Tue Sep 17 18:50:07 UTC 2019 Modified Files: src/doc [netbsd-8]: 3RDPARTY src/external/mit/expat/dist [netbsd-8]: CMake.README CMakeLists.txt Changes ConfigureChecks.cmake Makefile.in aclocal.m4 configure configure.ac expat_config.h.cmake expat_config.h.in src/external/mit/expat/dist/conftools [netbsd-8]: config.guess config.sub get-version.sh install-sh ltmain.sh src/external/mit/expat/dist/doc [netbsd-8]: reference.html xmlwf.1 xmlwf.xml src/external/mit/expat/dist/examples [netbsd-8]: elements.c outline.c src/external/mit/expat/dist/lib [netbsd-8]: ascii.h asciitab.h expat.h expat_external.h iasciitab.h internal.h latin1tab.h libexpat.def libexpatw.def nametab.h siphash.h utf8tab.h winconfig.h xmlparse.c xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c src/external/mit/expat/dist/tests [netbsd-8]: chardata.c chardata.h memcheck.c memcheck.h minicheck.c minicheck.h runtests.c runtestspp.cpp xmltest.sh src/external/mit/expat/dist/tests/benchmark [netbsd-8]: benchmark.c src/external/mit/expat/dist/win32 [netbsd-8]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-8]: codepage.c codepage.h ct.c filemap.h readfilemap.c unixfilemap.c win32filemap.c xmlfile.c xmlfile.h xmlmime.c xmlmime.h xmltchar.h xmlwf.c src/external/mit/expat/lib/libexpat [netbsd-8]: expat_config.h src/external/mit/xorg/tools/fc-cache [netbsd-8]: Makefile Added Files: src/external/mit/expat/dist [netbsd-8]: Makefile.am README.md acinclude.m4 fix-xmltest-log.sh test-driver-wrapper.sh src/external/mit/expat/dist/cmake [netbsd-8]: expat-config.cmake.in mingw-toolchain.cmake src/external/mit/expat/dist/conftools [netbsd-8]: ar-lib ax-append-compile-flags.m4 ax-append-flag.m4 ax-append-link-flags.m4 ax-check-compile-flag.m4 ax-check-link-flag.m4 ax-require-defined.m4 compile depcomp expatcfg-compiler-supports-visibility.m4 missing test-driver src/external/mit/expat/dist/doc [netbsd-8]: Makefile.am Makefile.in src/external/mit/expat/dist/examples [netbsd-8]: Makefile.am Makefile.in src/external/mit/expat/dist/lib [netbsd-8]: Makefile.am Makefile.in src/external/mit/expat/dist/tests [netbsd-8]: Makefile.am Makefile.in structdata.c structdata.h udiffer.py xmltest.log.expected src/external/mit/expat/dist/tests/benchmark [netbsd-8]: Makefile.am Makefile.in src/external/mit/expat/dist/win32 [netbsd-8]: build_expat_iss.bat src/external/mit/expat/dist/xmlwf [netbsd-8]: Makefile.am Makefile.in xmlwf_helpgen.py xmlwf_helpgen.sh Removed Files: src/external/mit/expat/dist [netbsd-8]: MANIFEST README src/external/mit/expat/dist/conftools [netbsd-8]: ac_c_bigendian_cross.m4 mkinstalldirs src/external/mit/expat/dist/xmlwf [netbsd-8]: xmlurl.h xmlwin32url.cxx Log Message: Sync external/mit/expat to current and pull up the following revisions, requested by maya in ticket #1376: external/mit/expat/dist/conftools/test-driver up to 1.1.1.1 external/mit/expat/dist/conftools/ar-libup to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-compile-flags.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-link-flags.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-check-compile-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-check-link-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-require-defined.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/compile up to 1.1.1.1 external/mit/expat/dist/conftools/depcomp up to 1.1.1.1 external/mit/expat/dist/conftools/missing up to 1.1.1.1 external/mit/expat/dist/conftools/expatcfg-compiler-supports-visibility.m4 up to 1.1.1.1 external/mit/expat/dist/doc/Makefile.am up to 1.1.1.1 external/mit/expat/dist/doc/Makefile.in up to 1.1.1.1 external/mit/expat/dist/examples/Makefile.amup to 1.1.1.1 external/mit/expat/dist/examples/Makefile.inup to 1.1.1.1 external/mit/expat/dist/lib/Makefile.am up to 1.1.1.1 external/mit/expat/dist/lib/Makefile.in up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/Makefile.am up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/Makefile.in up to 1.1.1.1 external/mit/expat/dist/tests/Makefile.am up to 1.1.1.1 external/mit/expat/dist/tests/Makefile.in up to 1.1.1.1
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Tue Sep 17 18:50:07 UTC 2019 Modified Files: src/doc [netbsd-8]: 3RDPARTY src/external/mit/expat/dist [netbsd-8]: CMake.README CMakeLists.txt Changes ConfigureChecks.cmake Makefile.in aclocal.m4 configure configure.ac expat_config.h.cmake expat_config.h.in src/external/mit/expat/dist/conftools [netbsd-8]: config.guess config.sub get-version.sh install-sh ltmain.sh src/external/mit/expat/dist/doc [netbsd-8]: reference.html xmlwf.1 xmlwf.xml src/external/mit/expat/dist/examples [netbsd-8]: elements.c outline.c src/external/mit/expat/dist/lib [netbsd-8]: ascii.h asciitab.h expat.h expat_external.h iasciitab.h internal.h latin1tab.h libexpat.def libexpatw.def nametab.h siphash.h utf8tab.h winconfig.h xmlparse.c xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c src/external/mit/expat/dist/tests [netbsd-8]: chardata.c chardata.h memcheck.c memcheck.h minicheck.c minicheck.h runtests.c runtestspp.cpp xmltest.sh src/external/mit/expat/dist/tests/benchmark [netbsd-8]: benchmark.c src/external/mit/expat/dist/win32 [netbsd-8]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-8]: codepage.c codepage.h ct.c filemap.h readfilemap.c unixfilemap.c win32filemap.c xmlfile.c xmlfile.h xmlmime.c xmlmime.h xmltchar.h xmlwf.c src/external/mit/expat/lib/libexpat [netbsd-8]: expat_config.h src/external/mit/xorg/tools/fc-cache [netbsd-8]: Makefile Added Files: src/external/mit/expat/dist [netbsd-8]: Makefile.am README.md acinclude.m4 fix-xmltest-log.sh test-driver-wrapper.sh src/external/mit/expat/dist/cmake [netbsd-8]: expat-config.cmake.in mingw-toolchain.cmake src/external/mit/expat/dist/conftools [netbsd-8]: ar-lib ax-append-compile-flags.m4 ax-append-flag.m4 ax-append-link-flags.m4 ax-check-compile-flag.m4 ax-check-link-flag.m4 ax-require-defined.m4 compile depcomp expatcfg-compiler-supports-visibility.m4 missing test-driver src/external/mit/expat/dist/doc [netbsd-8]: Makefile.am Makefile.in src/external/mit/expat/dist/examples [netbsd-8]: Makefile.am Makefile.in src/external/mit/expat/dist/lib [netbsd-8]: Makefile.am Makefile.in src/external/mit/expat/dist/tests [netbsd-8]: Makefile.am Makefile.in structdata.c structdata.h udiffer.py xmltest.log.expected src/external/mit/expat/dist/tests/benchmark [netbsd-8]: Makefile.am Makefile.in src/external/mit/expat/dist/win32 [netbsd-8]: build_expat_iss.bat src/external/mit/expat/dist/xmlwf [netbsd-8]: Makefile.am Makefile.in xmlwf_helpgen.py xmlwf_helpgen.sh Removed Files: src/external/mit/expat/dist [netbsd-8]: MANIFEST README src/external/mit/expat/dist/conftools [netbsd-8]: ac_c_bigendian_cross.m4 mkinstalldirs src/external/mit/expat/dist/xmlwf [netbsd-8]: xmlurl.h xmlwin32url.cxx Log Message: Sync external/mit/expat to current and pull up the following revisions, requested by maya in ticket #1376: external/mit/expat/dist/conftools/test-driver up to 1.1.1.1 external/mit/expat/dist/conftools/ar-libup to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-compile-flags.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-append-link-flags.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-check-compile-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-check-link-flag.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/ax-require-defined.m4 up to 1.1.1.1 external/mit/expat/dist/conftools/compile up to 1.1.1.1 external/mit/expat/dist/conftools/depcomp up to 1.1.1.1 external/mit/expat/dist/conftools/missing up to 1.1.1.1 external/mit/expat/dist/conftools/expatcfg-compiler-supports-visibility.m4 up to 1.1.1.1 external/mit/expat/dist/doc/Makefile.am up to 1.1.1.1 external/mit/expat/dist/doc/Makefile.in up to 1.1.1.1 external/mit/expat/dist/examples/Makefile.amup to 1.1.1.1 external/mit/expat/dist/examples/Makefile.inup to 1.1.1.1 external/mit/expat/dist/lib/Makefile.am up to 1.1.1.1 external/mit/expat/dist/lib/Makefile.in up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/Makefile.am up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/Makefile.in up to 1.1.1.1 external/mit/expat/dist/tests/Makefile.am up to 1.1.1.1 external/mit/expat/dist/tests/Makefile.in up to 1.1.1.1
CVS commit: [netbsd-8] src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: martin
Date: Tue Sep 17 18:33:38 UTC 2019
Modified Files:
src/common/lib/libc/arch/arm/atomic [netbsd-8]: atomic_or_64.S
atomic_xor_64.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1375):
common/lib/libc/arch/arm/atomic/atomic_xor_64.S: revision 1.4
common/lib/libc/arch/arm/atomic/atomic_or_64.S: revision 1.11
__sync_{,x}or_and_fetch_8 should return new value... make it so.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.18.1 \
src/common/lib/libc/arch/arm/atomic/atomic_or_64.S
cvs rdiff -u -r1.3 -r1.3.22.1 \
src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_or_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_or_64.S:1.10 src/common/lib/libc/arch/arm/atomic/atomic_or_64.S:1.10.18.1
--- src/common/lib/libc/arch/arm/atomic/atomic_or_64.S:1.10 Tue Mar 4 16:15:28 2014
+++ src/common/lib/libc/arch/arm/atomic/atomic_or_64.S Tue Sep 17 18:33:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_or_64.S,v 1.10 2014/03/04 16:15:28 matt Exp $ */
+/* $NetBSD: atomic_or_64.S,v 1.10.18.1 2019/09/17 18:33:38 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -57,6 +57,6 @@ END(_atomic_or_64_nv)
STRONG_ALIAS(_atomic_or_64,_atomic_or_64_nv)
ATOMIC_OP_ALIAS(atomic_or_64_nv,_atomic_or_64_nv)
ATOMIC_OP_ALIAS(atomic_or_64,_atomic_or_64)
-CRT_ALIAS(__sync_or_and_fetch_8,_atomic_or_64)
+CRT_ALIAS(__sync_or_and_fetch_8,_atomic_or_64_nv)
#endif /* _ARM_ARCH_6 */
Index: src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S:1.3.22.1
--- src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S:1.3 Tue Mar 4 16:15:28 2014
+++ src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S Tue Sep 17 18:33:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_xor_64.S,v 1.3 2014/03/04 16:15:28 matt Exp $ */
+/* $NetBSD: atomic_xor_64.S,v 1.3.22.1 2019/09/17 18:33:38 martin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -57,6 +57,6 @@ END(_atomic_xor_64_nv)
STRONG_ALIAS(_atomic_xor_64,_atomic_xor_64_nv)
ATOMIC_OP_ALIAS(atomic_xor_64_nv,_atomic_xor_64_nv)
ATOMIC_OP_ALIAS(atomic_xor_64,_atomic_xor_64)
-CRT_ALIAS(__sync_xor_and_fetch_8,_atomic_xor_64)
+CRT_ALIAS(__sync_xor_and_fetch_8,_atomic_xor_64_nv)
#endif /* _ARM_ARCH_6 */
CVS commit: [netbsd-8] src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: martin
Date: Tue Sep 17 18:33:38 UTC 2019
Modified Files:
src/common/lib/libc/arch/arm/atomic [netbsd-8]: atomic_or_64.S
atomic_xor_64.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1375):
common/lib/libc/arch/arm/atomic/atomic_xor_64.S: revision 1.4
common/lib/libc/arch/arm/atomic/atomic_or_64.S: revision 1.11
__sync_{,x}or_and_fetch_8 should return new value... make it so.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.18.1 \
src/common/lib/libc/arch/arm/atomic/atomic_or_64.S
cvs rdiff -u -r1.3 -r1.3.22.1 \
src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Tue Sep 17 18:26:53 UTC 2019 Modified Files: src/share/man/man8/man8.x86 [netbsd-8]: boot.8 src/sys/arch/i386/stand/boot [netbsd-8]: boot2.c devopen.c devopen.h src/sys/arch/i386/stand/efiboot [netbsd-8]: boot.c devopen.c devopen.h efidisk.c src/sys/arch/i386/stand/lib [netbsd-8]: Makefile biosdisk.c biosdisk.h Log Message: Pull up following revision(s) (requested by manu in ticket #1373): sys/arch/i386/stand/boot/boot2.c: revision 1.72 (patch) sys/arch/i386/stand/lib/biosdisk.c: revision 1.50 sys/arch/i386/stand/lib/biosdisk.c: revision 1.51 sys/arch/i386/stand/efiboot/devopen.c: revision 1.6 sys/arch/i386/stand/efiboot/devopen.h: revision 1.4 sys/arch/i386/stand/efiboot/devopen.c: revision 1.7 sys/arch/i386/stand/efiboot/efidisk.c: revision 1.8 share/man/man8/man8.x86/boot.8: revision 1.16 share/man/man8/man8.x86/boot.8: revision 1.17 sys/arch/i386/stand/lib/Makefile: revision 1.46 sys/arch/i386/stand/boot/devopen.h: revision 1.5 sys/arch/i386/stand/boot/devopen.c: revision 1.9 sys/arch/i386/stand/efiboot/boot.c: revision 1.14 (patch) sys/arch/i386/stand/efiboot/boot.c: revision 1.15 sys/arch/i386/stand/lib/biosdisk.h: revision 1.11 sys/arch/i386/stand/boot/boot2.c: revision 1.71 Add GPT and RAIDframe support to bootloaders Classic BIOS (/boot) and EFI bootloaders can now name devices using the NAME=gpt_label syntax, or using raid partitions. Here are examples: boot NAME=root:/netbsd boot raid0e:/netbsd Correct the memset(3)'s third argument in i386 biosdisk.c The size of allocation is the size of the structure biosdisk, not the size of a pointer. Document new GPT and RAIDframe capacity of bootstrap code While there, also document EFI setup and some bugs Typo fixes, 'file system'; new sentence, new line; expand IA-32. Bump date for previous. Make sure devices names are copied including last byte Fix from M. Levinson. To generate a diff of this commit: cvs rdiff -u -r1.11.4.1 -r1.11.4.2 src/share/man/man8/man8.x86/boot.8 cvs rdiff -u -r1.66 -r1.66.10.1 src/sys/arch/i386/stand/boot/boot2.c cvs rdiff -u -r1.8 -r1.8.52.1 src/sys/arch/i386/stand/boot/devopen.c cvs rdiff -u -r1.4 -r1.4.52.1 src/sys/arch/i386/stand/boot/devopen.h cvs rdiff -u -r1.5.2.6 -r1.5.2.7 src/sys/arch/i386/stand/efiboot/boot.c cvs rdiff -u -r1.1.12.4 -r1.1.12.5 src/sys/arch/i386/stand/efiboot/devopen.c cvs rdiff -u -r1.1.12.2 -r1.1.12.3 src/sys/arch/i386/stand/efiboot/devopen.h cvs rdiff -u -r1.1.12.6 -r1.1.12.7 src/sys/arch/i386/stand/efiboot/efidisk.c cvs rdiff -u -r1.44 -r1.44.10.1 src/sys/arch/i386/stand/lib/Makefile cvs rdiff -u -r1.46.6.3 -r1.46.6.4 src/sys/arch/i386/stand/lib/biosdisk.c cvs rdiff -u -r1.8.52.2 -r1.8.52.3 src/sys/arch/i386/stand/lib/biosdisk.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Tue Sep 17 18:26:53 UTC 2019 Modified Files: src/share/man/man8/man8.x86 [netbsd-8]: boot.8 src/sys/arch/i386/stand/boot [netbsd-8]: boot2.c devopen.c devopen.h src/sys/arch/i386/stand/efiboot [netbsd-8]: boot.c devopen.c devopen.h efidisk.c src/sys/arch/i386/stand/lib [netbsd-8]: Makefile biosdisk.c biosdisk.h Log Message: Pull up following revision(s) (requested by manu in ticket #1373): sys/arch/i386/stand/boot/boot2.c: revision 1.72 (patch) sys/arch/i386/stand/lib/biosdisk.c: revision 1.50 sys/arch/i386/stand/lib/biosdisk.c: revision 1.51 sys/arch/i386/stand/efiboot/devopen.c: revision 1.6 sys/arch/i386/stand/efiboot/devopen.h: revision 1.4 sys/arch/i386/stand/efiboot/devopen.c: revision 1.7 sys/arch/i386/stand/efiboot/efidisk.c: revision 1.8 share/man/man8/man8.x86/boot.8: revision 1.16 share/man/man8/man8.x86/boot.8: revision 1.17 sys/arch/i386/stand/lib/Makefile: revision 1.46 sys/arch/i386/stand/boot/devopen.h: revision 1.5 sys/arch/i386/stand/boot/devopen.c: revision 1.9 sys/arch/i386/stand/efiboot/boot.c: revision 1.14 (patch) sys/arch/i386/stand/efiboot/boot.c: revision 1.15 sys/arch/i386/stand/lib/biosdisk.h: revision 1.11 sys/arch/i386/stand/boot/boot2.c: revision 1.71 Add GPT and RAIDframe support to bootloaders Classic BIOS (/boot) and EFI bootloaders can now name devices using the NAME=gpt_label syntax, or using raid partitions. Here are examples: boot NAME=root:/netbsd boot raid0e:/netbsd Correct the memset(3)'s third argument in i386 biosdisk.c The size of allocation is the size of the structure biosdisk, not the size of a pointer. Document new GPT and RAIDframe capacity of bootstrap code While there, also document EFI setup and some bugs Typo fixes, 'file system'; new sentence, new line; expand IA-32. Bump date for previous. Make sure devices names are copied including last byte Fix from M. Levinson. To generate a diff of this commit: cvs rdiff -u -r1.11.4.1 -r1.11.4.2 src/share/man/man8/man8.x86/boot.8 cvs rdiff -u -r1.66 -r1.66.10.1 src/sys/arch/i386/stand/boot/boot2.c cvs rdiff -u -r1.8 -r1.8.52.1 src/sys/arch/i386/stand/boot/devopen.c cvs rdiff -u -r1.4 -r1.4.52.1 src/sys/arch/i386/stand/boot/devopen.h cvs rdiff -u -r1.5.2.6 -r1.5.2.7 src/sys/arch/i386/stand/efiboot/boot.c cvs rdiff -u -r1.1.12.4 -r1.1.12.5 src/sys/arch/i386/stand/efiboot/devopen.c cvs rdiff -u -r1.1.12.2 -r1.1.12.3 src/sys/arch/i386/stand/efiboot/devopen.h cvs rdiff -u -r1.1.12.6 -r1.1.12.7 src/sys/arch/i386/stand/efiboot/efidisk.c cvs rdiff -u -r1.44 -r1.44.10.1 src/sys/arch/i386/stand/lib/Makefile cvs rdiff -u -r1.46.6.3 -r1.46.6.4 src/sys/arch/i386/stand/lib/biosdisk.c cvs rdiff -u -r1.8.52.2 -r1.8.52.3 src/sys/arch/i386/stand/lib/biosdisk.h 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/man8/man8.x86/boot.8 diff -u src/share/man/man8/man8.x86/boot.8:1.11.4.1 src/share/man/man8/man8.x86/boot.8:1.11.4.2 --- src/share/man/man8/man8.x86/boot.8:1.11.4.1 Mon Sep 2 16:39:24 2019 +++ src/share/man/man8/man8.x86/boot.8 Tue Sep 17 18:26:53 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot.8,v 1.11.4.1 2019/09/02 16:39:24 martin Exp $ +.\" $NetBSD: boot.8,v 1.11.4.2 2019/09/17 18:26:53 martin Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94 .\" -.Dd February 17, 2017 +.Dd September 13, 2019 .Dt BOOT 8 x86 .Os .Sh NAME @@ -40,13 +40,9 @@ .Nd system bootstrapping procedures .Sh DESCRIPTION -.Tn IA-32 -computers -.Po -the +Intel Architecture, 32-bit (IA-32) computers (the .Tn IBM PC -and its clones -.Pc +and its clones) that can run .Nx Ns /i386 or @@ -60,6 +56,11 @@ bootstrap .Nx from the system .Tn BIOS +.It efiboot +bootstrap +.Nx +from the system +.Tn UEFI .It Xr x86/dosboot 8 bootstrap .Nx @@ -175,12 +176,32 @@ input of these commands: .It Ic boot Oo Va device : Oc Ns Oo Va filename Oc Oo Fl 1234abcdmqsvxz Oc The default .Va device -will be set to the disk that the boot loader was -loaded from. +will be set to the disk from which the boot loader was loaded. +The partition is set to the first match in this list: +.Bl -enum -compact +.It +The first +.Xr gpt 8 +partition with the +.Va bootme +attribute set. +.It +The partition from which the boot loader was loaded from, if that +can be detected. +.It +The first partition with a file system that could be bootable. +.It +The first partition. +.El To boot from an alternate disk, the full name of the device should be given at the prompt. .Va device is of the form +.Va NAME=partition_label +when booting from a +.Xr gpt 8 +partitioned disk. +Otherwise, the syntax is .Xo Va xd .Op Va N Ns
CVS commit: [netbsd-7-0] src/sys
Module Name:src
Committed By: martin
Date: Tue Sep 17 18:09:37 UTC 2019
Modified Files:
src/sys/netinet [netbsd-7-0]: ip_input.c
src/sys/netinet6 [netbsd-7-0]: ip6_input.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1708):
sys/netinet6/ip6_input.c: revision 1.209 via patch
sys/netinet/ip_input.c: revision 1.390 via patch
Packet filters can return an mbuf chain with fragmented headers, so
m_pullup() it if needed and remove the KASSERT()s.
To generate a diff of this commit:
cvs rdiff -u -r1.319.6.1 -r1.319.6.2 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.149.2.1.2.2 -r1.149.2.1.2.3 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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.319.6.1 src/sys/netinet/ip_input.c:1.319.6.2
--- src/sys/netinet/ip_input.c:1.319.6.1 Fri Feb 9 14:06:25 2018
+++ src/sys/netinet/ip_input.c Tue Sep 17 18:09:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.319.6.1 2018/02/09 14:06:25 martin Exp $ */
+/* $NetBSD: ip_input.c,v 1.319.6.2 2019/09/17 18:09:37 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.319.6.1 2018/02/09 14:06:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.319.6.2 2019/09/17 18:09:37 martin Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -526,8 +526,25 @@ ip_input(struct mbuf *m)
if (freed || m == NULL) {
return;
}
+ if (__predict_false(m->m_len < sizeof (struct ip))) {
+ if ((m = m_pullup(m, sizeof (struct ip))) == NULL) {
+IP_STATINC(IP_STAT_TOOSMALL);
+return;
+ }
+ }
ip = mtod(m, struct ip *);
hlen = ip->ip_hl << 2;
+ if (hlen < sizeof(struct ip)) { /* minimum header length */
+ IP_STATINC(IP_STAT_BADHLEN);
+ goto bad;
+ }
+ if (hlen > m->m_len) {
+ if ((m = m_pullup(m, hlen)) == NULL) {
+IP_STATINC(IP_STAT_BADHLEN);
+return;
+ }
+ ip = mtod(m, struct ip *);
+ }
/*
* XXX The setting of "srcrt" here is to prevent ip_forward()
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.149.2.1.2.2 src/sys/netinet6/ip6_input.c:1.149.2.1.2.3
--- src/sys/netinet6/ip6_input.c:1.149.2.1.2.2 Sun Feb 25 23:17:22 2018
+++ src/sys/netinet6/ip6_input.c Tue Sep 17 18:09:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.149.2.1.2.2 2018/02/25 23:17:22 snj Exp $ */
+/* $NetBSD: ip6_input.c,v 1.149.2.1.2.3 2019/09/17 18:09:37 martin 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.149.2.1.2.2 2018/02/25 23:17:22 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.149.2.1.2.3 2019/09/17 18:09:37 martin Exp $");
#include "opt_gateway.h"
#include "opt_inet.h"
@@ -352,6 +352,14 @@ ip6_input(struct mbuf *m)
return;
if (m == NULL)
return;
+ if (__predict_false(m->m_len < sizeof(struct ip6_hdr))) {
+ struct ifnet *inifp = m->m_pkthdr.rcvif;
+ if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == NULL) {
+IP6_STATINC(IP6_STAT_TOOSMALL);
+in6_ifstat_inc(inifp, ifs6_in_hdrerr);
+return;
+ }
+ }
ip6 = mtod(m, struct ip6_hdr *);
srcrt = !IN6_ARE_ADDR_EQUAL(, >ip6_dst);
}
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Tue Sep 17 18:10:00 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1708 To generate a diff of this commit: cvs rdiff -u -r1.1.2.150 -r1.1.2.151 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.150 src/doc/CHANGES-7.0.3:1.1.2.151 --- src/doc/CHANGES-7.0.3:1.1.2.150 Tue Sep 17 17:36:58 2019 +++ src/doc/CHANGES-7.0.3 Tue Sep 17 18:10:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.150 2019/09/17 17:36:58 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.151 2019/09/17 18:10:00 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5889,3 +5889,10 @@ lib/libc/nameser/ns_name.c 1.12 Fix buffer overrun. [maya, ticket #1706] +sys/netinet/ip_input.c1.390 (patch) +sys/netinet6/ip6_input.c 1.209 (patch) + + Packet filters can return an mbuf chain with fragmented headers, so + m_pullup() when needed. + [bouyer, ticket #1708] +
CVS commit: [netbsd-7-0] src/sys
Module Name:src Committed By: martin Date: Tue Sep 17 18:09:37 UTC 2019 Modified Files: src/sys/netinet [netbsd-7-0]: ip_input.c src/sys/netinet6 [netbsd-7-0]: ip6_input.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1708): sys/netinet6/ip6_input.c: revision 1.209 via patch sys/netinet/ip_input.c: revision 1.390 via patch Packet filters can return an mbuf chain with fragmented headers, so m_pullup() it if needed and remove the KASSERT()s. To generate a diff of this commit: cvs rdiff -u -r1.319.6.1 -r1.319.6.2 src/sys/netinet/ip_input.c cvs rdiff -u -r1.149.2.1.2.2 -r1.149.2.1.2.3 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.
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Tue Sep 17 18:10:00 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1708 To generate a diff of this commit: cvs rdiff -u -r1.1.2.150 -r1.1.2.151 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Tue Sep 17 18:08:59 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1708 To generate a diff of this commit: cvs rdiff -u -r1.1.2.57 -r1.1.2.58 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/sys
Module Name:src
Committed By: martin
Date: Tue Sep 17 18:08:14 UTC 2019
Modified Files:
src/sys/netinet [netbsd-7-1]: ip_input.c
src/sys/netinet6 [netbsd-7-1]: ip6_input.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1708):
sys/netinet6/ip6_input.c: revision 1.209 via patch
sys/netinet/ip_input.c: revision 1.390 via patch
Packet filters can return an mbuf chain with fragmented headers, so
m_pullup() it if needed and remove the KASSERT()s.
To generate a diff of this commit:
cvs rdiff -u -r1.319.10.1 -r1.319.10.2 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.149.2.1.6.2 -r1.149.2.1.6.3 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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.319.10.1 src/sys/netinet/ip_input.c:1.319.10.2
--- src/sys/netinet/ip_input.c:1.319.10.1 Fri Feb 9 14:05:29 2018
+++ src/sys/netinet/ip_input.c Tue Sep 17 18:08:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.319.10.1 2018/02/09 14:05:29 martin Exp $ */
+/* $NetBSD: ip_input.c,v 1.319.10.2 2019/09/17 18:08:13 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.319.10.1 2018/02/09 14:05:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.319.10.2 2019/09/17 18:08:13 martin Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -526,8 +526,25 @@ ip_input(struct mbuf *m)
if (freed || m == NULL) {
return;
}
+ if (__predict_false(m->m_len < sizeof (struct ip))) {
+ if ((m = m_pullup(m, sizeof (struct ip))) == NULL) {
+IP_STATINC(IP_STAT_TOOSMALL);
+return;
+ }
+ }
ip = mtod(m, struct ip *);
hlen = ip->ip_hl << 2;
+ if (hlen < sizeof(struct ip)) { /* minimum header length */
+ IP_STATINC(IP_STAT_BADHLEN);
+ goto bad;
+ }
+ if (hlen > m->m_len) {
+ if ((m = m_pullup(m, hlen)) == NULL) {
+IP_STATINC(IP_STAT_BADHLEN);
+return;
+ }
+ ip = mtod(m, struct ip *);
+ }
/*
* XXX The setting of "srcrt" here is to prevent ip_forward()
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.149.2.1.6.2 src/sys/netinet6/ip6_input.c:1.149.2.1.6.3
--- src/sys/netinet6/ip6_input.c:1.149.2.1.6.2 Sun Feb 25 23:17:37 2018
+++ src/sys/netinet6/ip6_input.c Tue Sep 17 18:08:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.149.2.1.6.2 2018/02/25 23:17:37 snj Exp $ */
+/* $NetBSD: ip6_input.c,v 1.149.2.1.6.3 2019/09/17 18:08:13 martin 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.149.2.1.6.2 2018/02/25 23:17:37 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.149.2.1.6.3 2019/09/17 18:08:13 martin Exp $");
#include "opt_gateway.h"
#include "opt_inet.h"
@@ -352,6 +352,14 @@ ip6_input(struct mbuf *m)
return;
if (m == NULL)
return;
+ if (__predict_false(m->m_len < sizeof(struct ip6_hdr))) {
+ struct ifnet *inifp = m->m_pkthdr.rcvif;
+ if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == NULL) {
+IP6_STATINC(IP6_STAT_TOOSMALL);
+in6_ifstat_inc(inifp, ifs6_in_hdrerr);
+return;
+ }
+ }
ip6 = mtod(m, struct ip6_hdr *);
srcrt = !IN6_ARE_ADDR_EQUAL(, >ip6_dst);
}
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Tue Sep 17 18:08:59 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1708 To generate a diff of this commit: cvs rdiff -u -r1.1.2.57 -r1.1.2.58 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.57 src/doc/CHANGES-7.1.3:1.1.2.58 --- src/doc/CHANGES-7.1.3:1.1.2.57 Fri Sep 6 13:52:36 2019 +++ src/doc/CHANGES-7.1.3 Tue Sep 17 18:08:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.57 2019/09/06 13:52:36 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.58 2019/09/17 18:08:59 martin Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -581,3 +581,10 @@ lib/libc/nameser/ns_name.c 1.12 Fix buffer overrun. [maya, ticket #1706] +sys/netinet/ip_input.c1.390 (patch) +sys/netinet6/ip6_input.c 1.209 (patch) + + Packet filters can return an mbuf chain with fragmented headers, so + m_pullup() when needed. + [bouyer, ticket #1708] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Tue Sep 17 18:07:54 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Tickets #1707 and #1708 To generate a diff of this commit: cvs rdiff -u -r1.1.2.61 -r1.1.2.62 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.61 src/doc/CHANGES-7.3:1.1.2.62 --- src/doc/CHANGES-7.3:1.1.2.61 Fri Sep 6 13:50:56 2019 +++ src/doc/CHANGES-7.3 Tue Sep 17 18:07:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.61 2019/09/06 13:50:56 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.62 2019/09/17 18:07:54 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -671,3 +671,15 @@ lib/libc/nameser/ns_name.c 1.12 Fix buffer overrun. [maya, ticket #1706] +sys/dev/usb/xhci.c1.109,1.113 + + Fix ryzen usb issue and support xhci version 3.10. + [mrg, ticket #1707] + +sys/netinet/ip_input.c1.390 (patch) +sys/netinet6/ip6_input.c 1.209 (patch) + + Packet filters can return an mbuf chain with fragmented headers, so + m_pullup() when needed. + [bouyer, ticket #1708] +
CVS commit: [netbsd-7-1] src/sys
Module Name:src Committed By: martin Date: Tue Sep 17 18:08:14 UTC 2019 Modified Files: src/sys/netinet [netbsd-7-1]: ip_input.c src/sys/netinet6 [netbsd-7-1]: ip6_input.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1708): sys/netinet6/ip6_input.c: revision 1.209 via patch sys/netinet/ip_input.c: revision 1.390 via patch Packet filters can return an mbuf chain with fragmented headers, so m_pullup() it if needed and remove the KASSERT()s. To generate a diff of this commit: cvs rdiff -u -r1.319.10.1 -r1.319.10.2 src/sys/netinet/ip_input.c cvs rdiff -u -r1.149.2.1.6.2 -r1.149.2.1.6.3 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.
CVS commit: [netbsd-7] src/sys
Module Name:src Committed By: martin Date: Tue Sep 17 18:07:15 UTC 2019 Modified Files: src/sys/netinet [netbsd-7]: ip_input.c src/sys/netinet6 [netbsd-7]: ip6_input.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1708): sys/netinet6/ip6_input.c: revision 1.209 via patch sys/netinet/ip_input.c: revision 1.390 via patch Packet filters can return an mbuf chain with fragmented headers, so m_pullup() it if needed and remove the KASSERT()s. To generate a diff of this commit: cvs rdiff -u -r1.319.2.1 -r1.319.2.2 src/sys/netinet/ip_input.c cvs rdiff -u -r1.149.2.3 -r1.149.2.4 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.
CVS commit: [netbsd-7] src/sys
Module Name:src
Committed By: martin
Date: Tue Sep 17 18:07:15 UTC 2019
Modified Files:
src/sys/netinet [netbsd-7]: ip_input.c
src/sys/netinet6 [netbsd-7]: ip6_input.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1708):
sys/netinet6/ip6_input.c: revision 1.209 via patch
sys/netinet/ip_input.c: revision 1.390 via patch
Packet filters can return an mbuf chain with fragmented headers, so
m_pullup() it if needed and remove the KASSERT()s.
To generate a diff of this commit:
cvs rdiff -u -r1.319.2.1 -r1.319.2.2 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.149.2.3 -r1.149.2.4 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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.319.2.1 src/sys/netinet/ip_input.c:1.319.2.2
--- src/sys/netinet/ip_input.c:1.319.2.1 Fri Feb 9 13:37:09 2018
+++ src/sys/netinet/ip_input.c Tue Sep 17 18:07:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.319.2.1 2018/02/09 13:37:09 martin Exp $ */
+/* $NetBSD: ip_input.c,v 1.319.2.2 2019/09/17 18:07:15 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.319.2.1 2018/02/09 13:37:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.319.2.2 2019/09/17 18:07:15 martin Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -526,8 +526,25 @@ ip_input(struct mbuf *m)
if (freed || m == NULL) {
return;
}
+ if (__predict_false(m->m_len < sizeof (struct ip))) {
+ if ((m = m_pullup(m, sizeof (struct ip))) == NULL) {
+IP_STATINC(IP_STAT_TOOSMALL);
+return;
+ }
+ }
ip = mtod(m, struct ip *);
hlen = ip->ip_hl << 2;
+ if (hlen < sizeof(struct ip)) { /* minimum header length */
+ IP_STATINC(IP_STAT_BADHLEN);
+ goto bad;
+ }
+ if (hlen > m->m_len) {
+ if ((m = m_pullup(m, hlen)) == NULL) {
+IP_STATINC(IP_STAT_BADHLEN);
+return;
+ }
+ ip = mtod(m, struct ip *);
+ }
/*
* XXX The setting of "srcrt" here is to prevent ip_forward()
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.149.2.3 src/sys/netinet6/ip6_input.c:1.149.2.4
--- src/sys/netinet6/ip6_input.c:1.149.2.3 Sun Feb 25 23:17:47 2018
+++ src/sys/netinet6/ip6_input.c Tue Sep 17 18:07:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.149.2.3 2018/02/25 23:17:47 snj Exp $ */
+/* $NetBSD: ip6_input.c,v 1.149.2.4 2019/09/17 18:07:15 martin 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.149.2.3 2018/02/25 23:17:47 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.149.2.4 2019/09/17 18:07:15 martin Exp $");
#include "opt_gateway.h"
#include "opt_inet.h"
@@ -352,6 +352,14 @@ ip6_input(struct mbuf *m)
return;
if (m == NULL)
return;
+ if (__predict_false(m->m_len < sizeof(struct ip6_hdr))) {
+ struct ifnet *inifp = m->m_pkthdr.rcvif;
+ if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == NULL) {
+IP6_STATINC(IP6_STAT_TOOSMALL);
+in6_ifstat_inc(inifp, ifs6_in_hdrerr);
+return;
+ }
+ }
ip6 = mtod(m, struct ip6_hdr *);
srcrt = !IN6_ARE_ADDR_EQUAL(, >ip6_dst);
}
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Tue Sep 17 18:04:15 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-7]: xhci.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1707):
sys/dev/usb/xhci.c: revision 1.113
sys/dev/usb/xhci.c: revision 1.109
match xhci version 3.10. allows properly finding all the USB
busses on new ryzen 3 based systems.
unfortunately, the USB busses are still non-functional.
-
fix ryzen usb issue: we set TD size to '1', where has xhci spec 4.11.2.4
says final TRB for a TD should have this set to '0'. since we currently
only generate sinel TRB TDs, set this to 0.
XXX: pullup-all
from sc.dying
To generate a diff of this commit:
cvs rdiff -u -r1.23.2.8 -r1.23.2.9 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.23.2.8 src/sys/dev/usb/xhci.c:1.23.2.9
--- src/sys/dev/usb/xhci.c:1.23.2.8 Sat Aug 25 14:57:35 2018
+++ src/sys/dev/usb/xhci.c Tue Sep 17 18:04:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.23.2.8 2018/08/25 14:57:35 martin Exp $ */
+/* $NetBSD: xhci.c,v 1.23.2.9 2019/09/17 18:04:15 martin Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.23.2.8 2018/08/25 14:57:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.23.2.9 2019/09/17 18:04:15 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -753,6 +753,8 @@ hexdump(const char *msg, const void *bas
static void
xhci_id_protocols(struct xhci_softc *sc, bus_size_t ecp)
{
+ XHCIHIST_FUNC(); XHCIHIST_CALLED();
+
/* XXX Cache this lot */
const uint32_t w0 = xhci_read_4(sc, ecp);
@@ -776,6 +778,7 @@ xhci_id_protocols(struct xhci_softc *sc,
case 0x0200:
case 0x0300:
case 0x0301:
+ case 0x0310:
aprint_debug_dev(sc->sc_dev, " %s ports %d - %d\n",
major == 3 ? "ss" : "hs", cpo, cpo + cpc -1);
break;
@@ -3792,7 +3795,7 @@ xhci_device_ctrl_start(struct usbd_xfer
parameter = DMAADDR(dma, 0);
KASSERTMSG(len <= 0x1, "len %d", len);
status = XHCI_TRB_2_IRQ_SET(0) |
- XHCI_TRB_2_TDSZ_SET(1) |
+ XHCI_TRB_2_TDSZ_SET(0) |
XHCI_TRB_2_BYTES_SET(len);
control = (isread ? XHCI_TRB_3_DIR_IN : 0) |
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_DATA_STAGE) |
@@ -3919,7 +3922,7 @@ xhci_device_bulk_start(struct usbd_xfer
*/
KASSERTMSG(len <= 0x1, "len %d", len);
status = XHCI_TRB_2_IRQ_SET(0) |
- XHCI_TRB_2_TDSZ_SET(1) |
+ XHCI_TRB_2_TDSZ_SET(0) |
XHCI_TRB_2_BYTES_SET(len);
control = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL) |
(usbd_xfer_isread(xfer) ? XHCI_TRB_3_ISP_BIT : 0) |
@@ -4026,7 +4029,7 @@ xhci_device_intr_start(struct usbd_xfer
parameter = DMAADDR(dma, 0);
KASSERTMSG(len <= 0x1, "len %d", len);
status = XHCI_TRB_2_IRQ_SET(0) |
- XHCI_TRB_2_TDSZ_SET(1) |
+ XHCI_TRB_2_TDSZ_SET(0) |
XHCI_TRB_2_BYTES_SET(len);
control = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_NORMAL) |
(usbd_xfer_isread(xfer) ? XHCI_TRB_3_ISP_BIT : 0) |
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Tue Sep 17 17:36:59 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1706 To generate a diff of this commit: cvs rdiff -u -r1.1.2.149 -r1.1.2.150 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.149 src/doc/CHANGES-7.0.3:1.1.2.150 --- src/doc/CHANGES-7.0.3:1.1.2.149 Tue Sep 3 12:31:11 2019 +++ src/doc/CHANGES-7.0.3 Tue Sep 17 17:36:58 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.149 2019/09/03 12:31:11 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.150 2019/09/17 17:36:58 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5884,3 +5884,8 @@ sys/sys/cprng.h 1.13-1.15 Switch from NIST CTR_DRBG with AES to NIST Hash_DRBG with SHA-256. [riastradh, ticket #1705] +lib/libc/nameser/ns_name.c 1.12 + + Fix buffer overrun. + [maya, ticket #1706] +
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Tue Sep 17 15:20:05 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: belatedly bump for execve1 signature change which affects compat modules. To generate a diff of this commit: cvs rdiff -u -r1.611 -r1.612 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.611 src/sys/sys/param.h:1.612 --- src/sys/sys/param.h:1.611 Thu Sep 5 18:29:59 2019 +++ src/sys/sys/param.h Tue Sep 17 11:20:05 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.611 2019/09/05 22:29:59 kamil Exp $ */ +/* $NetBSD: param.h,v 1.612 2019/09/17 15:20:05 christos Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 999001100 /* NetBSD 9.99.11 */ +#define __NetBSD_Version__ 999001200 /* NetBSD 9.99.12 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Tue Sep 17 15:20:05 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: belatedly bump for execve1 signature change which affects compat modules. To generate a diff of this commit: cvs rdiff -u -r1.611 -r1.612 src/sys/sys/param.h 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: christos Date: Tue Sep 17 15:19:28 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_execve.c src/sys/compat/sunos32: sunos32_misc.c src/sys/kern: kern_exec.c src/sys/sys: exec.h Log Message: Add a boolean argument to indicate if we have a path/true (execve) or an fd/false (fexecve). This is needed to differentiate between them because NULL/-1 can be readily passed from userland. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/compat/netbsd32/netbsd32_execve.c cvs rdiff -u -r1.80 -r1.81 src/sys/compat/sunos32/sunos32_misc.c cvs rdiff -u -r1.480 -r1.481 src/sys/kern/kern_exec.c cvs rdiff -u -r1.155 -r1.156 src/sys/sys/exec.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/compat/netbsd32/netbsd32_execve.c diff -u src/sys/compat/netbsd32/netbsd32_execve.c:1.40 src/sys/compat/netbsd32/netbsd32_execve.c:1.41 --- src/sys/compat/netbsd32/netbsd32_execve.c:1.40 Sun Sep 15 16:26:51 2019 +++ src/sys/compat/netbsd32/netbsd32_execve.c Tue Sep 17 11:19:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_execve.c,v 1.40 2019/09/15 20:26:51 christos Exp $ */ +/* $NetBSD: netbsd32_execve.c,v 1.41 2019/09/17 15:19:27 christos Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_execve.c,v 1.40 2019/09/15 20:26:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_execve.c,v 1.41 2019/09/17 15:19:27 christos Exp $"); #include #include @@ -72,7 +72,7 @@ netbsd32_execve(struct lwp *l, const str syscallarg(netbsd32_charpp) envp; } */ - return execve1(l, SCARG_P32(uap, path), -1, SCARG_P32(uap, argp), + return execve1(l, true, SCARG_P32(uap, path), -1, SCARG_P32(uap, argp), SCARG_P32(uap, envp), netbsd32_execve_fetch_element); } @@ -86,7 +86,7 @@ netbsd32_fexecve(struct lwp *l, const st syscallarg(netbsd32_charpp) envp; } */ - return execve1(l, NULL, SCARG(uap, fd), SCARG_P32(uap, argp), + return execve1(l, false, NULL, SCARG(uap, fd), SCARG_P32(uap, argp), SCARG_P32(uap, envp), netbsd32_execve_fetch_element); } Index: src/sys/compat/sunos32/sunos32_misc.c diff -u src/sys/compat/sunos32/sunos32_misc.c:1.80 src/sys/compat/sunos32/sunos32_misc.c:1.81 --- src/sys/compat/sunos32/sunos32_misc.c:1.80 Tue Sep 17 03:58:54 2019 +++ src/sys/compat/sunos32/sunos32_misc.c Tue Sep 17 11:19:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunos32_misc.c,v 1.80 2019/09/17 07:58:54 mrg Exp $ */ +/* $NetBSD: sunos32_misc.c,v 1.81 2019/09/17 15:19:27 christos Exp $ */ /* from :NetBSD: sunos_misc.c,v 1.107 2000/12/01 19:25:10 jdolecek Exp */ /* @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.80 2019/09/17 07:58:54 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.81 2019/09/17 15:19:27 christos Exp $"); #define COMPAT_SUNOS 1 @@ -388,7 +388,7 @@ sunos32_sys_execv(struct lwp *l, const s } */ const char *path = SCARG_P32(uap, path); - return execve1(l, path, -1, SCARG_P32(uap, argp), NULL, + return execve1(l, true, path, -1, SCARG_P32(uap, argp), NULL, sunos32_execve_fetch_element); } @@ -402,9 +402,8 @@ sunos32_sys_execve(struct lwp *l, const } */ const char *path = SCARG_P32(uap, path); - return execve1(l, path, -1, SCARG_P32(uap, argp), - SCARG_P32(uap, envp), - sunos32_execve_fetch_element); + return execve1(l, true, path, -1, SCARG_P32(uap, argp), + SCARG_P32(uap, envp), sunos32_execve_fetch_element); } int Index: src/sys/kern/kern_exec.c diff -u src/sys/kern/kern_exec.c:1.480 src/sys/kern/kern_exec.c:1.481 --- src/sys/kern/kern_exec.c:1.480 Sun Sep 15 16:23:50 2019 +++ src/sys/kern/kern_exec.c Tue Sep 17 11:19:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exec.c,v 1.480 2019/09/15 20:23:50 christos Exp $ */ +/* $NetBSD: kern_exec.c,v 1.481 2019/09/17 15:19:27 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.480 2019/09/15 20:23:50 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.481 2019/09/17 15:19:27 christos Exp $"); #include "opt_exec.h" #include "opt_execfmt.h" @@ -583,7 +583,7 @@ sys_execve(struct lwp *l, const struct s syscallarg(char * const *) envp; } */ - return execve1(l, SCARG(uap, path), -1, SCARG(uap, argp), + return execve1(l, true, SCARG(uap, path), -1, SCARG(uap, argp), SCARG(uap, envp), execve_fetch_element); } @@ -597,7 +597,7 @@ sys_fexecve(struct lwp *l, const struct syscallarg(char * const *) envp; } */ - return execve1(l, NULL, SCARG(uap, fd), SCARG(uap, argp), + return execve1(l, false, NULL, SCARG(uap, fd), SCARG(uap, argp), SCARG(uap, envp), execve_fetch_element); } @@ -719,8 +719,9 @@ exec_vm_minaddr(vaddr_t va_min) } static int -execve_loadvm(struct lwp
CVS commit: src/sys
Module Name:src Committed By: christos Date: Tue Sep 17 15:19:28 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_execve.c src/sys/compat/sunos32: sunos32_misc.c src/sys/kern: kern_exec.c src/sys/sys: exec.h Log Message: Add a boolean argument to indicate if we have a path/true (execve) or an fd/false (fexecve). This is needed to differentiate between them because NULL/-1 can be readily passed from userland. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/compat/netbsd32/netbsd32_execve.c cvs rdiff -u -r1.80 -r1.81 src/sys/compat/sunos32/sunos32_misc.c cvs rdiff -u -r1.480 -r1.481 src/sys/kern/kern_exec.c cvs rdiff -u -r1.155 -r1.156 src/sys/sys/exec.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sunos32
Module Name:src Committed By: mrg Date: Tue Sep 17 07:58:54 UTC 2019 Modified Files: src/sys/compat/sunos32: sunos32_misc.c Log Message: pass new missing fd argument to execve1(). fixes sparc64 build. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/compat/sunos32/sunos32_misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sunos32
Module Name:src Committed By: mrg Date: Tue Sep 17 07:58:54 UTC 2019 Modified Files: src/sys/compat/sunos32: sunos32_misc.c Log Message: pass new missing fd argument to execve1(). fixes sparc64 build. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/compat/sunos32/sunos32_misc.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/compat/sunos32/sunos32_misc.c diff -u src/sys/compat/sunos32/sunos32_misc.c:1.79 src/sys/compat/sunos32/sunos32_misc.c:1.80 --- src/sys/compat/sunos32/sunos32_misc.c:1.79 Mon Sep 3 16:29:30 2018 +++ src/sys/compat/sunos32/sunos32_misc.c Tue Sep 17 07:58:54 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunos32_misc.c,v 1.79 2018/09/03 16:29:30 riastradh Exp $ */ +/* $NetBSD: sunos32_misc.c,v 1.80 2019/09/17 07:58:54 mrg Exp $ */ /* from :NetBSD: sunos_misc.c,v 1.107 2000/12/01 19:25:10 jdolecek Exp */ /* @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.79 2018/09/03 16:29:30 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.80 2019/09/17 07:58:54 mrg Exp $"); #define COMPAT_SUNOS 1 @@ -388,7 +388,7 @@ sunos32_sys_execv(struct lwp *l, const s } */ const char *path = SCARG_P32(uap, path); - return execve1(l, path, SCARG_P32(uap, argp), NULL, + return execve1(l, path, -1, SCARG_P32(uap, argp), NULL, sunos32_execve_fetch_element); } @@ -402,7 +402,7 @@ sunos32_sys_execve(struct lwp *l, const } */ const char *path = SCARG_P32(uap, path); - return execve1(l, path, SCARG_P32(uap, argp), + return execve1(l, path, -1, SCARG_P32(uap, argp), SCARG_P32(uap, envp), sunos32_execve_fetch_element); }
CVS commit: src
Module Name:src Committed By: mrg Date: Tue Sep 17 07:36:51 UTC 2019 Modified Files: src/distrib/sets/lists/modules: mi src/sys/modules: Makefile Log Message: enable building modules for if_aue(4), if_cdce(4), if_cue(4), if_kue(4), if_upl(4), if_url(4), and if_urndis(4) To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.225 -r1.226 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.124 src/distrib/sets/lists/modules/mi:1.125 --- src/distrib/sets/lists/modules/mi:1.124 Thu Aug 8 16:06:14 2019 +++ src/distrib/sets/lists/modules/mi Tue Sep 17 07:36:51 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.124 2019/08/08 16:06:14 skrll Exp $ +# $NetBSD: mi,v 1.125 2019/09/17 07:36:51 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -194,16 +194,24 @@ ./@MODULEDIR@/i2cexec/i2cexec.kmod base-kernel-modules kmod ./@MODULEDIR@/if_agrbase-kernel-modules kmod ./@MODULEDIR@/if_agr/if_agr.kmod base-kernel-modules kmod +./@MODULEDIR@/if_auebase-kernel-modules kmod +./@MODULEDIR@/if_aue/if_aue.kmod base-kernel-modules kmod ./@MODULEDIR@/if_axebase-kernel-modules kmod ./@MODULEDIR@/if_axe/if_axe.kmod base-kernel-modules kmod ./@MODULEDIR@/if_axenbase-kernel-modules kmod ./@MODULEDIR@/if_axen/if_axen.kmod base-kernel-modules kmod +./@MODULEDIR@/if_cdcebase-kernel-modules kmod +./@MODULEDIR@/if_cdce/if_cdce.kmod base-kernel-modules kmod +./@MODULEDIR@/if_cuebase-kernel-modules kmod +./@MODULEDIR@/if_cue/if_cue.kmod base-kernel-modules kmod ./@MODULEDIR@/if_faithbase-kernel-modules kmod ./@MODULEDIR@/if_faith/if_faith.kmod base-kernel-modules kmod ./@MODULEDIR@/if_gifbase-kernel-modules kmod ./@MODULEDIR@/if_gif/if_gif.kmod base-kernel-modules kmod ./@MODULEDIR@/if_grebase-kernel-modules kmod ./@MODULEDIR@/if_gre/if_gre.kmod base-kernel-modules kmod +./@MODULEDIR@/if_kuebase-kernel-modules kmod +./@MODULEDIR@/if_kue/if_kue.kmod base-kernel-modules kmod ./@MODULEDIR@/if_l2tpbase-kernel-modules kmod ./@MODULEDIR@/if_l2tp/if_l2tp.kmod base-kernel-modules kmod ./@MODULEDIR@/if_loopbase-kernel-modules kmod @@ -234,8 +242,14 @@ ./@MODULEDIR@/if_tun/if_tun.kmod base-kernel-modules kmod ./@MODULEDIR@/if_udavbase-kernel-modules kmod ./@MODULEDIR@/if_udav/if_udav.kmod base-kernel-modules kmod +./@MODULEDIR@/if_uplbase-kernel-modules kmod +./@MODULEDIR@/if_upl/if_upl.kmod base-kernel-modules kmod ./@MODULEDIR@/if_urebase-kernel-modules kmod ./@MODULEDIR@/if_ure/if_ure.kmod base-kernel-modules kmod +./@MODULEDIR@/if_urlbase-kernel-modules kmod +./@MODULEDIR@/if_url/if_url.kmod base-kernel-modules kmod +./@MODULEDIR@/if_urndisbase-kernel-modules kmod +./@MODULEDIR@/if_urndis/if_urndis.kmod base-kernel-modules kmod ./@MODULEDIR@/if_vioifbase-obsolete obsolete ./@MODULEDIR@/if_vioif/if_vioif.kmod base-obsolete obsolete ./@MODULEDIR@/if_vlanbase-kernel-modules kmod Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.225 src/sys/modules/Makefile:1.226 --- src/sys/modules/Makefile:1.225 Tue Sep 17 04:43:47 2019 +++ src/sys/modules/Makefile Tue Sep 17 07:36:51 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.225 2019/09/17 04:43:47 mrg Exp $ +# $NetBSD: Makefile,v 1.226 2019/09/17 07:36:51 mrg Exp $ .include @@ -70,11 +70,15 @@ SUBDIR+= am2315temp SUBDIR+= i2cexec SUBDIR+= i2c_bitbang SUBDIR+= if_agr +SUBDIR+= if_aue SUBDIR+= if_axe SUBDIR+= if_axen +SUBDIR+= if_cdce +SUBDIR+= if_cue SUBDIR+= if_faith SUBDIR+= if_gif SUBDIR+= if_gre +SUBDIR+= if_kue SUBDIR+= if_l2tp SUBDIR+= if_loop SUBDIR+= if_mpls @@ -90,7 +94,10 @@ SUBDIR+= if_strip SUBDIR+= if_tap tap SUBDIR+= if_tun tun SUBDIR+= if_udav +SUBDIR+= if_upl SUBDIR+= if_ure +SUBDIR+= if_url +SUBDIR+= if_urndis SUBDIR+= if_vlan SUBDIR+= iic SUBDIR+= ip_ecn
CVS commit: src
Module Name:src Committed By: mrg Date: Tue Sep 17 07:36:51 UTC 2019 Modified Files: src/distrib/sets/lists/modules: mi src/sys/modules: Makefile Log Message: enable building modules for if_aue(4), if_cdce(4), if_cue(4), if_kue(4), if_upl(4), if_url(4), and if_urndis(4) To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.225 -r1.226 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
