CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jun 6 03:08:35 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket #1463. To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-9.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-9.3 diff -u src/doc/CHANGES-9.3:1.1.2.102 src/doc/CHANGES-9.3:1.1.2.103 --- src/doc/CHANGES-9.3:1.1.2.102 Sat Jun 4 12:39:48 2022 +++ src/doc/CHANGES-9.3 Mon Jun 6 03:08:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.3,v 1.1.2.102 2022/06/04 12:39:48 martin Exp $ +# $NetBSD: CHANGES-9.3,v 1.1.2.103 2022/06/06 03:08:35 msaitoh Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -1755,3 +1755,8 @@ sys/arch/atari/atari/stalloc.c 1.17 PR 56859: restore NULL pointer checks lost in rev 1.16. [tsutsui, ticket #1462] +crypto/external/bsd/openssh/dist/sshkey-xmss.c patch +crypto/external/bsd/openssh/dist/version.h patch + + ssh(1): apply upstream fix for CVE-2019-16905. + [martin, ticket #1463]
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jun 6 03:08:35 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket #1463. To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: msaitoh Date: Mon Jun 6 03:07:03 UTC 2022 Modified Files: src/crypto/external/bsd/openssh/dist [netbsd-9]: sshkey-xmss.c version.h Log Message: Pull up following revision(s) (requested by martin in ticket #1463): crypto/external/bsd/openssh/dist/sshkey-xmss.c patch crypto/external/bsd/openssh/dist/version.h patch Apply upstream fix for CVE-2019-16905. Call this NetBSD_Secure_Shell-20220604. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 \ src/crypto/external/bsd/openssh/dist/sshkey-xmss.c cvs rdiff -u -r1.28 -r1.28.2.1 src/crypto/external/bsd/openssh/dist/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssh/dist/sshkey-xmss.c diff -u src/crypto/external/bsd/openssh/dist/sshkey-xmss.c:1.4 src/crypto/external/bsd/openssh/dist/sshkey-xmss.c:1.4.2.1 --- src/crypto/external/bsd/openssh/dist/sshkey-xmss.c:1.4 Sun Jan 27 02:08:33 2019 +++ src/crypto/external/bsd/openssh/dist/sshkey-xmss.c Mon Jun 6 03:07:03 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: sshkey-xmss.c,v 1.4 2019/01/27 02:08:33 pgoyette Exp $ */ +/* $NetBSD: sshkey-xmss.c,v 1.4.2.1 2022/06/06 03:07:03 msaitoh Exp $ */ /* $OpenBSD: sshkey-xmss.c,v 1.3 2018/07/09 21:59:10 markus Exp $ */ /* @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -__RCSID("$NetBSD: sshkey-xmss.c,v 1.4 2019/01/27 02:08:33 pgoyette Exp $"); +__RCSID("$NetBSD: sshkey-xmss.c,v 1.4.2.1 2022/06/06 03:07:03 msaitoh Exp $"); #include #include @@ -975,7 +975,8 @@ sshkey_xmss_decrypt_state(const struct s goto out; } /* check that an appropriate amount of auth data is present */ - if (sshbuf_len(encoded) < encrypted_len + authlen) { + if (sshbuf_len(encoded) < authlen || + sshbuf_len(encoded) - authlen < encrypted_len) { r = SSH_ERR_INVALID_FORMAT; goto out; } Index: src/crypto/external/bsd/openssh/dist/version.h diff -u src/crypto/external/bsd/openssh/dist/version.h:1.28 src/crypto/external/bsd/openssh/dist/version.h:1.28.2.1 --- src/crypto/external/bsd/openssh/dist/version.h:1.28 Sat Apr 20 17:28:19 2019 +++ src/crypto/external/bsd/openssh/dist/version.h Mon Jun 6 03:07:03 2022 @@ -1,8 +1,8 @@ -/* $NetBSD: version.h,v 1.28 2019/04/20 17:28:19 christos Exp $ */ +/* $NetBSD: version.h,v 1.28.2.1 2022/06/06 03:07:03 msaitoh Exp $ */ /* $OpenBSD: version.h,v 1.84 2019/04/03 15:48:45 djm Exp $ */ #define __OPENSSH_VERSION "OpenSSH_8.0" -#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20190418" +#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20220604" #define SSH_HPN "-hpn13v14" #define SSH_LPK "-lpk" /*
CVS commit: [netbsd-9] src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: msaitoh Date: Mon Jun 6 03:07:03 UTC 2022 Modified Files: src/crypto/external/bsd/openssh/dist [netbsd-9]: sshkey-xmss.c version.h Log Message: Pull up following revision(s) (requested by martin in ticket #1463): crypto/external/bsd/openssh/dist/sshkey-xmss.c patch crypto/external/bsd/openssh/dist/version.h patch Apply upstream fix for CVE-2019-16905. Call this NetBSD_Secure_Shell-20220604. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 \ src/crypto/external/bsd/openssh/dist/sshkey-xmss.c cvs rdiff -u -r1.28 -r1.28.2.1 src/crypto/external/bsd/openssh/dist/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Mon Jun 6 02:16:37 UTC 2022 Modified Files: src/sys/dev/pci/ixgbe: ixgbe_82598.c ixgbe_api.c ixgbe_common.c Log Message: s/filer/filter/ in comment. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixgbe_82598.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/ixgbe/ixgbe_api.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/ixgbe/ixgbe_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Mon Jun 6 02:16:37 UTC 2022 Modified Files: src/sys/dev/pci/ixgbe: ixgbe_82598.c ixgbe_api.c ixgbe_common.c Log Message: s/filer/filter/ in comment. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixgbe_82598.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/ixgbe/ixgbe_api.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/ixgbe/ixgbe_common.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_82598.c diff -u src/sys/dev/pci/ixgbe/ixgbe_82598.c:1.18 src/sys/dev/pci/ixgbe/ixgbe_82598.c:1.19 --- src/sys/dev/pci/ixgbe/ixgbe_82598.c:1.18 Fri Dec 24 05:02:11 2021 +++ src/sys/dev/pci/ixgbe/ixgbe_82598.c Mon Jun 6 02:16:37 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe_82598.c,v 1.18 2021/12/24 05:02:11 msaitoh Exp $ */ +/* $NetBSD: ixgbe_82598.c,v 1.19 2022/06/06 02:16:37 msaitoh Exp $ */ /** SPDX-License-Identifier: BSD-3-Clause @@ -36,7 +36,7 @@ /*$FreeBSD: head/sys/dev/ixgbe/ixgbe_82598.c 331224 2018-03-19 20:55:05Z erj $*/ #include -__KERNEL_RCSID(0, "$NetBSD: ixgbe_82598.c,v 1.18 2021/12/24 05:02:11 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe_82598.c,v 1.19 2022/06/06 02:16:37 msaitoh Exp $"); #include "ixgbe_type.h" #include "ixgbe_82598.h" @@ -1053,7 +1053,7 @@ s32 ixgbe_set_vfta_82598(struct ixgbe_hw * ixgbe_clear_vfta_82598 - Clear VLAN filter table * @hw: pointer to hardware structure * - * Clears the VLAN filer table, and the VMDq index associated with the filter + * Clears the VLAN filter table, and the VMDq index associated with the filter **/ static s32 ixgbe_clear_vfta_82598(struct ixgbe_hw *hw) { Index: src/sys/dev/pci/ixgbe/ixgbe_api.c diff -u src/sys/dev/pci/ixgbe/ixgbe_api.c:1.27 src/sys/dev/pci/ixgbe/ixgbe_api.c:1.28 --- src/sys/dev/pci/ixgbe/ixgbe_api.c:1.27 Fri Dec 24 05:02:11 2021 +++ src/sys/dev/pci/ixgbe/ixgbe_api.c Mon Jun 6 02:16:37 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe_api.c,v 1.27 2021/12/24 05:02:11 msaitoh Exp $ */ +/* $NetBSD: ixgbe_api.c,v 1.28 2022/06/06 02:16:37 msaitoh Exp $ */ /** SPDX-License-Identifier: BSD-3-Clause @@ -36,7 +36,7 @@ /*$FreeBSD: head/sys/dev/ixgbe/ixgbe_api.c 331224 2018-03-19 20:55:05Z erj $*/ #include -__KERNEL_RCSID(0, "$NetBSD: ixgbe_api.c,v 1.27 2021/12/24 05:02:11 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe_api.c,v 1.28 2022/06/06 02:16:37 msaitoh Exp $"); #include "ixgbe_api.h" #include "ixgbe_common.h" @@ -1062,7 +1062,7 @@ s32 ixgbe_disable_mc(struct ixgbe_hw *hw * ixgbe_clear_vfta - Clear VLAN filter table * @hw: pointer to hardware structure * - * Clears the VLAN filer table, and the VMDq index associated with the filter + * Clears the VLAN filter table, and the VMDq index associated with the filter **/ s32 ixgbe_clear_vfta(struct ixgbe_hw *hw) { Index: src/sys/dev/pci/ixgbe/ixgbe_common.c diff -u src/sys/dev/pci/ixgbe/ixgbe_common.c:1.42 src/sys/dev/pci/ixgbe/ixgbe_common.c:1.43 --- src/sys/dev/pci/ixgbe/ixgbe_common.c:1.42 Fri Dec 24 05:02:11 2021 +++ src/sys/dev/pci/ixgbe/ixgbe_common.c Mon Jun 6 02:16:37 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe_common.c,v 1.42 2021/12/24 05:02:11 msaitoh Exp $ */ +/* $NetBSD: ixgbe_common.c,v 1.43 2022/06/06 02:16:37 msaitoh Exp $ */ /** SPDX-License-Identifier: BSD-3-Clause @@ -36,7 +36,7 @@ /*$FreeBSD: head/sys/dev/ixgbe/ixgbe_common.c 331224 2018-03-19 20:55:05Z erj $*/ #include -__KERNEL_RCSID(0, "$NetBSD: ixgbe_common.c,v 1.42 2021/12/24 05:02:11 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe_common.c,v 1.43 2022/06/06 02:16:37 msaitoh Exp $"); #include "ixgbe_common.h" #include "ixgbe_phy.h" @@ -4142,7 +4142,7 @@ vlvf_update: * ixgbe_clear_vfta_generic - Clear VLAN filter table * @hw: pointer to hardware structure * - * Clears the VLAN filer table, and the VMDq index associated with the filter + * Clears the VLAN filter table, and the VMDq index associated with the filter **/ s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw) {
CVS commit: src/sys/uvm
Module Name:src Committed By: riastradh Date: Sun Jun 5 13:45:28 UTC 2022 Modified Files: src/sys/uvm: uvm_map.c Log Message: uvm(9): Sprinkle assertions into uvm_map_findspace. May help to diagnose PR kern/51254. To generate a diff of this commit: cvs rdiff -u -r1.399 -r1.400 src/sys/uvm/uvm_map.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src Committed By: riastradh Date: Sun Jun 5 13:45:28 UTC 2022 Modified Files: src/sys/uvm: uvm_map.c Log Message: uvm(9): Sprinkle assertions into uvm_map_findspace. May help to diagnose PR kern/51254. To generate a diff of this commit: cvs rdiff -u -r1.399 -r1.400 src/sys/uvm/uvm_map.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/uvm/uvm_map.c diff -u src/sys/uvm/uvm_map.c:1.399 src/sys/uvm/uvm_map.c:1.400 --- src/sys/uvm/uvm_map.c:1.399 Sun Jun 5 01:45:45 2022 +++ src/sys/uvm/uvm_map.c Sun Jun 5 13:45:28 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_map.c,v 1.399 2022/06/05 01:45:45 riastradh Exp $ */ +/* $NetBSD: uvm_map.c,v 1.400 2022/06/05 13:45:28 riastradh Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -66,7 +66,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.399 2022/06/05 01:45:45 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.400 2022/06/05 13:45:28 riastradh Exp $"); #include "opt_ddb.h" #include "opt_pax.h" @@ -1778,6 +1778,29 @@ uvm_map_space_avail(vaddr_t *start, vsiz return (0); } +static void +uvm_findspace_invariants(struct vm_map *map, vaddr_t orig_hint, vaddr_t length, +struct uvm_object *uobj, voff_t uoffset, vsize_t align, int flags, +vaddr_t hint, int line) +{ + const int topdown = map->flags & VM_MAP_TOPDOWN; + + KASSERTMSG( topdown || hint >= orig_hint, + "map=%p hint=%#"PRIxVADDR" orig_hint=%#"PRIxVADDR + " length=%#"PRIxVSIZE" uobj=%p uoffset=%#llx align=%"PRIxVSIZE + " flags=%#x (uvm_map_findspace line %d)", + map, hint, orig_hint, + length, uobj, (unsigned long long)uoffset, align, + flags, line); + KASSERTMSG(!topdown || hint <= orig_hint, + "map=%p hint=%#"PRIxVADDR" orig_hint=%#"PRIxVADDR + " length=%#"PRIxVSIZE" uobj=%p uoffset=%#llx align=%"PRIxVSIZE + " flags=%#x (uvm_map_findspace line %d)", + map, hint, orig_hint, + length, uobj, (unsigned long long)uoffset, align, + flags, line); +} + /* * uvm_map_findspace: find "length" sized space in "map". * @@ -1796,10 +1819,14 @@ uvm_map_findspace(struct vm_map *map, va vaddr_t *result /* OUT */, struct uvm_object *uobj, voff_t uoffset, vsize_t align, int flags) { +#define INVARIANTS() \ + uvm_findspace_invariants(map, orig_hint, length, uobj, uoffset, align,\ + flags, hint, __LINE__) struct vm_map_entry *entry; struct vm_map_entry *child, *prev, *tmp; vaddr_t orig_hint __diagused; const int topdown = map->flags & VM_MAP_TOPDOWN; + int avail; UVMHIST_FUNC(__func__); UVMHIST_CALLARGS(maphist, "(map=%#jx, hint=%#jx, len=%ju, flags=%#jx...", (uintptr_t)map, hint, length, flags); @@ -1837,6 +1864,7 @@ uvm_map_findspace(struct vm_map *map, va return (NULL); } orig_hint = hint; + INVARIANTS(); UVMHIST_LOG(maphist,"<- VA %#jx vs range [%#jx->%#jx]", hint, vm_map_min(map), vm_map_max(map), 0); @@ -1845,8 +1873,10 @@ uvm_map_findspace(struct vm_map *map, va * hint may not be aligned properly; we need round up or down it * before proceeding further. */ - if ((flags & UVM_FLAG_COLORMATCH) == 0) + if ((flags & UVM_FLAG_COLORMATCH) == 0) { uvm_map_align_va(, align, topdown); + INVARIANTS(); + } UVMHIST_LOG(maphist,"<- VA %#jx vs range [%#jx->%#jx]", hint, vm_map_min(map), vm_map_max(map), 0); @@ -1931,8 +1961,10 @@ uvm_map_findspace(struct vm_map *map, va /* * See if given hint fits in this gap. */ - switch (uvm_map_space_avail(, length, - uoffset, align, flags, topdown, entry)) { + avail = uvm_map_space_avail(, length, + uoffset, align, flags, topdown, entry); + INVARIANTS(); + switch (avail) { case 1: goto found; case -1: @@ -1963,8 +1995,11 @@ uvm_map_findspace(struct vm_map *map, va /* Check slot before any entry */ hint = topdown ? entry->next->start - length : entry->end; - switch (uvm_map_space_avail(, length, uoffset, align, flags, - topdown, entry)) { + INVARIANTS(); + avail = uvm_map_space_avail(, length, uoffset, align, flags, + topdown, entry); + INVARIANTS(); + switch (avail) { case 1: goto found; case -1: @@ -2031,8 +2066,11 @@ nextgap: if (hint < tmp->end) hint = tmp->end; } - switch (uvm_map_space_avail(, length, uoffset, align, - flags, topdown, tmp)) { + INVARIANTS(); + avail = uvm_map_space_avail(, length, uoffset, align, + flags, topdown, tmp); + INVARIANTS(); + switch (avail) { case 1: entry = tmp; goto found; @@ -2053,8 +2091,11 @@ nextgap: KASSERT(orig_hint <= prev->end); hint = prev->end; } - switch (uvm_map_space_avail(, length, uoffset, align, - flags, topdown, prev)) { + INVARIANTS(); + avail = uvm_map_space_avail(, length, uoffset, align, + flags, topdown, prev); + INVARIANTS(); + switch (avail) { case 1: entry = prev; goto found;
CVS commit: src/sys/conf
Module Name:src Committed By: rjs Date: Sun Jun 5 13:35:52 UTC 2022 Modified Files: src/sys/conf: files Log Message: bwfm(4) uses firmload. To generate a diff of this commit: cvs rdiff -u -r1.1297 -r1.1298 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src Committed By: rjs Date: Sun Jun 5 13:35:52 UTC 2022 Modified Files: src/sys/conf: files Log Message: bwfm(4) uses firmload. To generate a diff of this commit: cvs rdiff -u -r1.1297 -r1.1298 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1297 src/sys/conf/files:1.1298 --- src/sys/conf/files:1.1297 Sat May 7 04:30:41 2022 +++ src/sys/conf/files Sun Jun 5 13:35:52 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1297 2022/05/07 04:30:41 rin Exp $ +# $NetBSD: files,v 1.1298 2022/06/05 13:35:52 rjs Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -1414,7 +1414,7 @@ attach ld at nvme with ld_nvme file dev/ic/ld_nvme.c ld_nvme # Broadcom FullMAC 802.11 driver -device bwfm: arp, ifnet, wlan +device bwfm: arp, ifnet, wlan, firmload file dev/ic/bwfm.c bwfm # QEMU Firmware Configuration (fw_cfg) device
Re: CVS commit: src
On Sun, May 29, 2022 at 07:35:45PM +0200, J. Hannken-Illjes wrote: > Just a side note, how do we test a build system with say 20 knobs, > do we build all 2**20 configurations to be sure everything at > least builds? > > Isn't it better to always build everything and move this selection > into the set lists or whatever you use to get the final image? Just "for info" - everything knobified so far is what we'd call a "leaf package" in pkgsc. The knob only affects the build of that one program.
CVS commit: src/tests/usr.bin/ld
Module Name:src Committed By: skrll Date: Sun Jun 5 08:42:25 UTC 2022 Modified Files: src/tests/usr.bin/ld: t_section.sh Log Message: Match explicit section names and not .{text,data}.* for example. This test now passes on hppa. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/ld/t_section.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/ld/t_section.sh diff -u src/tests/usr.bin/ld/t_section.sh:1.4 src/tests/usr.bin/ld/t_section.sh:1.5 --- src/tests/usr.bin/ld/t_section.sh:1.4 Tue Feb 17 11:51:04 2015 +++ src/tests/usr.bin/ld/t_section.sh Sun Jun 5 08:42:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: t_section.sh,v 1.4 2015/02/17 11:51:04 martin Exp $ +# $NetBSD: t_section.sh,v 1.5 2022/06/05 08:42:25 skrll Exp $ # # Copyright (c) 2014 The NetBSD Foundation, Inc. # All rights reserved. @@ -67,7 +67,7 @@ int main(void) { return 0; } EOF atf_check -s exit:0 -o ignore -e ignore cc -o test test.c readelf -S test | - grep ' \.text\| hoge\| \.data\| fuga\| \.bss' >test.secs + grep ' \.text \| hoge \| \.data \| fuga \| \.bss ' >test.secs { # Read-only orphan sections are placed after well-known # read-only sections (.text, .rodata) but before .data.
CVS commit: src/tests/usr.bin/ld
Module Name:src Committed By: skrll Date: Sun Jun 5 08:42:25 UTC 2022 Modified Files: src/tests/usr.bin/ld: t_section.sh Log Message: Match explicit section names and not .{text,data}.* for example. This test now passes on hppa. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/ld/t_section.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.