Re: CVS: cvs.openbsd.org: src
These complaints about trivial regress failures, generally just output strings, are getting a bit tiring. You can fix it in about 1 minute, right?
Re: CVS: cvs.openbsd.org: src
On Tue, May 03, 2022 at 03:39:19PM -0600, Dave Voutila wrote:
> CVSROOT: /cvs
> Module name: src
> Changes by: d...@cvs.openbsd.org2022/05/03 15:39:19
>
> Modified files:
> usr.sbin/vmd : parse.y vm.c vmd.h
> usr.sbin/vmctl : main.c vmctl.c vmctl.h
> sys/arch/amd64/amd64: vmm.c
> sys/arch/amd64/include: vmmvar.h
>
> Log message:
> vmm/vmd/vmctl: standardize memory units to bytes
>
> At different points in the vm lifecycle vmm(4), vmctl(8), and vmd(8)
> refer to a vm's memory range sizes in either bytes or megabytes.
> This is needlessly complex.
>
> Switch to using bytes everywhere and adjust types and constants
> accordingly. While this makes it possible to specify vm's with
> memory in fractions of megabytes, the logic requiring whole
> megabyte values remains.
>
> Feedback from deraadt@, mlarkin@, and Matthew Martin.
>
> ok mlarkin@
This broke regress.
> usr.sbin/vmd:
Exit: 1
Duration: 00:00:03
Log: 253-usr.sbin-vmd.log
run-pass-memory-round
/usr/sbin/vmd -n -f
/home/src/regress/usr.sbin/vmd/config/vmd-pass-memory-round.conf 2>&1 | diff
-u /home/src/regress/usr.sbin/vmd/config/vmd-pass-memory-round.ok /dev/stdin
--- /home/src/regress/usr.sbin/vmd/config/vmd-pass-memory-round.ok Wed Oct
11 14:01:20 2017
+++ /dev/stdin Thu May 5 06:04:37 2022
@@ -1,2 +1,2 @@
-size rounded to 1023 megabytes
+memory size rounded to 1023M
configuration OK
*** Error 1 in config (Makefile:15 'run-pass-memory-round')
FAILED
run-fail-too-few-ram
/usr/sbin/vmd -n -f
/home/src/regress/usr.sbin/vmd/config/vmd-fail-too-few-ram.conf 2>&1 | cut -d
: -f 2,3,4 | diff -u
/home/src/regress/usr.sbin/vmd/config/vmd-fail-too-few-ram.ok /dev/stdin
--- /home/src/regress/usr.sbin/vmd/config/vmd-fail-too-few-ram.ok Wed Oct
11 14:01:20 2017
+++ /dev/stdin Thu May 5 06:04:38 2022
@@ -1,2 +1,2 @@
-size must be at least one megabyte
+memory size must be at least 1MB
4: failed to parse size: 1048575
*** Error 1 in config (Makefile:22 'run-fail-too-few-ram')
FAILED
run-regress-vioscribble
rm -f scribble.{raw,qcow2} vioscribble.d vioqcow2.d vioraw.d log.d
/usr/sbin/vmctl create -s 4G scribble.raw
vmctl: create imagefile operation failed: File too large
*** Error 1 in diskfmt (Makefile:24 'setup')
FAILED
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2022/05/04 19:04:14 Modified files: usr.bin/ssh: sshkey.c Log message: sshkey_unshield_private() contains a exact duplicate of the code in private2_check_padding(). Pull private2_check_padding() up so the code can be reused. From Martin Vahlensieck, ok deraadt@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2022/05/04 18:56:58 Modified files: usr.bin/ssh: channels.c channels.h Log message: channel_new no longer frees remote_name. So update the comment accordingly. As remote_name is not modified, it can be const as well. From Martin Vahlensieck
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2022/05/04 18:55:11 Modified files: usr.bin/ssh: mux.c Log message: mux.c: mark argument as const; from Martin Vahlensieck
CVS: cvs.openbsd.org: xenocara
CVSROOT:/cvs Module name:xenocara Changes by: j...@cvs.openbsd.org2022/05/04 18:14:50 Modified files: lib/mesa/include/pci_ids: iris_pci_ids.h Log message: intel/dev: add RPL-S pci ids from drm-intel-next 0cfc01fe835fe727e9ff7485fd6b5c8180bfd7b7 in mainline Mesa
CVS: cvs.openbsd.org: xenocara
CVSROOT:/cvs Module name:xenocara Changes by: j...@cvs.openbsd.org2022/05/04 18:12:43 Modified files: lib/mesa/include/pci_ids: iris_pci_ids.h Log message: intel/dev: sync ADL-S pci ids with linux 0cfc01fe835fe727e9ff7485fd6b5c8180bfd7b7 in mainline Mesa
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2022/05/04 17:17:25 Modified files: usr.sbin/vmctl : main.c vmctl.c vmctl.h usr.sbin/vmd : parse.y vioqcow2.c vioraw.c virtio.h Log message: vmctl(8)/vmd(8): convert disk sizes from MB to bytes Continue converting other parts to storing data in bytes instead of MB. In this case, the logic for disk sizes was being scaled. This fixes issues reported by Martin Vahlensieck where vmctl could no longer create disks larger than 7 MiB after previous commits to change storing memory sizes as bytes. While this keeps the vm memory limit check in vmctl's size parser, it skips the limit check for disks. The error messages adjust accordingly and this removes the double error message logging. Update comments and function types accordingly. ok marlkin@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: bl...@cvs.openbsd.org 2022/05/04 15:24:33 Modified files: sys/kern : kern_malloc.c kern_time.c Log message: Introduce mutex for ratecheck(9) and ppsratecheck(9). A global mutex with spl high for all function calls is used for now. It protects the lasttime and curpps parameter. This solution is MP safe for the usual use case, allows progress, and can be optimized later. Remove a useless #if 1 while there. OK claudio@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 13:34:26 Modified files: lib/libcrypto/kdf: kdf_err.c Log message: remove accidentally duplicated line
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 13:15:52 Modified files: lib/libcrypto/kdf: hkdf_evp.c Log message: Whitespace nit (knfmt(1) agrees after inserting an empty line after the variable declaration)
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2022/05/04 12:57:50 Modified files: lib/libc/gen : vis.c Log message: Found two multiple evaluation macros. One of them so long and scary it too many people to unravel correctly and place into a static function. While here, move the flags bits into local variables, which reduces the amount of () in the checks. help from millert, miod, tedu
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 12:56:34 Modified files: lib/libcrypto/kdf: hkdf_evp.c kdf_err.c Log message: KNF according to knfmt(1)
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 12:49:50 Modified files: lib/libcrypto/kdf: hkdf_evp.c kdf.h kdf_err.c Log message: Add RCS tags
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 12:48:55 Modified files: lib/libcrypto/kdf: hkdf_evp.c kdf_err.c Log message: Restore copyright years to 2016-2018 as they were before the previous commit.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 12:47:26 Modified files: lib/libcrypto/kdf: hkdf_evp.c kdf_err.c Log message: Reinstate the licenses that were replaced with license stubs in OpenSSL commits d2e9e320186f0917cc940f46bdf1a7e4120da9b0 and b6cff313cbb1d0381b329fe4f6a8f009cdb270e4
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 12:37:00 Modified files: lib/libcrypto/kdf: kdf.h Log message: Bump copyright years to 2016-2018 as it was before the previous commit.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 12:36:03 Modified files: lib/libcrypto/kdf: kdf.h Log message: Reinstate the license that was replaced with a stub in OpenSSL commit 21dcbebc6e35419f1842f39a125374ea1ba45693
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 12:27:39 Modified files: lib/libcrypto/kdf: kdf.h Removed files: lib/libcrypto/kdf: kdferr.h Log message: Inline kdferr.h at the end of kdf.h
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 12:19:18 Added files: lib/libcrypto/kdf: hkdf_evp.c Removed files: lib/libcrypto/kdf: hkdf.c Log message: Rename hkdf.c to hkdf_evp.c to avoid a name clash with hkdf/hkdf.c
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 12:02:08 Log message: Import HKDF code from OpenSSL 1.1.1o This imports verbatim copies as of the OpenSSL_1_1_1o tag of crypto/kdf/hkdf.c crypto/kdf/hkdf_err.c include/openssl/kdf.h include/openssl/kdferr.h from https://www.github.com/openssl/openssl.git into lib/libcrypto/kdf. We only want the EVP interface to HKDF since some ports need them. Not yet linked to the build since it will not compile. Follow-on commits will add KNF, clean up and make this compile. Tests of an early draft version by abieber and Caspar Schutijser ok jsing Status: Vendor Tag: tb Release Tags: tb_20220504 N src/lib/libcrypto/kdf/hkdf.c N src/lib/libcrypto/kdf/kdf_err.c N src/lib/libcrypto/kdf/kdf.h N src/lib/libcrypto/kdf/kdferr.h No conflicts created by this import
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: clau...@cvs.openbsd.org 2022/05/04 10:52:10 Modified files: sys/net: route.c route.h sys/netinet: ip_icmp.c ip_input.c ip_mroute.c ip_mroute.h sys/netinet6 : icmp6.c ip6_input.c ip6_mroute.c ip6_mroute.h Log message: Move rttimer callback function from the rttimer itself to rttimer_queue. All users use the same callback per queue so that makes sense. Also replace rt_timer_queue_destroy() with rt_timer_queue_flush(). OK bluhm@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: bl...@cvs.openbsd.org 2022/05/04 09:29:58 Modified files: sys/netinet: ip_spd.c Log message: In ipsp_spd_lookup() rename the parameter tdbp to tdbin as it is always the incoming TDB that has to be checked. from markus@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 09:21:25 Modified files: usr.sbin/rpki-client: main.c Log message: rpki-client: bypass timeout in file mode. ok claudio
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2022/05/04 08:58:26 Modified files: sys/uvm: uvm.h uvm_map.c uvm_page.c uvm_pdaemon.c Log message: Merge swap-backed and object-backed inactive page lists. ok millert@, kettenis@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: bl...@cvs.openbsd.org 2022/05/04 08:47:46 Modified files: usr.sbin/syslogd: syslogd.c Log message: Variable pri is uninitialized, use msg.m_pri instead. This affects the priority of userland messages with kernel or unspecified facility. broken in previous commit; fix from markus@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2022/05/04 07:07:35 Modified files: usr.sbin/rpki-client: main.c Log message: Tweak wording of a comment to reflect current reality better.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: js...@cvs.openbsd.org 2022/05/04 04:57:48 Modified files: lib/libcrypto/asn1: tasn_dec.c Log message: Rewrite asn1_collect() and asn1_find_end() with CBS. Use more readable variable and arguments names in the process. ok tb@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: js...@cvs.openbsd.org 2022/05/04 04:53:26 Modified files: lib/libcrypto/asn1: tasn_dec.c Log message: Avoid special handling of definite length before calling asn1_find_end(). The asn1_find_end() function handles definite length ASN.1, which means that there is no point in the only caller having code to explicitly handle definite length - it can just call the function. ok tb@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: js...@cvs.openbsd.org 2022/05/04 04:47:36 Modified files: lib/libcrypto/asn1: tasn_dec.c Log message: Change asn1_check_tag_cbs() out_len from long to size_t. The long vs size_t checks can be handled in the asn1_check_tag() wrapper and this will help to avoid propagating long vs size_t issues into new code. ok tb@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: clau...@cvs.openbsd.org 2022/05/04 04:17:16 Modified files: usr.sbin/rpki-client: http.c Log message: Remove extra empty line
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2022/05/04 02:11:11 Modified files: sys/dev/pci: pcidevs.h pcidevs_data.h Log message: regen
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2022/05/04 02:10:43 Modified files: sys/dev/pci: pcidevs Log message: update Intel ADL-S graphics ids, add ADL-N RPL-S RPL-P
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: mar...@cvs.openbsd.org 2022/05/04 01:31:22 Modified files: usr.bin/ssh: channels.c Log message: make sure stdout is non-blocking; ok djm@
Re: CVS: cvs.openbsd.org: src
On Tue, May 03, 2022 at 07:32:47AM -0600, Alexandr Nedvedicky wrote:
> CVSROOT: /cvs
> Module name: src
> Changes by: sas...@cvs.openbsd.org 2022/05/03 07:32:47
>
> Modified files:
> sys/net: pf.c
>
> Log message:
> Make pf(4) more paranoid about IGMP/MLP messages. MLD/IGMP messages
> with ttl other than 1 will be discarded. Also MLD messages with
> other than link-local source address will be discarded. IGMP
> messages with destination address other than multicast class
> will be discarded.
>
> feedback and OK bluhm@, cluadio@
This most likely broke regress.
> sys/net/pf_opts:
Exit: 1
Duration: 00:01:32
Log: 153-sys-net-pf_opts.log
run-bpf-mcast
sleep 2 # XXX
doas -n pkill -f '^/usr/sbin/tcpdump -l -e -vvv -s 2048 -ni'
2 packets received by filter
0 packets dropped by kernel
4 packets received by filter
0 packets dropped by kernel
2 packets received by filter
0 packets dropped by kernel
rm -f stamp-bpf*
# Check that multicast protocol packet with router alert passed
grep ' 127.0.0.12: igmp query .* IPOPT-148{4}' lo12.tcpdump
05:00:20.575196 127.0.0.12 > 127.0.0.12: igmp query [ttl 1] (id 1, len 32,
optlen=4 IPOPT-148{4})
grep ' fe80::12: HBH (rtalert:.* icmp6: multicast ' lo12.tcpdump
05:00:23.921469 fe80::12 > fe80::12: HBH (rtalert: 0x) icmp6: multicast
listener query max resp delay: 1 addr: :: [icmp6 cksum ok] (len 32, hlim 64)
! grep '127.0.0.11' pflog0.tcpdump
05:00:18.943109 rule def/(ip-option) [uid 0, pid 0] pass in on lo11: 127.0.0.11
> 127.0.0.11: igmp query [ttl 1] (id 1, len 32, optlen=4 IPOPT-148{4})
*** Error 1 in . (Makefile:321 'run-bpf-mcast')
FAILED
run-bpf-mcast-bad
sleep 2 # XXX
doas -n pkill -f '^/usr/sbin/tcpdump -l -e -vvv -s 2048 -ni'
2 packets received by filter
0 packets dropped by kernel
4 packets received by filter
0 packets dropped by kernel
2 packets received by filter
0 packets dropped by kernel
rm -f stamp-bpf*
# Check that multicast protocol packet with options were blocked
grep ' 127.0.0.12: igmp query .* IPOPT-3{4}' pflog0.tcpdump
05:00:31.505047 rule def/(ip-option) [uid 0, pid 0] pass in on lo12: 127.0.0.12
> 127.0.0.12: igmp query [ttl 1] (id 1, len 32, optlen=4 IPOPT-3{4})
grep ' fe80::12: HBH (type 0x03:.* icmp6: multicast ' pflog0.tcpdump
05:00:34.842050 rule def/(ip-option) [uid 0, pid 0] pass in on lo12: fe80::12 >
fe80::12: HBH (type 0x03: len=0) icmp6: multicast listener query max resp
delay: 1 addr: :: [icmp6 cksum ok] (len 32, hlim 64)
! grep '127.0.0.11' pflog0.tcpdump
05:00:29.868675 rule def/(ip-option) [uid 0, pid 0] pass in on lo11: 127.0.0.11
> 127.0.0.11: igmp query [ttl 1] (id 1, len 32, optlen=4 IPOPT-3{4})
*** Error 1 in . (Makefile:341 'run-bpf-mcast-bad')
FAILED
