This URL: https://git.freebsd.catflap.org/src/stable-13/raw-log-html/ ____________________________________________________________________________________________________________ Commit: ead225cd33461e5c0f126de43b2c7214ba132c66 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ead225cd33461e5c0f126de43b2c7214ba132c66 Author: Yuichiro NAITO (Tue 7 Apr 2026 16:25:09 BST) Committer: Kevin Bowling (Sun 19 Apr 2026 11:42:17 BST) ixgbe: Fix MRQC register value. Focus on the MRQE field of the MRQC register, which is 4 bits wide, and we use these 3 types of values. - IXGBE_MRQC_RSSEN 0x1 (non VF mode) - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs) - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs) If we always take a bitwise OR with IXGBE_MRQC_RSSEN, IXGBE_MRQC_VMDQRSS32EN will never be chosen. Select these 3 types of values for the proper case. Signed-off-by: Yuichiro NAITO Pull Request: https://github.com/freebsd/freebsd-src/pull/2132 (cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09) M sys/dev/ixgbe/if_ix.c M sys/dev/ixgbe/if_sriov.c M sys/dev/ixgbe/ixgbe_sriov.h ____________________________________________________________________________________________________________ Commit: cef2490a71efeb0a1b6ed7a03ecf19f2cbc97428 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cef2490a71efeb0a1b6ed7a03ecf19f2cbc97428 Author: Michael Osipov (Mon 6 Apr 2026 19:21:48 BST) Committer: Michael Osipov (Fri 17 Apr 2026 08:48:12 BST) ciss.4: List all devices supported by ciss(4) PR: 285744 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=285744 ) Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56285 (cherry picked from commit 54f5d20492d231b5c2ddc6f1d94dbffa1707d820) M share/man/man4/ciss.4 ____________________________________________________________________________________________________________ Commit: c80f52565bc8bd3deb95dc863666d89449cb364f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c80f52565bc8bd3deb95dc863666d89449cb364f Author: Andre Albsmeier (Sun 12 Apr 2026 17:10:59 BST) Committer: Michael Osipov (Wed 15 Apr 2026 09:48:11 BST) daemon(8): Add "--output-file -o" to list of options enabling supervision mode This is the small internal doc fix from https://reviews.freebsd.org/D46313 Reviewed by: michaelo Approved by: (blanket; comment fix) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55325 (cherry picked from commit e9a69948a8837601d71e556550a272ca85c03e48) M usr.sbin/daemon/daemon.c ____________________________________________________________________________________________________________ Commit: c2a961723f830dac095a5d6fef69a7b1ad911335 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c2a961723f830dac095a5d6fef69a7b1ad911335 Author: Michael Osipov (Thu 9 Apr 2026 12:39:41 BST) Committer: Michael Osipov (Tue 14 Apr 2026 08:30:06 BST) loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS' Both (U)EFI and BIOS are completely different things, be precise and don't use them together. Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56329 (cherry picked from commit 4f684e929de1275b1099b17b2a2cff0d3f4af223) M stand/efi/loader/main.c M stand/man/loader.efi.8 M usr.sbin/efibootmgr/efibootmgr.8 ____________________________________________________________________________________________________________ Commit: 50f7b62f0862f764215cee98547d5b8c0979ec26 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=50f7b62f0862f764215cee98547d5b8c0979ec26 Author: Mark Johnston (Wed 8 Apr 2026 05:21:09 BST) Committer: Mark Johnston (Mon 13 Apr 2026 03:58:16 BST) vm_fault: Reset m_needs_zeroing properly - When allocating a page, we should only consider the PG_ZERO flag when handling the top-level page. - Unconditionally reset the flag when restarting the fault handler. Previously, vm_fault_busy_sleep() would fail to reset it. PR: 294039 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=294039 ) Reviewed by: kib Tested by: Peter Much MFC after: 3 days Fixes: cff67bc43df1 ("vm_fault: only rely on PG_ZERO when the page was newly allocated") Differential Revision: https://reviews.freebsd.org/D56234 (cherry picked from commit 04132e01004316ddd0e0cde6ef15b100b7b1844d) M sys/vm/vm_fault.c ____________________________________________________________________________________________________________ Commit: bb5347cc6f78949dab1c631af546aa3fbd87e724 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bb5347cc6f78949dab1c631af546aa3fbd87e724 Author: Mark Johnston (Fri 27 Mar 2026 00:24:18 GMT) Committer: Mark Johnston (Mon 13 Apr 2026 03:53:41 BST) kqueue: Fix a race when adding an fd-based knote to a queue When registering a new kevent backed by a file descriptor, we first look up the file description with fget(), then lock the kqueue, then see if a corresponding knote is already registered. If not, and KN_ADD is specified, we add the knote to the kqueue. closefp_impl() interlocks with this process by calling knote_fdclose(), which locks each kqueue and checks to see if the fd is registered with a knote. But, if userspace closes an fd while a different thread is registering it, i.e., after fget() succeeds but before the kqueue is locked, then we may end up with a mismatch in the knote table, where the knote kn_fp field points to a different file description than the knote ident. Fix the problem by double-checking before registering a knote. Add a new fget_noref_unlocked() helper for this purpose. It is a clone of fget_noref(). We could simply use fget_noref(), but I like having an explicit unlocked variant. PR: 293382 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293382 ) Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55852 (cherry picked from commit 8f3227f527567aef53da845ab78da8e16d9051c1) M sys/kern/kern_event.c M sys/sys/filedesc.h ____________________________________________________________________________________________________________ Commit: 10417355a767f69325e2955dd3a6d44a32e5714e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=10417355a767f69325e2955dd3a6d44a32e5714e Author: Dag-Erling Smørgrav (Tue 7 Apr 2026 12:04:37 BST) Committer: Dag-Erling Smørgrav (Sun 12 Apr 2026 06:59:39 BST) libc: Add missing MLINK for stravis(3) MFC after: 1 week Fixes: 8dfeba04eb36 ("Update to a June 8th snapshot of (un)vis form NetBSD.") Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D56260 (cherry picked from commit a09d06bc5bff64baab76220a66c3501b89899134) M lib/libc/gen/Makefile.inc ____________________________________________________________________________________________________________ Commit: b3bf8410a56260bc0f26b5197b3c8764f3283e9d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b3bf8410a56260bc0f26b5197b3c8764f3283e9d Author: Dag-Erling Smørgrav (Wed 1 Apr 2026 18:14:16 BST) Committer: Dag-Erling Smørgrav (Tue 7 Apr 2026 16:52:56 BST) cd9660: Add length checks to Rock Ridge parser * cd9660_rrip_slink() did not check that the lengths of individual entries do not exceed the length of the overall record. * cd9660_rrip_altname() did not check that the length of the record was at least 5 before subtracting 5 from it. Note that in both cases, a better solution would be to check the length of the data before calling the handler, or immediately upon entry of the handler, but this would require significant refactoring. MFC after: 1 week Reported by: Calif.io in collaboration with Claude and Anthropic Research Reported by: Adam Crosser, Praetorian Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56215 (cherry picked from commit d0afead876076f605c363f03d92304d1bd75be1c) M sys/fs/cd9660/cd9660_rrip.c ____________________________________________________________________________________________________________ Commit: 75767bb212946444a4ab7a5570a20d836ab964dd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=75767bb212946444a4ab7a5570a20d836ab964dd Author: Philip Paeps (Thu 2 Apr 2026 01:12:18 BST) Committer: Philip Paeps (Sun 5 Apr 2026 06:37:13 BST) contrib/expat: import expat 2.7.5 Changes: https://github.com/libexpat/libexpat/blob/R_2_7_5/expat/Changes https://github.com/libexpat/libexpat/blob/R_2_7_4/expat/Changes Security: CVE-2026-32776 Security: CVE-2026-32777 Security: CVE-2026-32778 Security: CVE-2026-24515 Security: CVE-2026-25210 (cherry picked from commit ae04c7bbf065278687fa930e81a96767e9009d38) M contrib/expat/Changes M contrib/expat/Makefile.am M contrib/expat/Makefile.in M contrib/expat/README.md M contrib/expat/configure.ac M contrib/expat/doc/Makefile.in M contrib/expat/doc/reference.html M contrib/expat/doc/xmlwf.1 M contrib/expat/doc/xmlwf.xml M contrib/expat/examples/Makefile.in M contrib/expat/expat_config.h.in M contrib/expat/fix-xmltest-log.sh M contrib/expat/lib/Makefile.am M contrib/expat/lib/Makefile.in M contrib/expat/lib/expat.h M contrib/expat/lib/expat_external.h M contrib/expat/lib/internal.h A contrib/expat/lib/libexpat.map.in M contrib/expat/lib/xmlparse.c M contrib/expat/lib/xmlrole.c M contrib/expat/lib/xmltok.c M contrib/expat/lib/xmltok_ns.c M contrib/expat/tests/Makefile.in M contrib/expat/tests/basic_tests.c M contrib/expat/tests/benchmark/Makefile.in M contrib/expat/tests/handlers.c M contrib/expat/tests/handlers.h M contrib/expat/tests/misc_tests.c M contrib/expat/tests/nsalloc_tests.c M contrib/expat/xmlwf/Makefile.in M contrib/expat/xmlwf/xmlfile.c M contrib/expat/xmlwf/xmlwf.c M contrib/expat/xmlwf/xmlwf_helpgen.py M lib/libexpat/expat_config.h M lib/libexpat/libbsdxml.3 ____________________________________________________________________________________________________________ Commit: e28c20959cd3aa526a6e86d8e9fe55fda326a951 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e28c20959cd3aa526a6e86d8e9fe55fda326a951 Author: Dag-Erling Smørgrav (Sat 21 Mar 2026 07:21:33 GMT) Committer: Dag-Erling Smørgrav (Sat 4 Apr 2026 09:59:33 BST) tunefs: Don't combine GEOM journaling with SU GEOM journaling shouldn't be used at the same time as soft updates, so don't enable one if the other is already in use. MFC after: 1 week PR: 293896 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293896 ) Reviewed by: mckusick Differential Revision: https://reviews.freebsd.org/D56002 (cherry picked from commit b1f72dd2a9a5e69a310b9e76b55f16cff433b8da) M sbin/tunefs/tunefs.8 M sbin/tunefs/tunefs.c ____________________________________________________________________________________________________________ Commit: a4b2be2f6a9a155c56c876aabf3175301c4a84de URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a4b2be2f6a9a155c56c876aabf3175301c4a84de Author: Dag-Erling Smørgrav (Sat 21 Mar 2026 07:21:28 GMT) Committer: Dag-Erling Smørgrav (Sat 4 Apr 2026 09:59:33 BST) newfs: Don't combine GEOM journaling with SU GEOM journaling shouldn't be used at the same time as soft updates, so don't enable soft updates if GEOM journaling has been requested, and error out if both are explicitly requested. MFC after: 1 week PR: 293896 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293896 ) Reviewed by: mckusick Differential Revision: https://reviews.freebsd.org/D55999 (cherry picked from commit e30fcdaae2e68458da83d5420e6034c5f384e5f2) M sbin/newfs/newfs.8 M sbin/newfs/newfs.c ____________________________________________________________________________________________________________ Commit: 5fdb633777d2acd696dcb11ccd5b49b707f8bf35 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5fdb633777d2acd696dcb11ccd5b49b707f8bf35 Author: Arthur Kiyanovski (Sat 14 Feb 2026 01:34:56 GMT) Committer: Arthur Kiyanovski (Thu 2 Apr 2026 23:50:05 BST) ena: Update driver version to v2.8.2 Bug Fixes: * Verify that an ENA ring is in netmap only in native mode Minor Changes: * Move parenthesis to correct place in switch * Add comment * Reorder define Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D55698 Sponsored by: Amazon, Inc. (cherry picked from commit 96c5eaf0ac6b98d0832e1037d672064de43a7e00) M sys/dev/ena/ena.h ____________________________________________________________________________________________________________ Commit: f5370d118335defda098f0589ee96e84e3645174 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f5370d118335defda098f0589ee96e84e3645174 Author: Arthur Kiyanovski (Sat 14 Feb 2026 01:34:50 GMT) Committer: Arthur Kiyanovski (Thu 2 Apr 2026 23:50:05 BST) ena: Verify that an ENA ring is in netmap only in native mode netmap operates in two modes: 1) Emulated - netmap handling is done by the network stack, the NIC driver operates transparently to netmap. 2) Native - netmap management is done by the NIC driver. When checking whether a specific ENA ring is running in netmap mode, only the following checks were done: 1. IFCAP_NETMAP - Check whether netmap capability is enabled on the device. 2. NKR_NETMAP_ON - Check whether netmap is actively using this ring. The above checks implied that the netmap mode is native and the ENA driver needs to handle the netmap logic. The code was missing an explicit check on whether native mode is actually on (NAF_NATIVE). This led to a case where though emulated mode was used and a netmap application was turned on, the ENA driver still managed netmap logic partially and caused missing buffers and lack of refill as part of the datapath. Note: Enabling netmap emulated mode is insufficient and there's a need to load a netmap program in order to trigger this use-case. Add an explicit check of whether NAF_NATIVE mode is set. The issue was reported in [1]. [1]: https://github.com/amzn/amzn-drivers/issues/361 Fixes: 358bcc4c6cde ("Add support for ENA NETMAP partial initialization") Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D55697 Sponsored by: Amazon, Inc. (cherry picked from commit 97e84c587d6f86aa883720296449b380adcf6915) M sys/dev/ena/ena_netmap.c ____________________________________________________________________________________________________________ Commit: 0ae28e5776eba547df52b6ce69da4c3d725525b8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0ae28e5776eba547df52b6ce69da4c3d725525b8 Author: Arthur Kiyanovski (Sat 14 Feb 2026 01:34:32 GMT) Committer: Arthur Kiyanovski (Thu 2 Apr 2026 23:50:05 BST) ena: Minor changes 1. Move parenthesis to correct place in switch and fix include order 2. Add comment at the end of an ifdef for clarity 3. Change include order. Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D55696 Sponsored by: Amazon, Inc. (cherry picked from commit 2667a8454cff5896c7b467c78cd4ace5ad40f5eb) M sys/dev/ena/ena.c M sys/dev/ena/ena_rss.h ____________________________________________________________________________________________________________ Commit: 36963d2497248f0d334b02bbc3947e224ca8e8dc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=36963d2497248f0d334b02bbc3947e224ca8e8dc Author: Brooks Davis (Thu 19 Feb 2026 14:43:57 GMT) Committer: Jessica Clarke (Thu 2 Apr 2026 11:11:05 BST) .github: support all stable branches If this eventually poses a problem for unsupported branches we can fix them directly. Sponsored by: Innovate UK Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53838 (cherry picked from commit 1e189279576497498cafad6f8c0a36a377b786a3) M .github/workflows/cross-bootstrap-tools.yml ____________________________________________________________________________________________________________ Commit: db9fd99ba8bd638f64079d8f0f8a2b282c71a4df URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=db9fd99ba8bd638f64079d8f0f8a2b282c71a4df Author: Jessica Clarke (Mon 23 Mar 2026 16:56:09 GMT) Committer: Jessica Clarke (Thu 2 Apr 2026 11:02:04 BST) cross-build: Provide mempcpy when building on macOS We could patch the tzcode config to not use it, but it's simple to provide an implementation of it and avoid spreading cross-build bootstrapping special cases. Fixes: ff2c98b30b57 ("tzcode: Update to 2026a") MFC after: 1 week (cherry picked from commit 47402c9422ec6c9ba76d96414f5a08bd35a9e1fd) M tools/build/Makefile M tools/build/cross-build/include/mac/string.h ____________________________________________________________________________________________________________ Commit: 0d995ef541d79c79098ebf122693d7a3f1b5f25b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0d995ef541d79c79098ebf122693d7a3f1b5f25b Author: Dag-Erling Smørgrav (Tue 24 Mar 2026 10:58:53 GMT) Committer: Dag-Erling Smørgrav (Thu 2 Apr 2026 10:56:21 BST) syslogd: Allow killing when in foreground Normally, syslogd reacts only to SIGTERM, and ignores SIGINT and SIGQUIT unless in debug mode. Extend that to also apply when running in the foreground. MFC after: 1 week Reviewed by: jfree Differential Revision: https://reviews.freebsd.org/D55886 (cherry picked from commit 828de702ada854b5f09f447ba06e4e08e976ba07) M usr.sbin/syslogd/syslogd.c ____________________________________________________________________________________________________________ Commit: bc735d80e2e8af03b2b5ae269080761659970d65 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bc735d80e2e8af03b2b5ae269080761659970d65 Author: Dag-Erling Smørgrav (Wed 25 Mar 2026 00:41:23 GMT) Committer: Dag-Erling Smørgrav (Thu 2 Apr 2026 10:48:17 BST) m4: Misc style fixes MFC after: 1 week Reviewed by: fuz Differential Revision: https://reviews.freebsd.org/D55794 (cherry picked from commit 41474e78c493184f023723d1f86539e07bb01b92) M usr.bin/m4/eval.c M usr.bin/m4/expr.c M usr.bin/m4/look.c M usr.bin/m4/main.c M usr.bin/m4/mdef.h M usr.bin/m4/misc.c ____________________________________________________________________________________________________________ Commit: a6eda8dd2d6ba7f2d0d3ddb23f656c174e91d812 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a6eda8dd2d6ba7f2d0d3ddb23f656c174e91d812 Author: Marc Espie (Wed 25 Mar 2026 00:41:18 GMT) Committer: Dag-Erling Smørgrav (Thu 2 Apr 2026 10:48:17 BST) m4: Stop abbreviating builtin names * Stop abbreviating macro names half-randomly to 8 chars, this is no longer 1990. * Likewise for function names (in particular use doindex for a function that is notably different from the classic index function). * Rename a few things for more fidelity: eval is the builtin name, not expr and your maketemp/mkstemp conform to mkstemp semantics for better security. * Rewrap a few comments that were ludicrously short. No functional changes except improved accuracy of some error messages. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55793 (cherry picked from commit f8f6f1cbd576ab5f15cef178cc05251365652f74) M usr.bin/m4/eval.c M usr.bin/m4/extern.h M usr.bin/m4/look.c M usr.bin/m4/main.c M usr.bin/m4/mdef.h M usr.bin/m4/misc.c ____________________________________________________________________________________________________________ Commit: c7e5e9642a4c40a98450f8377e6519228c965358 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c7e5e9642a4c40a98450f8377e6519228c965358 Author: Dag-Erling Smørgrav (Tue 24 Mar 2026 11:02:32 GMT) Committer: Dag-Erling Smørgrav (Thu 2 Apr 2026 10:48:17 BST) file: Parse some UFS2 flags This allows libmagic to recognize the FS_DOSOFTDEP, FS_SUJ, FS_GJOURNAL, FS_ACLS, and FS_NFS4ACLS flags on a UFS2 file system. Accepted upstream as 482259e5e952. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56010 (cherry picked from commit fa03f93e8829a7689101303fbe9fb06654ca14ed) M contrib/file/magic/Magdir/filesystems ____________________________________________________________________________________________________________ Commit: 99ec7f9b9e4836733fbfeea272422a4d0d7adfd8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=99ec7f9b9e4836733fbfeea272422a4d0d7adfd8 Author: Mark Johnston (Tue 24 Mar 2026 02:12:42 GMT) Committer: Gordon Tetlow (Thu 26 Mar 2026 01:30:00 GMT) rpcsec_gss: Fix a stack overflow in svc_rpc_gss_validate() svc_rpc_gss_validate() copies the input message into a stack buffer without ensuring that the buffer is large enough. Sure enough, oa_length may be up to 400 bytes, much larger than the provided space. This enables an unauthenticated user to trigger an overflow and obtain remote code execution. Add a runtime check which verifies that the copy won't overflow. Approved by: so Security: FreeBSD-SA-26:08.rpcsec_gss Security: CVE-2026-4747 Reported by: Nicholas Carlini Reviewed by: rmacklem Fixes: a9148abd9da5d (cherry picked from commit 143293c14f8de00c6d3de88cd23fc224e7014206) M lib/librpcsec_gss/svc_rpcsec_gss.c M sys/rpc/rpcsec_gss/svc_rpcsec_gss.c ____________________________________________________________________________________________________________ Commit: 536751cb4e159b7957e2b63ba44924b2f7f8e5cc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=536751cb4e159b7957e2b63ba44924b2f7f8e5cc Author: Kristof Provost (Thu 19 Mar 2026 07:21:51 GMT) Committer: Kristof Provost (Wed 25 Mar 2026 07:12:49 GMT) pf: include all elements when hashing rules MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit c6bcf6e6fd507d952a48226b51cc161b8ef972a2) M sys/netpfil/pf/pf_ioctl.c ____________________________________________________________________________________________________________ Commit: 6666b2a0e7c26e9e0d913955765c7eb252c1b10a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6666b2a0e7c26e9e0d913955765c7eb252c1b10a Author: Kristof Provost (Thu 12 Mar 2026 14:23:32 GMT) Committer: Kristof Provost (Tue 24 Mar 2026 06:15:01 GMT) pf tests: verify that we handle address range rules correctly There's been a problem where rules which differed only in address ranges were considered duplicates and not added. Test for this. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit ab74151e8d097b263237942c0b12277098bc9533) M tests/sys/netpfil/pf/pass_block.sh ____________________________________________________________________________________________________________ Commit: d107424a44b3fd08078218b22f55feefde3f285f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d107424a44b3fd08078218b22f55feefde3f285f Author: Michael Gmelin (Thu 12 Mar 2026 14:18:09 GMT) Committer: Kristof Provost (Tue 24 Mar 2026 06:13:54 GMT) pf: Fix hashing of IP address ranges This corrects the false detection of duplicate rules. MFC after: 1 week Reviewed by: kp (cherry picked from commit 1fa873c93c8b08561c53107c7b90c53dfad30ddc) M sys/netpfil/pf/pf_ioctl.c ____________________________________________________________________________________________________________ Commit: 2265cf938ec30d9658d787d4128541cc7b9bd67a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2265cf938ec30d9658d787d4128541cc7b9bd67a Author: Zhenlei Huang (Mon 16 Mar 2026 16:20:08 GMT) Committer: Zhenlei Huang (Fri 20 Mar 2026 10:03:43 GMT) ifnet: Fix decreasing the vnet interface count It should be decreased only when the interface has been successfully removed from the "active" list. This prevents vnet_if_return() from potential OOB writes to the allocated memory "pending". Reviewed by: kp, pouria Fixes: a779388f8bb3 if: Protect V_ifnet in vnet_if_return() MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55873 (cherry picked from commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7) (cherry picked from commit 1b7687f053afcf251ee7643ee5a4f22a225f4a02) (cherry picked from commit 47339e4a9209c1d1323f58d792e277792990e060) M sys/net/if.c ____________________________________________________________________________________________________________ Commit: 242346cb89f8d4ca97d933fc215bf2cf25f2ed0b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=242346cb89f8d4ca97d933fc215bf2cf25f2ed0b Author: Eugene Grosbein (Wed 4 Mar 2026 07:29:26 GMT) Committer: Eugene Grosbein (Wed 11 Mar 2026 07:23:00 GMT) me.4: MFC: link if_me kernel module to its manual page. (cherry picked from commit 46ba263d6eeb1c6029841b4c42f54912ad61de5c) M share/man/man4/Makefile ____________________________________________________________________________________________________________ Commit: ec22c4022ddbc62be17b2bc65fe8b6113c8d76e7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ec22c4022ddbc62be17b2bc65fe8b6113c8d76e7 Author: Zhenlei Huang (Sat 28 Feb 2026 11:35:42 GMT) Committer: Zhenlei Huang (Thu 5 Mar 2026 11:12:41 GMT) vnet: Ensure the space allocated by vnet_data_alloc() is sufficent aligned Some 32-bit architectures, e.g., armv7, require strict 8-byte alignment while doing atomic 64-bit access. Hence aligning to the pointer type (4-byte alignment) does not meet the requirement on those architectures. Make the space allocated by vnet_data_alloc() sufficent aligned to avoid unaligned access. PR: 265639 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265639 ) Diagnosed by: markj Reviewed by: jhb, markj Co-authored-by: jhb MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D55560 (cherry picked from commit 32beb3ae71cb320dbe4190a01c036943d99083b3) (cherry picked from commit 973d607b284ba68e63f0386af44c28bfde15add2) (cherry picked from commit baee504b868b9417c815c0de6474a0d6e5d6b4ac) M sys/net/vnet.c ____________________________________________________________________________________________________________ Commit: f2f74aeca53098e702733ee1f0831783e90c51f8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f2f74aeca53098e702733ee1f0831783e90c51f8 Author: Dag-Erling Smørgrav (Sat 28 Feb 2026 18:11:10 GMT) Committer: Dag-Erling Smørgrav (Thu 5 Mar 2026 08:06:43 GMT) libiscsiutil: Record dependency on libmd MFC after: 3 days Fixes: 6378393308bc ("Add an internal libiscsiutil library.") Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55596 (cherry picked from commit 05ca4837a3e9a413aabcf005abb14fff35088476) M lib/libiscsiutil/Makefile M share/mk/src.libnames.mk M usr.sbin/ctld/Makefile M usr.sbin/iscsid/Makefile ____________________________________________________________________________________________________________ Commit: c0b2aff48ff3fa1b0176003fb0f0dedd9e6cb2dc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c0b2aff48ff3fa1b0176003fb0f0dedd9e6cb2dc Author: Philip Paeps (Mon 2 Mar 2026 20:34:06 GMT) Committer: Philip Paeps (Thu 5 Mar 2026 01:33:52 GMT) contrib/tzdata: import tzdata 2026a Changes: https://github.com/eggert/tz/blob/2026a/NEWS (cherry picked from commit 6becc3dff922476d667c15f029e520da496d4295) M contrib/tzdata/Makefile M contrib/tzdata/NEWS M contrib/tzdata/backzone M contrib/tzdata/etcetera M contrib/tzdata/europe M contrib/tzdata/leap-seconds.list M contrib/tzdata/leapseconds M contrib/tzdata/theory.html M contrib/tzdata/version M contrib/tzdata/zonenow.tab ____________________________________________________________________________________________________________ Commit: ba5f7719f63ea1bde229ff0ff6204cf91516c8ce URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ba5f7719f63ea1bde229ff0ff6204cf91516c8ce Author: Dag-Erling Smørgrav (Thu 26 Feb 2026 06:15:14 GMT) Committer: Dag-Erling Smørgrav (Wed 4 Mar 2026 14:46:06 GMT) lpd: Add timeout option Set a 120-second receive timeout on all client connections, and add a command-line option to change that value. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55400 (cherry picked from commit 56fbfd1ecdc78fc99b3a2e381c355ce8980de39d) M usr.sbin/lpr/lpd/lpd.8 M usr.sbin/lpr/lpd/lpd.c ____________________________________________________________________________________________________________ Commit: 88dc56a6edbc23d8912bff3e1e7ec2633d92bf70 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=88dc56a6edbc23d8912bff3e1e7ec2633d92bf70 Author: Dag-Erling Smørgrav (Thu 26 Feb 2026 06:15:06 GMT) Committer: Dag-Erling Smørgrav (Wed 4 Mar 2026 14:46:05 GMT) lpd: Improve robustness * Check for integer overflow when receiving file sizes. * Check for buffer overflow when receiving file names, and fully validate the names. * Check for integer overflow when checking for available disk space. * Check for I/O errors when sending status codes. * Enforce one job per connection and one control file per job (see code comments for additional details). * Simplify readfile(), avoiding constructs vulnerable to integer overflow. * Don't delete files we didn't create. * Rename read_number() to read_minfree() since that's all it's used for, and move all the minfree logic into it. * Fix a few style issues. PR: 293278 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293278 ) MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55399 (cherry picked from commit 9065be0a5902e058d25a42bd9b3fbe9dc28b189d) M usr.sbin/lpr/lpd/recvjob.c ____________________________________________________________________________________________________________ Commit: 9711a6d01b15b50103829e4fc9bddb7e8663a245 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9711a6d01b15b50103829e4fc9bddb7e8663a245 Author: Elyes Haouas (Wed 15 Mar 2023 02:09:16 GMT) Committer: Dag-Erling Smørgrav (Wed 4 Mar 2026 14:46:05 GMT) lpr: Remove trailing semicolon Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/654 (cherry picked from commit 365348f66a47df247b5289b8a86fb20b36d778c1) M usr.sbin/lpr/lpd/recvjob.c ____________________________________________________________________________________________________________ Commit: d3265561e2470e8370ccc7aadb0178489d63a231 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d3265561e2470e8370ccc7aadb0178489d63a231 Author: Chris Rees (Thu 15 Apr 2021 13:26:10 BST) Committer: Dag-Erling Smørgrav (Wed 4 Mar 2026 14:46:05 GMT) lpd: Update SYNOPSIS with new flag Reported by: 0mp (cherry picked from commit cebcca89f1b059438cc329bde4d8ad254a303623) M usr.sbin/lpr/lpd/lpd.8 ____________________________________________________________________________________________________________ Commit: 1afa6f918bd502037b6e9c7a8ac0efbf7b7dd43f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1afa6f918bd502037b6e9c7a8ac0efbf7b7dd43f Author: Chris Rees (Thu 15 Apr 2021 12:40:16 BST) Committer: Dag-Erling Smørgrav (Wed 4 Mar 2026 14:46:05 GMT) lpd.8: Chase Dd-- took old value when merging (cherry picked from commit 56b0f5f360b6039c6a696aa241aaa02a16ff6a0a) M usr.sbin/lpr/lpd/lpd.8 ____________________________________________________________________________________________________________ Commit: c7460134fb26bd41ed8da0f666b445d705e4cff2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c7460134fb26bd41ed8da0f666b445d705e4cff2 Author: Chris Rees (Sat 3 Apr 2021 18:51:56 BST) Committer: Dag-Erling Smørgrav (Wed 4 Mar 2026 14:46:05 GMT) lpd: Add -F flag to prevent daemonizing This is necessary for use with supervision, e.g. runit. I chose -F simply because that is what the folks at LPRng use. Approved by: pfg, gad, ngie Differential Revision: https://reviews.freebsd.org/D29566 (cherry picked from commit 3c6366067036d4573528309a0a4d3b52e2a76ae7) M usr.sbin/lpr/lpd/lpd.8 M usr.sbin/lpr/lpd/lpd.c ____________________________________________________________________________________________________________ Commit: c1788a925a93223dbd78f8c9988b4a296428b951 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c1788a925a93223dbd78f8c9988b4a296428b951 Author: Dag-Erling Smørgrav (Wed 25 Feb 2026 21:12:36 GMT) Committer: Dag-Erling Smørgrav (Wed 4 Mar 2026 14:46:04 GMT) system(3): Clarify return values Our manual page currently states that system() will return 127 if it fails to execute the shell. The actual return value is, to quote POSIX, “as if the command language interpreter had terminated using exit(127) or _exit(127)”. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: bnovkov, kevans Differential Revision: https://reviews.freebsd.org/D55483 (cherry picked from commit 7305604b29d3db29c9bb5de6e7a25829fb541d1e) M lib/libc/stdlib/system.3 ____________________________________________________________________________________________________________ Commit: 55eff489d9cdae5620bf60bb79d996a059404ed2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=55eff489d9cdae5620bf60bb79d996a059404ed2 Author: Kevin Bowling (Fri 13 Feb 2026 06:30:22 GMT) Committer: Kevin Bowling (Fri 27 Feb 2026 23:11:11 GMT) e1000: Increase FC pause/refresh time on PCH2 and newer This corresponds to Linux f74dc880098b4a29f76d756b888fb31d81ad9a0c That commit does not provide any public background detail, but it's been in use for over 5 years and corresponds to previous chip bugs w.r.t. automatic generation of PAUSE frames. Reviewed by: kgalazka Differential Revision: https://reviews.freebsd.org/D54555 (cherry picked from commit 2bdec2ee73be7dbafce9982b0dc5c273918a5443) M sys/dev/e1000/if_em.c ____________________________________________________________________________________________________________ Commit: 59c399d38dd8c711a9b9ae2f6614eed80afdde63 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=59c399d38dd8c711a9b9ae2f6614eed80afdde63 Author: Zhenlei Huang (Fri 6 Feb 2026 17:52:53 GMT) Committer: Zhenlei Huang (Thu 26 Feb 2026 14:17:22 GMT) qlnxe: Remove a pointless copy back from the link-layer address On ifnet attaching, ether_ifattach() makes the link-layer address by shadow copying the ha->primary_mac. Well, the link-layer address will not be altered during attaching, thus it is pointless to copy it back. No functional change intended. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54883 (cherry picked from commit 4ac3081b282800158df7abe93f307d76e1b5b808) (cherry picked from commit 23ffd1650cc431e762387d384ede99ae085bc130) (cherry picked from commit 7d7cee09b9a4ac5cbcbac79cb7ccfef5d6db1e0f) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: 8f1de03b50d00211597d7221055b44890fea7fd8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8f1de03b50d00211597d7221055b44890fea7fd8 Author: Zhenlei Huang (Tue 22 Jul 2025 05:11:02 BST) Committer: Zhenlei Huang (Thu 26 Feb 2026 14:17:22 GMT) qlnxe: Advertise the IFCAP_HWSTATS capability The hardware can count statistics and the driver has already retrieved them via qlnx_get_counter(). Advertise the IFCAP_HWSTATS capability to avoid the net stack from double counting IFCOUNTER_IBYTES. Reviewed by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51451 (cherry picked from commit 386960a8805edc6d5ac6bb6215ad102a83314549) (cherry picked from commit bfbb93b6de6afc8aba8df90e2a28db1c93cbd143) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: baed1f130ab1ca0e553f2cb031f3cfd040ba3cfb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=baed1f130ab1ca0e553f2cb031f3cfd040ba3cfb Author: Kristof Provost (Thu 12 Jun 2025 17:53:33 BST) Committer: Zhenlei Huang (Thu 26 Feb 2026 14:17:22 GMT) qlnx: fix panic at startup While attaching the qlnx driver we can end up trying to call ifmedia functions before those are set up (through ether_ifattach() -> rtnl_handle_ifattach() -> dump_iface() -> get_operstate_ether() -> ifmedia_ioctl()). Postpone the ether_ifattach() until after the ifmedia setup. Reviewed by: markj,zlei Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D50819 MFC note: qlnxe(4) does not exhibit panic at startup on stable/13, but there's a small windows that the setup of ifmedia has not been done but other threads try to access the ifmedia, since the ifnet is public visible on ether_ifattach(). Postpone ether_ifattach() until after the ifmedia setup to prevent that. (cherry picked from commit 4f7473d18a62077a218ac00817bae09a95b8cbcb) (cherry picked from commit 8ef7ad95e9156bea689274c9d57fc961b203efe2) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: 783cec744b9025d4a0d933b39ee95b0085b677c3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=783cec744b9025d4a0d933b39ee95b0085b677c3 Author: Dag-Erling Smørgrav (Sat 21 Feb 2026 01:18:18 GMT) Committer: Dag-Erling Smørgrav (Thu 26 Feb 2026 04:03:52 GMT) libfetch: Gracefully skip unsupported protocols If socket() fails because the address family or protocol is unsupported, just continue with the next address. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55407 (cherry picked from commit b5d570e711da1dad303312bebaf1bd2fb720f0dc) M lib/libfetch/common.c ____________________________________________________________________________________________________________ Commit: c0ec07280e920cf8c672cffa0730676e2dd40d72 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c0ec07280e920cf8c672cffa0730676e2dd40d72 Author: Dag-Erling Smørgrav (Sat 21 Feb 2026 01:18:15 GMT) Committer: Dag-Erling Smørgrav (Thu 26 Feb 2026 04:03:52 GMT) libfetch: Fail hard if interrupted while connecting This fixes an issue where the first address that DNS returns is blocked by a packet filter, so we hang for a while, then the user hits Ctrl-C, interrupting connect(2), whereupon we move on to the next address, get a connection, request the file, and return to fetch(1), which sees that SIGINT was caught and bails. Note that we make no attempt to enforce fetchTimeout in the connection phase, and never have. It's feasible, but non-trivial, so we'll leave it as an exercise for future us. PR: 293312 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293312 ) MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55406 (cherry picked from commit afbdcd402bb439bd3d487baaad63b68e95929265) M lib/libfetch/common.c ____________________________________________________________________________________________________________ Commit: cee22ac13c7d1e64efa911fdd7649abd31b991cb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cee22ac13c7d1e64efa911fdd7649abd31b991cb Author: Dag-Erling Smørgrav (Sat 21 Feb 2026 01:18:11 GMT) Committer: Dag-Erling Smørgrav (Thu 26 Feb 2026 04:03:52 GMT) libfetch: Clean up fetch_info usage * Provide a wrapper for the common if (verbose) fetch_info(...) idiom. * Replace remaining instances of fprintf(stderr, ...) with fetch_info(). * Fix a few style nits. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55405 (cherry picked from commit 1b7c4d29fdfc975facdc43f6da50947cf3bb8e4a) M lib/libfetch/common.c ____________________________________________________________________________________________________________ Commit: c550d07d8d5f152b4b89f6c737188c30af199e3a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c550d07d8d5f152b4b89f6c737188c30af199e3a Author: Dag-Erling Smørgrav (Tue 17 Feb 2026 14:01:34 GMT) Committer: Dag-Erling Smørgrav (Thu 26 Feb 2026 04:03:51 GMT) m4: Fix eval output width According to POSIX, the optional third argument is the minimum number of digits to print regardless of sign. We interpreted it as the minimum width of the output including the sign. Additionally, the variable used to hold this value was confusingly named “maxdigits”. PR: 293214 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293214 ) MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55311 (cherry picked from commit 507c611aeac7ca9aed12353b1044bb21ab00afae) M usr.bin/m4/eval.c M usr.bin/m4/misc.c M usr.bin/m4/tests/eval.m4 M usr.bin/m4/tests/regress.eval.out ____________________________________________________________________________________________________________ Commit: f03fdff591aac090279b3a58030740172c80621e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f03fdff591aac090279b3a58030740172c80621e Author: Ahmad Khalifa (Tue 24 Feb 2026 20:11:26 GMT) Committer: Ahmad Khalifa (Thu 26 Feb 2026 03:10:09 GMT) efibootmgr.8: capitalize examples section header MFC after: 3 days (cherry picked from commit fac9ae3db4e6a28dfd467369e262f636e10a3b01) M usr.sbin/efibootmgr/efibootmgr.8 ____________________________________________________________________________________________________________ Commit: 8b476ffc4ea3f82f758714fee0289209bc980782 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8b476ffc4ea3f82f758714fee0289209bc980782 Author: Mark Johnston (Mon 23 Feb 2026 15:52:50 GMT) Committer: Mark Johnston (Tue 24 Feb 2026 16:03:14 GMT) rtsock: Fix stack overflow Approved by: so Security: FreeBSD-SA-26:05.route Security: CVE-2026-3038 Fixes: 92be2847e845 ("rtsock: Avoid copying uninitialized padding bytes") (cherry picked from commit f3be7df50f01d9a6ead9f27b55bb4dfd7dc4f9d2) M sys/net/rtsock.c ____________________________________________________________________________________________________________ Commit: 091a1e7d21c9b2cbd7dbe89335b08d4d50fab96e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=091a1e7d21c9b2cbd7dbe89335b08d4d50fab96e Author: Zhenlei Huang (Fri 6 Feb 2026 17:52:55 GMT) Committer: Zhenlei Huang (Tue 24 Feb 2026 10:15:38 GMT) qlnxe: Overhaul setting the multicast MAC filters When operating the multicast MAC filters, the current usage of ECORE_FILTER_ADD and ECORE_FILTER_REMOVE are rather misleading. ECORE_FILTER_ADD reads "adding new filter", but it actually removes any existing filters and then addes a new one. ECORE_FILTER_REMOVE reads "removing a filter", but it actually removes all filters. Let's use ECORE_FILTER_REPLACE and ECORE_FILTER_FLUSH instead to avoid confusion. In the current implementation, only one MAC address is passed to ecore_sp_eth_filter_mcast() and any previously installed filters are removed, hence it breaks the multicast function. That can be observed via either assigning new IPv6 addresses to the interface or putting the interface as a member of lagg(4) interface with LACP aggregation protocol. Fix that by calculating the multicast filter bins directly from multicast MAC addresses and replace the filters every time the bins changes. Due to the nature of the multicast filter, which is hash based, a full 1's multicast filter bin means all multicast packets are to be accepted. Thus there's no need to make the vport into allmulti mode when the number of multicast MAC addresses exceeds the limit (ECORE_MAX_MC_ADDRS, 64). Tested with a FastLinQ QL41212HLCU 25GbE adapter, both MFW_Version 8.35.23.0 and 8.59.16.0 are tested. Note: Currently the VF port is set to promiscuous mode unconditionally, and the setting of the multicast MAC filters for VF ports is short-circuited, so the VF port functions as it did. PR: 265857 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265857 ) PR: 290973 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290973 ) Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54892 (cherry picked from commit 70256d2b86d95a678a63c65b157b9c635f1f4c6a) (cherry picked from commit 0cfc1145cdfc2a7beeeb7f39ad2722c7053681c0) (cherry picked from commit 87942d7f8fc58e8b4af90ec1050b263005c3d64e) M sys/dev/qlnx/qlnxe/ecore_l2.c M sys/dev/qlnx/qlnxe/ecore_l2_api.h M sys/dev/qlnx/qlnxe/ecore_vf.c M sys/dev/qlnx/qlnxe/qlnx_def.h M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: 281d578e9ff56412bedbf7884fa097e5e59438da URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=281d578e9ff56412bedbf7884fa097e5e59438da Author: Zhenlei Huang (Fri 6 Feb 2026 17:52:54 GMT) Committer: Zhenlei Huang (Tue 24 Feb 2026 10:15:37 GMT) qlnxe: Allow tapping the TX packets Currently only the packets in the RX path can be captured by tcpdump as the ETHER_BPF_MTAP call in the TX path is missing. Add it so that packets in both directions can be captured. PR: 290973 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290973 ) Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54891 (cherry picked from commit 968647502ec21464ad3aecc7577ff0e8dfd41693) (cherry picked from commit 425b9cec0b8ce15a6e67d54a73f4f38dc66a4ccc) (cherry picked from commit ddfe98e8ccb120a0a5c42b2288694ecd2b70c80c) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: eeb4c04dd12becd430e9367a679f72d6ee9100f0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eeb4c04dd12becd430e9367a679f72d6ee9100f0 Author: Zhenlei Huang (Fri 6 Feb 2026 17:52:54 GMT) Committer: Zhenlei Huang (Tue 24 Feb 2026 10:15:37 GMT) qlnxe: Refactor setting the promiscuous and allmulti mode There are two entry points to set the promiscuous and allmulti mode. One is ioctl, and another is the init routine. Given they share almost the identical logic, refactor a little to make the code more clear. While here, for the ioctl, translate the error to EINVAL to avoid confusing the net stack. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54890 (cherry picked from commit 45b1718fadae7d56051ba04ef9d7a175a602a226) (cherry picked from commit b8d2c1c367465506b66a1696483caec1d04b2ea0) (cherry picked from commit 00ab0df79364f4567ad61f6a66eba1b2f0a7d507) M sys/dev/qlnx/qlnxe/qlnx_def.h M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: 52609ccbf7030f89133181ed5337f642b325f7af URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=52609ccbf7030f89133181ed5337f642b325f7af Author: Zhenlei Huang (Fri 6 Feb 2026 17:52:54 GMT) Committer: Zhenlei Huang (Tue 24 Feb 2026 10:15:37 GMT) qlnxe: Let ether_ioctl() handle SIOCSIFADDR ioctl Since the change [1], the init routine qlnx_init() works as intended. Let ether_ioctl() handle SIOCSIFADDR to simplify the code. Combined with the change [1], this shall be a better fix for PR 287445. [1] c10e6bc0f007 qlnxe: Avoid reinitializing the interface when it is already initialized PR: 287445 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287445 ) Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54888 (cherry picked from commit 4012b63889e40bb877bc0e4c8da1792bce472c08) (cherry picked from commit 0f383f74b7398161c12a290e50b060baf45d2800) (cherry picked from commit 20ffe22fcfe13b48a8e993cbf565f9cd9229a4b3) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: aef23e8e2736e839051bd7664b19ec0b9dc2dbf3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=aef23e8e2736e839051bd7664b19ec0b9dc2dbf3 Author: Zhenlei Huang (Fri 6 Feb 2026 17:52:54 GMT) Committer: Zhenlei Huang (Tue 24 Feb 2026 10:15:37 GMT) qlnxe: Avoid reinitializing the interface when it is already initialized qlnx_init_locked() unconditionally uninitialize the interface thus is actually reinitializing the interface. Well the init routine qlnx_init() is to initialize the interface by net stack when assigned with the first inet or inet6 address. The ioctl SIOCSIFADDR for the first inet6 address is handled by ether_ioctl() thus the interface is reinitialized no matter it was initialized or not. Add a driver status check for that to avoid reinitializing. Further plan is removing SIOCSIFADDR ioctl from the driver and let ether_ioctl() handle it. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54887 (cherry picked from commit c10e6bc0f0079e90cb484323ad71d437f1882422) (cherry picked from commit 8731ff4871d5397bae65bf184c44629a52c0e97b) (cherry picked from commit ee6495580925b337f5851b6ee0f1188f81d7a6c8) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: e16c965add1d28422f92388daf623dbf967794fe URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e16c965add1d28422f92388daf623dbf967794fe Author: Zhenlei Huang (Fri 6 Feb 2026 17:52:53 GMT) Committer: Zhenlei Huang (Tue 24 Feb 2026 10:15:36 GMT) qlnxe: Prevent potential concurrency between ioctls The driver-managed status flags should be lock protected to be touched. Also this can serialize ioctls those check the IFF_DRV_RUNNING status. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54886 (cherry picked from commit 0df8a998a9fe28af659cb401c537c6d785e55f81) (cherry picked from commit 285b25c080faf71c60de36e834ef31cf70e6b50d) (cherry picked from commit 6e5b12acb66a9e269801b8d88c8f9838044d631c) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: fb463bcd621b78351d0ff91e60071ea9cbda05bc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fb463bcd621b78351d0ff91e60071ea9cbda05bc Author: Zhenlei Huang (Fri 6 Feb 2026 17:52:53 GMT) Committer: Zhenlei Huang (Tue 24 Feb 2026 10:15:36 GMT) qlnxe: Fix setting the unicast MAC filter of RX path When an Ethernet interface is added to lagg(4) as a child interface, its type, aka if_type, is changed from IFT_ETHER to IFT_IEEE8023ADLAG. Well changing the link-layer address of the lagg(4) interface will be propagated to all child interfaces, hence the drivers of child interfaces shall not presume the type of the interface will not be changed. Meanwhile, on initializing, an ifnet has been fully attached and it is guaranteed to have non-null link-layer address so stop NULL checking for it. Reviewed by: kbowling Fixes: 792226e53023 qlnxe: Allow MAC address override MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54885 (cherry picked from commit f250852c9a0c1021c3be4b498e27cfc7b42a81db) (cherry picked from commit 6d138e958ffb318595eec29b910cada414e2f86d) (cherry picked from commit 93719f8c8348a5d13c9037352072ce67f530288b) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: 18e4cb41e945a79afabb8fa82fe39f28865aa3cf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=18e4cb41e945a79afabb8fa82fe39f28865aa3cf Author: Zhenlei Huang (Fri 6 Feb 2026 17:52:53 GMT) Committer: Zhenlei Huang (Tue 24 Feb 2026 10:15:35 GMT) qlnxe: Avoid memcpy with same source and destination In case the device is VF, qlnx_get_mac_addr() returns ha->primary_mac hence it ends up memcpy with same source and destination. Refactor slightly to avoid that. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54884 (cherry picked from commit 3aeeedc7e0dc231c16406ff64f4a08a716964c40) (cherry picked from commit 6462189595047800337aaf052e397d1aade3f9a7) (cherry picked from commit ea1143bddbc3671f49219a6b2a054965deea0c63) M sys/dev/qlnx/qlnxe/qlnx_def.h M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: 610b81333f4816b5906df780cb064526cd8ba1f0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=610b81333f4816b5906df780cb064526cd8ba1f0 Author: Keith Reynolds (Tue 28 May 2024 06:57:44 BST) Committer: Zhenlei Huang (Tue 24 Feb 2026 10:15:35 GMT) qlnxe: Fix promiscuous and allmulti settings PR: 278087 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278087 ) (cherry picked from commit e3ec564ecb9c2daa96a8db36052e50ea554fe598) (cherry picked from commit e4f48fc20b56df8a03ab63fb867f49bfcc0e7eae) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: 3c1f69661eda69709f00a40826c6efd045dbf01b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3c1f69661eda69709f00a40826c6efd045dbf01b Author: Eugene Grosbein (Sun 20 Jul 2025 11:36:33 BST) Committer: Eugene Grosbein (Mon 23 Feb 2026 07:14:05 GMT) trim(8): minor output correction "trim /dev/da*" would print the following line multiple times when given multiple agruments: dry run: add -f to actually perform the operation Print it once before looping over arguments. Also, note possible suffixes P and E after offset/length as per expand_number(3). (cherry picked from commit 5d5848648013a189fc766e4ee3a121362905b836) (cherry picked from commit f1b934c8138cfd98a70e305d54b2b431c842ec21) M usr.sbin/trim/trim.8 M usr.sbin/trim/trim.c ____________________________________________________________________________________________________________ Commit: be10d6fac6d8366123a7ec25ba3826c045027dc6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=be10d6fac6d8366123a7ec25ba3826c045027dc6 Author: Dag-Erling Smørgrav (Fri 20 Jun 2025 16:30:03 BST) Committer: Dag-Erling Smørgrav (Sat 21 Feb 2026 17:29:06 GMT) diff: Fix gcc build. Sponsored by: Klara, Inc. (cherry picked from commit 28d9586cde8dc783f7b698b10c2b564fde14ae74) M usr.bin/diff/diffdir.c ____________________________________________________________________________________________________________ Commit: c4a5799b76f655a63e0204d125ca42d4cded86d2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c4a5799b76f655a63e0204d125ca42d4cded86d2 Author: Maxim Konovalov (Wed 11 Feb 2026 21:03:11 GMT) Committer: Dmitry Morozovsky (Sat 21 Feb 2026 10:50:46 GMT) pw.8: spell (cherry picked from commit 66797b469ee3e303c5e228bea1e244f433e666e1) M usr.sbin/pw/pw.8 ____________________________________________________________________________________________________________ Commit: bdf97b8f056fcb842d4a4feb8c36008aa897cb62 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bdf97b8f056fcb842d4a4feb8c36008aa897cb62 Author: Cy Schubert (Thu 8 Jan 2026 17:41:53 GMT) Committer: Cy Schubert (Fri 20 Feb 2026 02:24:26 GMT) ipfilter: Interface name must not extend beyond end of buffer sifpidx (an interface name) cannot extend beyond the end of the fr_names buffer. We do the validation for fr_sifpidx here because it is a union that contains an offset only when fr_sifpidx points to an interface name, an offset into fr_names. The union is an offset into fr_names in this case only. interr_tbl now becomes a static variable outside a function to facilitate its use by two functions within fil.c Note that sifpidx is only used in ipf_sync() which implments ipf -y. Reported by: Ilja Van Sprundel MFC after: 1 week (cherry picked from commit 47fb51847fdea3f1cce841b5f2bbbcd6f8a04ee0) M sys/netpfil/ipfilter/netinet/fil.c ____________________________________________________________________________________________________________ Commit: 15c33b64ac2d6a6201cb819da184d0f4028d7632 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=15c33b64ac2d6a6201cb819da184d0f4028d7632 Author: Cy Schubert (Wed 4 Feb 2026 17:27:23 GMT) Committer: Cy Schubert (Fri 20 Feb 2026 02:24:26 GMT) ipfilter: Fix possible overrun The destination buffer is FR_GROUPLEN (16 bytes) in length. When gname is created, the userspace utilities correctly use FR_GROUPLEN as the buffer length. The kernel should also limit its copy operation to FR_GROUPLEN bytes to avoid any user written code from exploiting this vulnerability. Reported by: Ilja Van Sprundel (cherry picked from commit e40817302ebdf89df2f3bcd679fb7f2a18c244dc) M sys/netpfil/ipfilter/netinet/fil.c ____________________________________________________________________________________________________________ Commit: 0e093f57dc9859d93c3fb8884723d348a71375f7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0e093f57dc9859d93c3fb8884723d348a71375f7 Author: Dag-Erling Smørgrav (Tue 17 Feb 2026 22:58:36 GMT) Committer: Dag-Erling Smørgrav (Thu 19 Feb 2026 13:46:21 GMT) OptionalObsoleteFiles: Add figpar to dialog section MFC after: 3 days Fixes: 15d781b53233 ("lib: Gate libfigpar under MK_DIALOG") Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D55330 (cherry picked from commit bc6c827078b7ab62271ce7ac1c4439b82fd2f98c) OptionalObsoleteFiles: Add missing figpar MLINKS MFC after: 3 days Fixes: bc6c827078b7 ("OptionalObsoleteFiles: Add figpar to dialog section") (cherry picked from commit efcfba9b31ad11ec901085c38b79e40289b9e7bc) OptionalObsoleteFiles: Add missing dpv MLINK MFC after: 3 days (cherry picked from commit 32ec8e29a6c3025a864f85678db63a8568c8fc86) M tools/build/mk/OptionalObsoleteFiles.inc ____________________________________________________________________________________________________________ Commit: 072c3a70dcf2d626865d521256fa1e08ea7f6718 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=072c3a70dcf2d626865d521256fa1e08ea7f6718 Author: Dmitry Morozovsky (Thu 12 Feb 2026 06:08:30 GMT) Committer: Dmitry Morozovsky (Thu 19 Feb 2026 07:30:33 GMT) committers-ports: add andy Following up ziaee's pattern, and add andy's line. I'm not sure whether the original commit bit creation date should be used, and use commit bit re-activation date for now. MFC after: 1 week (cherry picked from commit 0d9b5db9fc652e79e4eb08a2f583e9b825a50b92) M share/misc/committers-doc.dot ____________________________________________________________________________________________________________ Commit: a82128d03d36c8febfb0f0faf315128df03fb89f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a82128d03d36c8febfb0f0faf315128df03fb89f Author: Jessica Clarke (Wed 18 Feb 2026 18:45:26 GMT) Committer: Jessica Clarke (Wed 18 Feb 2026 18:48:15 GMT) Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break, which predates the addition of FreeBSD support to OpenZFS. Moreover, 64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also defined (alongside __powerpc64__ to disambiguate), which has always had a 64-bit time_t. This code has therefore always been wrong for all PowerPC variants. Fix this by limiting the 32-bit case to just i386, which is the only architecture in FreeBSD to have a 32-bit time_t and not have broken ABI, due to its special legacy compatibility status. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Jessica Clarke Closes #18217 Closes #18218 Reported by: fuz MFC after: 1 day (cherry picked from commit 45c1e44779e3d365f5e31f75546d48ce34e4ee05) M sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h ____________________________________________________________________________________________________________ Commit: 589cef5d51512782cee8b4562a62e70c654a7427 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=589cef5d51512782cee8b4562a62e70c654a7427 Author: Dag-Erling Smørgrav (Wed 18 Feb 2026 15:10:47 GMT) Committer: Dag-Erling Smørgrav (Wed 18 Feb 2026 18:41:17 GMT) libfetch: Restore timeout functionality PR: 293124 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293124 ) MFC after: 1 week Fixes: 792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.") Reverts: 8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()") Reviewed by: eugen, imp Differential Revision: https://reviews.freebsd.org/D55293 (cherry picked from commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207) (insta-mfc requested by re@) M lib/libfetch/common.c ____________________________________________________________________________________________________________ Commit: 4c66fafd6b29e306184ff3bd1bcd6c8f4a29f11c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4c66fafd6b29e306184ff3bd1bcd6c8f4a29f11c Author: Dmitry Morozovsky (Wed 11 Feb 2026 19:34:00 GMT) Committer: Dmitry Morozovsky (Wed 18 Feb 2026 09:50:59 GMT) pw: make manual page more friendly for uid/gid search pw.8 structure is quite different from usual manual page, especially in describing -o option usage. Specifically, these paragraphs do not contain "uid/gid" terms, and have "user id"/"group id" instead, making searching for "override duplicate safety belt" difficult. Try to simplify such searches. Also, clarify uid/gid space between 100 and 1000 as "somewhat special", as it actually is. Discussed on: russian telegram FreeBSD group Reviewed by: eugen, novel MFC after: 1 week (cherry picked from commit e89454417b2bfecce9daee10dece2f49632640d3) M usr.sbin/pw/pw.8 ____________________________________________________________________________________________________________ Commit: b9a6888b37cce03a5a04f376a1d782498f4352af URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b9a6888b37cce03a5a04f376a1d782498f4352af Author: Dag-Erling Smørgrav (Fri 13 Feb 2026 20:18:30 GMT) Committer: Dag-Erling Smørgrav (Wed 18 Feb 2026 00:21:16 GMT) diff: Tweak recursion tests The -r flag is not required to compare two directories; it is only required to compare them recursively, i.e. descend into their common subdirectories. Adjust tests that use -r needlessly, and adjust the dirloop test to verify that these two cases remain distinct. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55262 (cherry picked from commit b2532432971fbd9339a9a49eca1b532978bb6d48) M usr.bin/diff/tests/diff_test.sh ____________________________________________________________________________________________________________ Commit: c6038436360ebf6344e6f65d40e1d38611d1d603 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c6038436360ebf6344e6f65d40e1d38611d1d603 Author: Dag-Erling Smørgrav (Fri 13 Feb 2026 20:18:24 GMT) Committer: Dag-Erling Smørgrav (Wed 18 Feb 2026 00:20:36 GMT) diff: Tweak range of -C and -U arguments POSIX uses the terms “positive decimal integer” for -C and “non-negative decimal integer” for -U, which translates into lower bounds of 1 for -C and 0 for -U. POSIX does not specify a minimum upper bound for either mode, but as of 5fc739eb5949 both our backends support context sizes up to and including INT_MAX, so use that. Having had the opportunity to consult the Unix System Test Suite, the diff test cases found therein happen to precisely match these bounds. While here, switch to using strtonum() to parse numerical arguments, and try to be more consistent in how we report usage errors. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55261 (cherry picked from commit 790f1d1cc5fa892ba59fd7f239b22064c8ab14c7) M usr.bin/diff/diff.c M usr.bin/diff/tests/diff_test.sh ____________________________________________________________________________________________________________ Commit: 2b11bbd790aca47bfd994863b03af7c7b4523e15 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2b11bbd790aca47bfd994863b03af7c7b4523e15 Author: Dag-Erling Smørgrav (Fri 13 Feb 2026 15:57:50 GMT) Committer: Dag-Erling Smørgrav (Tue 17 Feb 2026 23:12:13 GMT) ngctl: Fix buffer overflow in config command Keep track of our buffer length when assembling the argument list. PR: 293075 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293075 ) MFC after: 1 week Reviewed by: zlei, markj Differential Revision: https://reviews.freebsd.org/D55259 (cherry picked from commit 59906a163e474c8d00bdebe226c4d47332b91bad) M usr.sbin/ngctl/config.c ____________________________________________________________________________________________________________ Commit: cff16d69d75151e280a83695f52db608bab51a49 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cff16d69d75151e280a83695f52db608bab51a49 Author: Dag-Erling Smørgrav (Fri 13 Feb 2026 15:57:46 GMT) Committer: Dag-Erling Smørgrav (Tue 17 Feb 2026 23:12:13 GMT) ngctl: Check hook name length Check the length of the hook name when copying it into the sockaddr. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55258 (cherry picked from commit 585190dff436eeea3be97300e36c82559028d3dd) M usr.sbin/ngctl/write.c ____________________________________________________________________________________________________________ Commit: b66993bd51d32d673c2da708a0430a528a82b100 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b66993bd51d32d673c2da708a0430a528a82b100 Author: Vladimir Kondratyev (Tue 10 Feb 2026 22:59:06 GMT) Committer: Vladimir Kondratyev (Tue 17 Feb 2026 22:19:56 GMT) evdev: Drop comments from input-event-codes.h They were copied intact from the Linux GPL-only file. Requested by: imp, glebius MFC after: 1 week (cherry picked from commit 89aa8a94053fdd22ed716fdf424a2d10e70b3188) M sys/dev/evdev/input-event-codes.h ____________________________________________________________________________________________________________ Commit: 262ea9d9a9aa09cf8e38478c33f6301d7db448fa URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=262ea9d9a9aa09cf8e38478c33f6301d7db448fa Author: Vladimir Kondratyev (Mon 1 Dec 2025 20:42:15 GMT) Committer: Vladimir Kondratyev (Tue 17 Feb 2026 22:19:50 GMT) evdev: Sync event codes with Linux kernel 6.18 MFC after: 1 month (cherry picked from commit 8d9a5d44b155af7123893a6948ad7e86b48c57b3) M sys/dev/evdev/input-event-codes.h M sys/dev/evdev/input.h ____________________________________________________________________________________________________________ Commit: 6ce85d64d0594ce540c92fddfb89065c13546f23 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6ce85d64d0594ce540c92fddfb89065c13546f23 Author: Michael Osipov (Wed 28 Jan 2026 18:49:26 GMT) Committer: Michael Osipov (Sun 15 Feb 2026 11:17:22 GMT) daemon: Add option for output file mode The daemon utility has always created its output file with a fixed mode of 0600. This causes issues for log collection setups where the collector does not run as root but instead relies on group access to the watched daemon’s log file. Introduce a new option that allows specifying the output file mode using install(1)-style semantics. This enables non-root log collectors to access the file as intended and improves compatibility with log rotation tools. Reviewed by: kevans MFC after: 1 week Relnotes: yes Differential Revision: https://reviews.freebsd.org/D54930 (cherry picked from commit a3b90a1f008365d9f62773998f89f9c872e2bed5) M usr.sbin/daemon/daemon.8 M usr.sbin/daemon/daemon.c ____________________________________________________________________________________________________________ Commit: 74e3453b90512fb0777dfcd4f0150ff41ba28ad1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=74e3453b90512fb0777dfcd4f0150ff41ba28ad1 Author: Dag-Erling Smørgrav (Wed 11 Feb 2026 16:24:54 GMT) Committer: Dag-Erling Smørgrav (Sun 15 Feb 2026 08:58:47 GMT) diff: Improve directory loop detection When we're done processing a directory, remove its entry from the tree of visited inodes, ensuring that we only report a loop when we encounter a descendant-to-ancestor link, not when we encounter a cousin-to-cousin or sibling-to-sibling link. MFC after: 1 week Reported by: Bakul Shah Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55248 (cherry picked from commit 71569594d860a59d8362770a56d806e1d31fb946) M usr.bin/diff/diffdir.c M usr.bin/diff/tests/diff_test.sh ____________________________________________________________________________________________________________ Commit: 8e65c667475049f355fcff19d1f8647eb932a0c7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8e65c667475049f355fcff19d1f8647eb932a0c7 Author: Dag-Erling Smørgrav (Wed 11 Feb 2026 16:24:50 GMT) Committer: Dag-Erling Smørgrav (Sun 15 Feb 2026 08:58:47 GMT) install: Expect EINTR while copying Both copy_file_range() and read() / write() in our fallback loop can be interrupted before copying anything at all, in which case it returns -1 and sets errno to EINTR. If that happens, we should retry, not fail. While here, drop the size argument from copy() (we always want to copy the entire file anyway) and add test cases which exercise the metalog and digest functionality. PR: 293028 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293028 ) MFC after: 1 week Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55168 (cherry picked from commit 0fb940fd63dd9b6d6b848421c53b1e9ac8387265) M usr.bin/xinstall/tests/install_test.sh M usr.bin/xinstall/xinstall.c ____________________________________________________________________________________________________________ Commit: f1a86b35dedba1b7dfa0ec8dae63b08a76cd395a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f1a86b35dedba1b7dfa0ec8dae63b08a76cd395a Author: Dag-Erling Smørgrav (Wed 11 Feb 2026 16:24:46 GMT) Committer: Dag-Erling Smørgrav (Sun 15 Feb 2026 08:58:45 GMT) cp: Expect EINTR while copying Both copy_file_range() and copy_fallback() can be interrupted before they have read anything at all, in which case they return -1 and set errno to EINTR. If that happens, we should retry, not fail. PR: 293028 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293028 ) MFC after: 1 week Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55167 (cherry picked from commit 7aa30669d6e04444b8ad1e4863a6e674fcac4afc) M bin/cp/utils.c ____________________________________________________________________________________________________________ Commit: 9349f965142096e16778758ae46c476ee66a5780 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9349f965142096e16778758ae46c476ee66a5780 Author: Dimitry Andric (Sun 7 Sep 2025 15:37:48 BST) Committer: Dag-Erling Smørgrav (Fri 13 Feb 2026 18:02:11 GMT) BSD.usr.dist: remove obsolete usr/share/examples/drivers entry In base 8f0a6a9aadb1f, usr/share/examples/drivers was cleaned up, because it contained unmaintained scripts. The directory itself is cleaned up by ObsoleteFiles.inc, but there was still an entry in BSD.usr.dist that re-created the directory. Remove it. Fixes: 8f0a6a9aadb1 MFC after: 3 days (cherry picked from commit ac2f284258e4c6d5867aa6a411bd44df349fe416) M etc/mtree/BSD.usr.dist ____________________________________________________________________________________________________________ Commit: 767f1ebcf75e85912b65f9a117c9ab4f76ce71c0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=767f1ebcf75e85912b65f9a117c9ab4f76ce71c0 Author: Dag-Erling Smørgrav (Sat 7 Feb 2026 14:24:40 GMT) Committer: Dag-Erling Smørgrav (Wed 11 Feb 2026 13:54:33 GMT) libfetch: Check for failure to create SSL context * Drop the ssl_meth member, there is no reason to hang on to it. * Replace deprecated SSLv23_client_method() with TLS_client_method(). * Check the return value from SSL_CTX_new(). MFC after: 1 week PR: 292903 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292903 ) Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55098 (cherry picked from commit 4e160c6197f75fda3d5d5997ce893087058cf718) M lib/libfetch/common.c M lib/libfetch/common.h ____________________________________________________________________________________________________________ Commit: e20dba3a212d9e114c697b31ae9104e21a03a6d2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e20dba3a212d9e114c697b31ae9104e21a03a6d2 Author: Enji Cooper (Thu 22 Jun 2023 04:53:54 BST) Committer: Dag-Erling Smørgrav (Wed 11 Feb 2026 13:53:30 GMT) libfetch: remove all old OpenSSL support This change removes pre-OpenSSL 1.1 supporting code and removes/adjusted preprocessor conditionals which were tautilogically true as FreeBSD main has shipped with OpenSSL 1.1+ for some time. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40711 (cherry picked from commit bc1027a7785166fde9c2a3b48e6e70d198377d4b) M lib/libfetch/common.c ____________________________________________________________________________________________________________ Commit: be6ed6b2779a883e2583763634db4fff9077ddbc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=be6ed6b2779a883e2583763634db4fff9077ddbc Author: Ed Maste (Thu 25 May 2023 16:24:48 BST) Committer: Dag-Erling Smørgrav (Wed 11 Feb 2026 13:53:17 GMT) libfetch: do not call deprecated OpenSSL functions As of OpenSSL 1.1 SSL_library_init() and SSL_load_error_strings() are deprecated. There are replacement initialization functions but they do not need to be called: "As of version 1.1.0 OpenSSL will automatically allocate all resources that it needs so no explicit initialisation is required." Wrap both calls in an OPENSSL_VERSION_NUMBER block. PR: 271615 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271615 ) Reviewed by: Pierre Pronchery Event: Kitchener-Waterloo Hackathon 202305 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40265 (cherry picked from commit 01aee8c92d936470c44821736e0d9e11ed7ce812) M lib/libfetch/common.c ____________________________________________________________________________________________________________ Commit: 6cfdd559a51d5fa4dd0590e00939922313232727 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6cfdd559a51d5fa4dd0590e00939922313232727 Author: Dag-Erling Smørgrav (Thu 5 Feb 2026 16:21:22 GMT) Committer: Dag-Erling Smørgrav (Tue 10 Feb 2026 15:37:40 GMT) diff: Correctly declare tests Sponsored by: Klara, Inc. Fixes: 5fc739eb5949 ("diff: Fix integer overflows in Stone algorithm") Fixes: 270492602b9b ("diff: Add test case for pagination resource leak") Fixes: 590126789c84 ("diff: Don't compare a file or directory to itself") (cherry picked from commit 157d6664aeb815db3b758bd3038fd1512a0f4e2c) M usr.bin/diff/tests/diff_test.sh ____________________________________________________________________________________________________________ Commit: 9c99eacbc33b357a0f80603b2e17c927a689fa78 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9c99eacbc33b357a0f80603b2e17c927a689fa78 Author: Dag-Erling Smørgrav (Thu 5 Feb 2026 14:39:57 GMT) Committer: Dag-Erling Smørgrav (Tue 10 Feb 2026 15:36:24 GMT) diff: Don't compare a file or directory to itself While here, stop abusing struct dirent for something we don't even need to store. PR: 254455 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254455 ) MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55113 (cherry picked from commit 590126789c841d80655869bc075c8980c173dd1c) diff: Fix build rc must be defined first. Fixes: 590126789c84 MFC after: 1 week X-MFC with: 590126789c84 (cherry picked from commit ee44ab936e84bacaa49847d36aabdf280f9fecce) M usr.bin/diff/diffdir.c M usr.bin/diff/diffreg.c M usr.bin/diff/tests/diff_test.sh ____________________________________________________________________________________________________________ Commit: 44cf3a1f6da63b064b4356d2b3c6d7834ee03a97 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=44cf3a1f6da63b064b4356d2b3c6d7834ee03a97 Author: Dag-Erling Smørgrav (Thu 5 Feb 2026 14:39:53 GMT) Committer: Dag-Erling Smørgrav (Tue 10 Feb 2026 15:32:47 GMT) diff: Fix pagination leak * Drop an unnecessary variable and rename pidfd to procd. * Rewinding stdout serves no purpose, so stop doing it. * Don't bother freeing memory or setting the global status right before erroring out. * Error out if dup(2) or dup2(2) fail. * In the unlikely case that our pipe is equal to stdout, we need to record that information so we don't close it when cleaning up. * Don't bother closing a descriptor before dup2(2)ing to it. * Don't forget to close the the process descriptor after reaping the child process. PR: 266592 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266592 ) MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, markj Differential Revision: https://reviews.freebsd.org/D55112 (cherry picked from commit c3904a7de78ca1ca15fcdf4c09f9d4be7f6fe6f5) M usr.bin/diff/pr.c M usr.bin/diff/pr.h ____________________________________________________________________________________________________________ Commit: f0852209a086387d8171da58a09faadaf5b0a455 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f0852209a086387d8171da58a09faadaf5b0a455 Author: Dag-Erling Smørgrav (Thu 5 Feb 2026 14:39:47 GMT) Committer: Dag-Erling Smørgrav (Tue 10 Feb 2026 15:32:47 GMT) diff: Add test case for pagination resource leak The pagination code leaks either processes or descriptors or both, depending on the exact version of the code you have. Add a test case which exercises this leak to facilitate fixing it. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55111 (cherry picked from commit 270492602b9bd8b8fce4f021f055804978bf3f23) M usr.bin/diff/tests/diff_test.sh ____________________________________________________________________________________________________________ Commit: 641366df41d8e2a3bde877b712a08de8a49a76ee URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=641366df41d8e2a3bde877b712a08de8a49a76ee Author: Dag-Erling Smørgrav (Thu 5 Feb 2026 17:41:56 GMT) Committer: Dag-Erling Smørgrav (Tue 10 Feb 2026 14:24:30 GMT) diff: Report I/O errors in Stone algorithm In the legacy Stone algorithm, we do a first pass over the files to check if they're identical before we start diffing them. That code would correctly set the exit status if an I/O error was encountered, but would not emit an error message. Do so. PR: 292198 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292198 ) MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D55125 (cherry picked from commit f8c12e6e3874cdd353fb16785da6f4e7eb134cd9) M usr.bin/diff/diffreg.c ____________________________________________________________________________________________________________ Commit: 2ae615c4f1d0c29984caac73d72091be8c41358f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2ae615c4f1d0c29984caac73d72091be8c41358f Author: Dag-Erling Smørgrav (Thu 5 Feb 2026 14:39:43 GMT) Committer: Dag-Erling Smørgrav (Tue 10 Feb 2026 14:24:30 GMT) diff: Fix integer overflows in Stone algorithm Fix integer overflows that may occur when the context window is very large and add tests to exercise those conditions. PR: 267032 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267032 ) MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55110 (cherry picked from commit 5fc739eb5949620da911db2f87ca8faedc549d3a) M usr.bin/diff/diffreg.c M usr.bin/diff/tests/diff_test.sh ____________________________________________________________________________________________________________ Commit: bfd89763d2079a6f232e8324fc2c688cb336aed9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bfd89763d2079a6f232e8324fc2c688cb336aed9 Author: Dag-Erling Smørgrav (Fri 20 Jun 2025 12:10:35 BST) Committer: Dag-Erling Smørgrav (Tue 10 Feb 2026 14:24:30 GMT) diff: Detect loops when diffing directories. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50936 (cherry picked from commit 42092e1b6625b8226de5f34d22b9a96c713626cb) M usr.bin/diff/diffdir.c M usr.bin/diff/tests/diff_test.sh ____________________________________________________________________________________________________________ Commit: 9748212e619b7608ac50ad6d0a768b20d5c9fd0b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9748212e619b7608ac50ad6d0a768b20d5c9fd0b Author: Konstantin Belousov (Fri 17 Oct 2025 04:49:14 BST) Committer: Dag-Erling Smørgrav (Tue 10 Feb 2026 14:24:30 GMT) include/stdckdint.h: make the header compatible with C++ by removing the cast to _Bool. The _Bool type is not defined for C++, and the specification from the gcc info doc states that the return type of the __builtin_{add,sub,mul}_overflow() is bool already. This is done instead of including stdbool.h to avoid namespace pollution, since defining bool from stdckdint.h simingly is not sanctioned by ISO/IEC 9899:2024. PR: 290299 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290299 ) Reviewed by: des Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53149 (cherry picked from commit 3c052bec12fcf09f81ba0760ebecec38e196d332) M include/stdckdint.h ____________________________________________________________________________________________________________ Commit: fda539d1ea398ce7c8aa9e7fa25e9d3c53563b5b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fda539d1ea398ce7c8aa9e7fa25e9d3c53563b5b Author: Dag-Erling Smørgrav (Thu 7 Sep 2023 07:14:54 BST) Committer: Dag-Erling Smørgrav (Tue 10 Feb 2026 14:24:30 GMT) include: Implement N2867. This adds macros for checked addition, subtraction, and multiplication with semantics similar to the builtins gcc and clang have had for years. Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D41734 (cherry picked from commit e6615b10347caf67f5bc12c9a8e30b8ddd9860ae) M include/Makefile A include/stdckdint.h M share/man/man3/Makefile A share/man/man3/stdckdint.3 ____________________________________________________________________________________________________________ Commit: 26fcc4afa9ee8b07da306bd8bf56f5e409f13d2d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=26fcc4afa9ee8b07da306bd8bf56f5e409f13d2d Author: Jose Luis Duran (Tue 10 Feb 2026 02:22:46 GMT) Committer: Jose Luis Duran (Tue 10 Feb 2026 02:22:46 GMT) Adapt changes from blocklist 2026-02-07 (10a907f) Also apply the fix from PR 258411. This is a direct commit to stable/13, as blacklist has been renamed to blocklist upstream. M contrib/blacklist/bin/blacklistd.c M contrib/blacklist/bin/blacklistd.conf.5 M contrib/blacklist/bin/run.c M contrib/blacklist/bin/support.c M contrib/blacklist/port/popenve.c ____________________________________________________________________________________________________________ Commit: 3b0f13ca60981186b1455d1e506ef4365054acc3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3b0f13ca60981186b1455d1e506ef4365054acc3 Author: Mark Johnston (Wed 25 Jun 2025 13:50:50 BST) Committer: Mark Johnston (Mon 9 Feb 2026 20:18:58 GMT) amd64/conf: Remove a config committed by accident Reported by: kib, kp Fixes: 350ba9672a7f ("unix: Set O_RESOLVE_BENEATH on fds transferred between jails") (cherry picked from commit 3ef39f58e5d63a78fd1c37e6c62d599bc68d5e1e) D sys/amd64/conf/SYZKALLER ____________________________________________________________________________________________________________ Commit: c9977132865ec06d2d3e1f404e946836019ff7a2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c9977132865ec06d2d3e1f404e946836019ff7a2 Author: Mark Johnston (Tue 24 Jun 2025 21:08:22 BST) Committer: Mark Johnston (Mon 9 Feb 2026 18:07:10 GMT) unix/tests: Add a regression test for fd transfer across jails MFC after: 3 weeks (cherry picked from commit 5843b8ee02e99527c28f579acfc1f48e10033529) M tests/sys/kern/Makefile M tests/sys/kern/unix_passfd_test.c ____________________________________________________________________________________________________________ Commit: 73530e4c2ea92564e393e0497f13dfac251a41b7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=73530e4c2ea92564e393e0497f13dfac251a41b7 Author: Mark Johnston (Tue 24 Jun 2025 21:05:37 BST) Committer: Mark Johnston (Mon 9 Feb 2026 17:48:55 GMT) unix: Set O_RESOLVE_BENEATH on fds transferred between jails If a pair of jails with different filesystem roots is able to exchange SCM_RIGHTS messages (e.g., using a unix socket in a shared nullfs mount), a process in one jail can open a directory outside of the root of the second jail and then pass the fd to that second jail, allowing the receiving process to escape the jail chroot. Address this using the new FD_RESOLVE_BENEATH flag. When externalizing an SCM_RIGHTS message into the receiving process, automatically set this flag on all new fds where a jail boundary is crossed. This ensures that the receiver cannot do more than access files underneath the directory; in particular, the received fd cannot be used to access vnodes not accessible by the sender. PR: 262179 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262179 ) Reviewed by: kib MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D50371 (cherry picked from commit 350ba9672a7f4f16e30534a603df577dfd083b3f) A sys/amd64/conf/SYZKALLER M sys/kern/uipc_usrreq.c ____________________________________________________________________________________________________________ Commit: f7cbcb19a9ecf606172d6d6c472b5ba7130a398b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f7cbcb19a9ecf606172d6d6c472b5ba7130a398b Author: Mark Johnston (Mon 9 Feb 2026 16:47:16 GMT) Committer: Mark Johnston (Mon 9 Feb 2026 16:54:57 GMT) file: Add a fd flag with O_RESOLVE_BENEATH semantics The O_RESOLVE_BENEATH openat(2) flag restricts name lookups such that they remain under the directory referenced by the dirfd. This commit introduces an implicit version of the flag, FD_RESOLVE_BENEATH, stored in the file descriptor entry. When the flag is set, any lookup relative to that fd automatically has O_RESOLVE_BENEATH semantics. Furthermore, the flag is sticky, meaning that it cannot be cleared, and it is copied by dup() and openat(). File descriptors with FD_RESOLVE_BENEATH set may not be passed to fchdir(2) or fchroot(2). Various fd lookup routines are modified to return fd flags to the caller. This flag will be used to address a case where jails with different root directories and the ability to pass SCM_RIGHTS messages across the jail boundary can transfer directory fds in such as way as to allow a filesystem escape. PR: 262180 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262180 ) Reviewed by: kib MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D50371 (cherry picked from commit f35525ff2053e026a423e852136d73ed93c95803) M lib/libc/sys/fcntl.2 M sys/compat/cloudabi/cloudabi_fd.c M sys/fs/fdescfs/fdesc_vnops.c M sys/kern/kern_descrip.c M sys/kern/uipc_syscalls.c M sys/kern/vfs_acl.c M sys/kern/vfs_cache.c M sys/kern/vfs_extattr.c M sys/kern/vfs_syscalls.c M sys/sys/fcntl.h M sys/sys/file.h M sys/sys/filedesc.h M sys/sys/namei.h ____________________________________________________________________________________________________________ Commit: f418e65768dff2a7fd871e19184a9cf3470cad57 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f418e65768dff2a7fd871e19184a9cf3470cad57 Author: Yogesh Bhosale (Sun 1 Feb 2026 17:27:36 GMT) Committer: Kevin Bowling (Mon 9 Feb 2026 06:57:46 GMT) ice(4): Handle allmulti flag in ice_if_promisc_set function In the ice_if_promisc_set function, the driver currently disables the IFF_ALLMULTI flag, thereby preventing the activation of multicast mode. To address this issue, implement appropriate handling to ensure the flag is managed correctly. Signed-off-by: Yogesh Bhosale Tested by: Gowthamkumar K S Differential Revision: https://reviews.freebsd.org/D54186 (cherry picked from commit 98bdf63f6e94be42a1787de73608de15bcb3419a) M sys/dev/ice/if_ice_iflib.c ____________________________________________________________________________________________________________ Commit: e5cb813ac4779d46b2dd9a483d2983ae5d104bcb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e5cb813ac4779d46b2dd9a483d2983ae5d104bcb Author: Michael Osipov (Fri 26 Dec 2025 17:27:12 GMT) Committer: Michael Osipov (Sat 7 Feb 2026 12:18:27 GMT) sockstat: Surround explicit IPv6 addresses with brackets PR: 254611 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254611 ) Approved by: otis, tuexen, des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54375 (cherry picked from commit fe81e3944c085e765c83c4f78941d7529ceb556e) M usr.bin/sockstat/sockstat.c ____________________________________________________________________________________________________________ Commit: b3f23ae1e22bf88de5ec09c524e7e0beb16b5c76 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b3f23ae1e22bf88de5ec09c524e7e0beb16b5c76 Author: Dag-Erling Smørgrav (Sat 13 Dec 2025 22:46:25 GMT) Committer: Dag-Erling Smørgrav (Thu 5 Feb 2026 15:01:12 GMT) nextboot: Reimplement missing -a option PR: 260520 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260520 ) MFC after: 3 days Fixes: e307eb94ae52 ("loader: zfs should support bootonce an nextboot") (cherry picked from commit 33510b16e663bde5be5e4a56ccb17f848c41ef4e) M sbin/reboot/nextboot.sh ____________________________________________________________________________________________________________ Commit: 93fbf353b62c02cebd42e08e1ed97225fe526447 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=93fbf353b62c02cebd42e08e1ed97225fe526447 Author: Michael Osipov (Wed 28 Jan 2026 09:02:33 GMT) Committer: Michael Osipov (Thu 5 Feb 2026 08:55:28 GMT) loader: Prefer comma-separated list of values for "console" PR: 292595 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292595 ) Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54923 (cherry picked from commit 56970c3c4b0bc61d972837661a31cc2b9e8e8d7c) M release/tools/azure.conf M release/tools/openstack.conf M stand/efi/loader/main.c M stand/i386/loader/main.c ____________________________________________________________________________________________________________ Commit: b562bbc06adf2039e00676440c83dcd7f6900fa8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b562bbc06adf2039e00676440c83dcd7f6900fa8 Author: Zhenlei Huang (Mon 2 Feb 2026 12:26:31 GMT) Committer: Zhenlei Huang (Thu 5 Feb 2026 05:28:50 GMT) e1000: Fix setting the promiscuous mode The variable reg_rctl stores the value read from reg E1000_RCTL. It may contain bits E1000_RCTL_VFE and E1000_RCTL_CFIEN which control VLAN hardware filter feature. The promiscuous mode implies all tagged or untagged packets should be accepted, so the VLAN hardware filter feature should be disabled when enabling the promiscuous mode. Calling em_if_vlan_filter_disable() did the task, but later writing the value of reg_rctl back to the reg E1000_RCTL may restore the feature. Move the calling of em_if_vlan_filter_disable() after writing the reg to fix that. PR: 292759 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292759 ) Reviewed by: kbowling Tested by: vova@zote.me Fixes: 2796f7cab107 e1000: Fix up HW vlan ops MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54973 (cherry picked from commit e63ee5fedb8dab51f1bd6d24cc650b68d9663db5) (cherry picked from commit 8880678b7a47ccfdcc14d3e7cad7f137862dccea) (cherry picked from commit 3cfe90545f016fa190158aa4830f3256e01a7cb2) M sys/dev/e1000/if_em.c ____________________________________________________________________________________________________________ Commit: cc9d0192edfde5b7b66e9a7c81dca7c5d230eac7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cc9d0192edfde5b7b66e9a7c81dca7c5d230eac7 Author: Mitchell Horne (Mon 26 Jan 2026 14:58:55 GMT) Committer: Mitchell Horne (Mon 2 Feb 2026 15:44:19 GMT) native-xtools: use static LLVM libraries Set the MK_LLVM_LINK_STATIC_LIBRARIES knob to "yes" when building the native-xtools target. This reverts to the behaviour prior to 2e47f35be5dc. This avoids a build failure that occurs otherwise, where compilation fails looking for a libllvmprivate.so that was not built. It is unclear if this addresses the issue in all instances---some replies in the PRs indicate otherwise. Still, some report success, and in my own testing this fixed creation of a cross-compiled poudriere jail. Commit this while we continue to investigate... PR: 286710, 291409 Tested by: marck, rdunkle@smallcatbrain.com Reviewed by: emaste MFC after: 3 days Fixes: 2e47f35be5dc ("Convert libllvm, libclang and liblldb into private shared libraries"). Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54815 (cherry picked from commit 38e5564ecef53064c984d086a040c01100023f40) M Makefile.inc1 ____________________________________________________________________________________________________________ Commit: e45b89582fcbf4f65593303bf41a28ed6071460f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e45b89582fcbf4f65593303bf41a28ed6071460f Author: Jilles Tjoelker (Mon 17 Nov 2025 17:42:01 GMT) Committer: Jilles Tjoelker (Sun 1 Feb 2026 14:35:59 GMT) sh: Fix job pointer invalidation with trapsasync Calling dotrap() can do almost anything, including reallocating the jobtab array. Convert the job pointer to an index before calling dotrap() and then restore a proper job pointer afterwards. PR: 290330 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290330 ) Reported by: bdrewery Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D53793 (cherry picked from commit f44ac8cc9c10d7305223a10b8dbd8e234388cc73) M bin/sh/jobs.c M bin/sh/tests/execution/Makefile A bin/sh/tests/execution/bg14.0 ____________________________________________________________________________________________________________ Commit: b9cdb4d34bc4ea0093597f2bc4a86ce6ed5ab569 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b9cdb4d34bc4ea0093597f2bc4a86ce6ed5ab569 Author: Jilles Tjoelker (Sat 15 Nov 2025 16:43:03 GMT) Committer: Jilles Tjoelker (Sun 1 Feb 2026 14:35:54 GMT) sh: Fix a double free in a rare scenario with pipes The command sh -c 'sleep 3 | sleep 2 & sleep 3 & kill %1; wait %1' crashes (with appropriate sanitization such as putting MALLOC_CONF=abort:true,junk:true in the environment or compiling with -fsanitize=address). What happens here is that waitcmdloop() calls dowait() with a NULL job pointer, instructing dowait() to freejob() if it's a non-interactive shell and $! was not and cannot be referenced for it. However, waitcmdloop() then uses fields possibly freed by freejob() and calls freejob() again. This only occurs if the job being waited for is identified via % syntax ($! has never been referenced for it), it is a pipeline with two or more elements and another background job has been started before the wait command. That seems special enough for a bug to remain. Test scripts written by Jilles would almost always use $! and not % syntax. We can instead make waitcmdloop() pass its job pointer to dowait(), fixing up things for that (waitcmdloop() will have to call deljob() if it does not call freejob()). The crash from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290330#c2 appears to be the same bug. PR: 290330 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290330 ) Reported by: bdrewery Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D53773 (cherry picked from commit 75a6c38e4d5c651b7398bf2bea5baa41a0939e92) M bin/sh/jobs.c M bin/sh/tests/builtins/Makefile A bin/sh/tests/builtins/wait11.0 ____________________________________________________________________________________________________________ Commit: 28966fcdbf6f5e9d789cf10c7549db02da84eba7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=28966fcdbf6f5e9d789cf10c7549db02da84eba7 Author: Enji Cooper (Tue 9 Sep 2025 20:11:13 BST) Committer: Enji Cooper (Sat 31 Jan 2026 23:08:08 GMT) freebsd-update: sort options alphabetically This helps future developers when adding additional options handlers in the surrounding blocks. This is effectively a no-op. MFC after: 1 month (cherry picked from commit 0adec3d7ec96105c402ff2286e402ad63c845066) M usr.sbin/freebsd-update/freebsd-update.sh ____________________________________________________________________________________________________________ Commit: 5975766234e54b6c5410b87b94747b9f88ba34b6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5975766234e54b6c5410b87b94747b9f88ba34b6 Author: Enji Cooper (Thu 11 May 2023 06:39:32 BST) Committer: Enji Cooper (Sat 31 Jan 2026 23:04:46 GMT) rc.subr(8): run `trailing-whitespace-fixer` This change deletes benign trailing whitespace from rc.subr, making future non-stylistic changes easier to spot. MFC after: 1 week (cherry picked from commit 4e9041a78690b2c7ea35ab1c548412f2ac69da4d) M libexec/rc/rc.subr ____________________________________________________________________________________________________________ Commit: d53bd16721b57bf2cd41dfd1a1f1515aa4aa7f78 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d53bd16721b57bf2cd41dfd1a1f1515aa4aa7f78 Author: Enji Cooper (Mon 11 Apr 2022 02:17:09 BST) Committer: Enji Cooper (Sat 31 Jan 2026 23:03:51 GMT) Fix OID format for `vm.swap_reserved` and `vm.swap_total` The correct OID format for CTLTYPE_U64 is `QU` (`uquad_t`), not `A` (text expressed via `char *`). This issue was noticed while doing an sysctl tree walk using a sysctl(9) consumer that relies on the OID format to intuit what the type should be for a given sysctl. MFC after: 1 month Sponsored by: DellEMC Isilon Differential Revision: https://reviews.freebsd.org/D34877 (cherry picked from commit 567378cc0796c12f5d4bac79e639e22adf42b12f) M sys/vm/swap_pager.c ____________________________________________________________________________________________________________ Commit: c2b119e06bd960fbd6e0b69e304cfc7ad559a530 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c2b119e06bd960fbd6e0b69e304cfc7ad559a530 Author: Rose <83477269+AtariDreams@users.noreply.github.com> (Tue 9 May 2023 00:08:18 BST) Committer: Enji Cooper (Sat 31 Jan 2026 23:02:17 GMT) Correct size parameter to strncmp The wrong value passed to strncmp meant that only enable and disable were being accepted. This change corrects the logic so enabled and disabled are also accepted. Pull Request: https://github.com/freebsd/freebsd-src/pull/739 MFC after: 1 week Reviewed by: delphij, ngie (cherry picked from commit 5a9c724847f9b4e3831aa2c16276cc2ae20a99cc) M usr.sbin/mptutil/mpt_volume.c ____________________________________________________________________________________________________________ Commit: ab636697266224f448fd8f2543ff89d154328819 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ab636697266224f448fd8f2543ff89d154328819 Author: Kirill Kochnev (Thu 6 Nov 2025 18:22:30 GMT) Committer: Zhenlei Huang (Sat 31 Jan 2026 18:42:42 GMT) sys/net/sff8436.h: Fix the register address of link length of copper or active cable The register address of link length of copper or active cable is 146 as per the SFF-8436 specification [1]. [1] 7.6.2 Upper Memory Map Page 00h SFF-8436 Specification (pdf): https://members.snia.org/document/dl/25896 Reviewed by: imp, zlei MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1885 Closes: https://github.com/freebsd/freebsd-src/pull/1885 (cherry picked from commit a537694b49f719d84e3a69a2b8a3098f603da7d7) (cherry picked from commit fdd23fc3d0aacd1c80d0565d736591521b2421fc) (cherry picked from commit 58cf2a2840532208ab1442fc421ca6c985274c2c) M sys/net/sff8436.h ____________________________________________________________________________________________________________ Commit: 37de97853422a9e27c35fcc2365e7f561dc8d674 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=37de97853422a9e27c35fcc2365e7f561dc8d674 Author: Zhenlei Huang (Mon 29 Dec 2025 14:20:12 GMT) Committer: Zhenlei Huang (Sat 31 Jan 2026 18:42:41 GMT) qlnxe: Avoid out-of-bounds reading the multicast ethernet address The correct length of an ethernet address is ETHER_ADDR_LEN but not ETHER_HDR_LEN. MFC after: 1 week (cherry picked from commit 85f499be90c15a3de02d1c62ce03b99fab52f925) (cherry picked from commit 2b01cc15447251862f5e25332fcbf41516f22a3e) (cherry picked from commit a1828b1226fe8de1325a0e46ec5732268ba4525a) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: f119719571b84e00efe05c1c3bce7b9ada9fd776 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f119719571b84e00efe05c1c3bce7b9ada9fd776 Author: Zhenlei Huang (Tue 16 Dec 2025 04:41:02 GMT) Committer: Zhenlei Huang (Sat 31 Jan 2026 18:42:41 GMT) lio: Avoid out-of-bounds read or write MAC address While here, replace loop copying the MAC address with memcpy() for better readability. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54177 (cherry picked from commit 094626d3a5009a56bf1b763dbdfc681ce371dc99) (cherry picked from commit c162d7febbc83c1d877876b18ee864213dceca51) (cherry picked from commit e8de565f6bb8d91e2882ae5422b8a4a0337e4ca4) M sys/dev/liquidio/lio_ioctl.c M sys/dev/liquidio/lio_main.c ____________________________________________________________________________________________________________ Commit: df69b5792b2a71bad9dc1646e50be446e744c302 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=df69b5792b2a71bad9dc1646e50be446e744c302 Author: Dag-Erling Smørgrav (Thu 22 Jan 2026 18:16:37 GMT) Committer: Dag-Erling Smørgrav (Sat 31 Jan 2026 17:50:18 GMT) mdmfs: Fix soft updates logic Now that newfs(8) has a command-line argument to disable soft updates, use that instead of running tunefs(8) after the fact to turn them off. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: mckusick, imp Differential Revision: https://reviews.freebsd.org/D54783 (cherry picked from commit 4b9620433855b75989164c1a8a8a2e1a9b5fbff2) M sbin/mdmfs/mdmfs.c ____________________________________________________________________________________________________________ Commit: ad64308af9e3b61cc83acd6645ad608e63e97406 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ad64308af9e3b61cc83acd6645ad608e63e97406 Author: Dag-Erling Smørgrav (Sun 11 Jan 2026 02:34:00 GMT) Committer: Dag-Erling Smørgrav (Sat 31 Jan 2026 17:50:18 GMT) newfs: Add an option to disable soft updates A previous commit turned soft updates on by default for UFS2 without providing a way to turn them off. This corrects that by adding a new -u flag which forces soft updates (and soft updates journaling) off. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Fixes: 61dece6d27fb ("Enable soft updates by default for UFS2 filesystems.") Reviewed by: mckusick Differential Revision: https://reviews.freebsd.org/D54576 (cherry picked from commit 68562f8145e8154e7e276897a546995f0d8f3428) newfs: Add -u to getopt string Fixes: 68562f8145e8 ("newfs: Add an option to disable soft updates") (cherry picked from commit 717ae163919e48f000b94f85dc188e0d92261929) M sbin/newfs/newfs.8 M sbin/newfs/newfs.c ____________________________________________________________________________________________________________ Commit: c0053a940e27b1ed970316516647117050db6317 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c0053a940e27b1ed970316516647117050db6317 Author: Michael Osipov (Fri 23 Jan 2026 20:26:24 GMT) Committer: Michael Osipov (Sat 31 Jan 2026 17:32:32 GMT) loader.conf.5: "console" setting does not document multi-value possiblity PR: 292595 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292595 ) Approved by: ziaee, dab, imp, tsoome MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54843 (cherry picked from commit 240c614d48cb0484bfe7876decdf6bbdcc99ba73) M stand/defaults/loader.conf M stand/defaults/loader.conf.5 ____________________________________________________________________________________________________________ Commit: bffa54b58cbfc41e0502b97065726dc3fbaea6c7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bffa54b58cbfc41e0502b97065726dc3fbaea6c7 Author: Roman Bogorodskiy (Mon 26 Jan 2026 18:24:15 GMT) Committer: Roman Bogorodskiy (Sat 31 Jan 2026 15:43:55 GMT) bhyve: make BHYVE_SNAPSHOT amd64-only Build fails with BHYVE_SNAPSHOT enabled on non-amd64, so add it to BROKEN_OPTIONS for these arches. PR: 292686 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292686 ) Reviewed by: emaste, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54873 (cherry picked from commit b01763b2b2ab2d87f7d3c6ae57783c731ce548dd) M share/mk/src.opts.mk ____________________________________________________________________________________________________________ Commit: 2696f9be7ff6d89b62b8c47c0c315e8a67d0e994 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2696f9be7ff6d89b62b8c47c0c315e8a67d0e994 Author: Jessica Clarke (Tue 27 Jan 2026 21:44:39 GMT) Committer: Jessica Clarke (Fri 30 Jan 2026 01:17:53 GMT) libc: Don't use uninitialised string for getnetbyaddr[_r](0) DNS lookup If net is all-zero, the loop to extract all leading non-zero octets will iterate zero times and leave nn with the value 4, which the following switch statement to initialise qbuf does not handle. As a result, _dns_getnetbyaddr will look up the PTR record for this uninitialised string, which will leak the pre-existing contents of that stack memory to the DNS resolver and, if remote and not otherwise protected, network. Note that _dns_getnetbyaddr is only used if nsswitch.conf is configured to enable the "dns" source for the "networks" database, which is not the default configuration in FreeBSD. For glibc this same bug, in code also derived from BIND's, was issued CVE-2026-0915. This commit adopts the same behaviour as glibc's fix, which is to regard a net of 0 as being for 0.0.0.0. Apparently NetBSD will return NS_UNAVAIL instead, which may or may not make more sense, but in general glibc compatibility tends to cause less friction when there's not a good reason to avoid it. Reviewed by: markj (secteam) Fixes: 1363f04ce1b8 ("get* rework and new bind code") MFC after: 1 day Security: Same bug as glibc's CVE-2026-0915 (cherry picked from commit 331316b073505e4794754af1cd0c5ccc578a2bde) M lib/libc/net/getnetbydns.c ____________________________________________________________________________________________________________ Commit: 10f4191e2f85857045f5f971cc5720b977457068 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=10f4191e2f85857045f5f971cc5720b977457068 Author: Jessica Clarke (Wed 31 Dec 2025 17:14:55 GMT) Committer: Jessica Clarke (Fri 30 Jan 2026 01:17:53 GMT) Merge commit faa5141b9be4 from file git (by Christos Zoulas): PR/656: harry.sintonen: Fix bug in byte swapping that was caused by the change to make flags uint16_t and cont_level uint8_t. This fixes using a magic.mgc built with a different endianness than file(1) itself, e.g. when building powerpc64 on amd64. PR: 292079 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292079 ) Fixes: ae316d1d1cff ("MFV: file 5.46.") MFC after: 3 days (cherry picked from commit 39047538cf5d8f26112f7b08b3c56967f70f7f94) M contrib/file/src/apprentice.c ____________________________________________________________________________________________________________ Commit: 223ebd5a04c444b239037e89a0dbbc637c287bed URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=223ebd5a04c444b239037e89a0dbbc637c287bed Author: Joseph Mingrone (Thu 8 Jan 2026 19:22:58 GMT) Committer: Joseph Mingrone (Wed 28 Jan 2026 05:05:49 GMT) periodic: Support RFC 5424 syslog timestamps This is based on an initial implementation by michaelo in https://reviews.freebsd.org/D54361. PR: 270497 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270497 ) Reported by: michaelo Reviewed by: michaelo Tested by: michaelo MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54606 (cherry picked from commit 8ac6427b1bb95470f6c755202d1c0391ed8eefbd) M usr.sbin/periodic/etc/daily/460.status-mail-rejects M usr.sbin/periodic/etc/security/800.loginfail M usr.sbin/periodic/etc/security/900.tcpwrap ____________________________________________________________________________________________________________ Commit: 1741502f8d930a368a92aa1b72039053738f8a24 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1741502f8d930a368a92aa1b72039053738f8a24 Author: Gordon Tetlow (Mon 26 Jan 2026 18:45:58 GMT) Committer: Mark Johnston (Tue 27 Jan 2026 19:15:16 GMT) openssl: Fix multiple vulnerabilities This is a rollup commit from upstream to fix: Heap out-of-bounds write in BIO_f_linebuffer on short writes (CVE-2025-68160) Unauthenticated/unencrypted trailing bytes with low-level OCB function calls (CVE-2025-69418) Out of bounds write in PKCS12_get_friendlyname() UTF-8 conversion (CVE-2025-69419) Missing ASN1_TYPE validation in TS_RESP_verify_response() function (CVE-2025-69420) NULL Pointer Dereference in PKCS12_item_decrypt_d2i_ex function (CVE-2025-69421) Missing ASN1_TYPE validation in PKCS#12 parsing (CVE-2026-22795) ASN1_TYPE Type Confusion in the PKCS7_digest_from_attributes() function (CVE-2026-22796) See https://openssl-library.org/news/secadv/ for additional details. Approved by: so Obtained from: OpenSSL Security: FreeBSD-SA-26:01.openssl Security: CVE-2025-68160 Security: CVE-2025-69418 Security: CVE-2025-69419 Security: CVE-2025-69420 Security: CVE-2025-69421 Security: CVE-2026-22795 Security: CVE-2026-22796 M crypto/openssl/apps/s_client.c M crypto/openssl/crypto/asn1/a_strex.c M crypto/openssl/crypto/bio/bf_lbuf.c M crypto/openssl/crypto/modes/ocb128.c M crypto/openssl/crypto/pkcs12/p12_decr.c M crypto/openssl/crypto/pkcs12/p12_kiss.c M crypto/openssl/crypto/pkcs12/p12_utl.c M crypto/openssl/crypto/pkcs7/pk7_doit.c M crypto/openssl/crypto/ts/ts_rsp_verify.c ____________________________________________________________________________________________________________ Commit: eda3cd3c7a8129079b37c9fd5ac8d2e3557dc316 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eda3cd3c7a8129079b37c9fd5ac8d2e3557dc316 Author: Michael Osipov (Fri 23 Jan 2026 20:03:20 GMT) Committer: Michael Osipov (Tue 27 Jan 2026 15:16:38 GMT) vt.4: Document that hw.vga.textmode does not apply for UEFI(8) boot PR: 292598 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292598 ) Approved by: ziaee, imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54842 (cherry picked from commit 28764001b504c3588fd9f8dd6e4c08144d20571c) M share/man/man4/vt.4 ____________________________________________________________________________________________________________ Commit: f0fbaa71a5a2130ddfcccdd3e55ba1da0a809ba2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f0fbaa71a5a2130ddfcccdd3e55ba1da0a809ba2 Author: Konstantin Belousov (Wed 28 May 2025 22:51:42 BST) Committer: Mark Johnston (Mon 26 Jan 2026 15:49:51 GMT) namei: clear internal flags in NDREINIT() same as it is done for NDRESTART() Fixes: e05e33041c252 Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation (cherry picked from commit 58b2bd33aff71c0268d99d63e9c83f6544d3beb3) M sys/sys/namei.h ____________________________________________________________________________________________________________ Commit: babac9d7bc05fe8ceece1710b9becc5970492f81 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=babac9d7bc05fe8ceece1710b9becc5970492f81 Author: Konstantin Belousov (Fri 28 Nov 2025 15:57:22 GMT) Committer: Konstantin Belousov (Mon 26 Jan 2026 15:13:36 GMT) vm_fault: only rely on PG_ZERO when the page was newly allocated (cherry picked from commit cff67bc43df14d492ccc08ec92fddceadd069953) M sys/vm/vm_fault.c ____________________________________________________________________________________________________________ Commit: 1dc8b622b36dc1d01e564825a079dfc7d231a4db URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1dc8b622b36dc1d01e564825a079dfc7d231a4db Author: Konstantin Belousov (Sat 22 Nov 2025 20:39:27 GMT) Committer: Konstantin Belousov (Mon 26 Jan 2026 15:10:59 GMT) vm_object_page_remove(): clear pager even if there is no resident pages (cherry picked from commit 72a447d0bc768c7fe8a9c972f710c75afebd581b) M sys/vm/vm_object.c ____________________________________________________________________________________________________________ Commit: 731fa6c8f41b5563f120d172e69cff19b3cf7e6a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=731fa6c8f41b5563f120d172e69cff19b3cf7e6a Author: Dimitry Andric (Fri 23 Jan 2026 17:31:53 GMT) Committer: Dimitry Andric (Mon 26 Jan 2026 08:33:08 GMT) libc++ inttypes.h: define __STDC_CONSTANT_MACROS and __STDC_LIMIT_MACROS Before transitively including the base version of inttypes.h, define __STDC_CONSTANT_MACROS and __STDC_LIMIT_MACROS, because the base inttypes.h directly includes sys/stdint.h, instead of going through the 'regular' stdint.h. The libc++ version of the latter does define those macros, to ensure things like UINT64_C() and SIZE_MAX are defined even in C++98 or C++03. MFC after: 3 days (cherry picked from commit 3cdb6c9d92ecf479a0df338267f3f844ef6feeb2) M contrib/llvm-project/libcxx/include/inttypes.h ____________________________________________________________________________________________________________ Commit: 1b02df092f178dc405b31cbfb2c4046059506969 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1b02df092f178dc405b31cbfb2c4046059506969 Author: Dimitry Andric (Thu 15 Jan 2026 11:31:29 GMT) Committer: Dimitry Andric (Mon 26 Jan 2026 08:30:32 GMT) mxge(4): avoid clang 21 warning in NO-IP configuration Building the LINT-NOIP kernel on amd64 with clang 21 results in a -Werror warning similar to: sys/dev/mxge/if_mxge.c:1846:44: error: variable 'sum' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer] 1846 | cksum_offset, sizeof(sum), (caddr_t)&sum); | ^~~ Indeed, if both `INET` and `INET6` are undefined, `sum` is never initialized. Initialize it to zero to silence the warning. Reviewed by: jhibbits MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54730 (cherry picked from commit 74cac745fe302b26ad22114f60735c8b73e90571) M sys/dev/mxge/if_mxge.c ____________________________________________________________________________________________________________ Commit: a4e3ff911cbdea09f42ae70ac37660df9fc8884e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a4e3ff911cbdea09f42ae70ac37660df9fc8884e Author: Dimitry Andric (Fri 16 Jan 2026 14:02:25 GMT) Committer: Dimitry Andric (Mon 26 Jan 2026 08:29:54 GMT) vchiq: fix build with clang 21 When compiling vchiq with clang 21, the following -Werror warning is produced: sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c:728:27: error: default initialization of an object of type 'VCHIQ_QUEUE_MESSAGE32_T' with const member leaves the object uninitialized [-Werror,-Wdefault-const-init-field-unsafe] 728 | VCHIQ_QUEUE_MESSAGE32_T args32; | ^ sys/contrib/vchiq/interface/vchiq_arm/vchiq_ioctl.h:151:40: note: member 'elements' declared 'const' here 151 | const /*VCHIQ_ELEMENT_T * */ uint32_t elements; | ^ While the warning is formally correct, the 'args32' object is immediately initialized after its declaration. Therefore, suppress the warning. MFC after: 3 days (cherry picked from commit b39662fc388678db2b7b5fa3c900205252d15b3b) M sys/arm/broadcom/bcm2835/files.bcm283x M sys/conf/files.arm64 M sys/conf/kern.mk ____________________________________________________________________________________________________________ Commit: 6f358a6f2e5590079094eca67926076d8afb67ed URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6f358a6f2e5590079094eca67926076d8afb67ed Author: Eugene Grosbein (Thu 22 Jan 2026 14:37:54 GMT) Committer: Eugene Grosbein (Sun 25 Jan 2026 04:17:00 GMT) MFC: libfetch: allow disabling TLS v1.3 when negotiating the connection (cherry picked from commit 129aec72250266e60c07ff4643623188f7c27a9d) M lib/libfetch/common.c M lib/libfetch/fetch.3 ____________________________________________________________________________________________________________ Commit: 2305dcc115e815b1b6b0259977afddb918f31a26 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2305dcc115e815b1b6b0259977afddb918f31a26 Author: Eugene Grosbein (Thu 22 Jan 2026 08:40:35 GMT) Committer: Eugene Grosbein (Sun 25 Jan 2026 04:14:54 GMT) MFC: libfetch: apply timeout to SSL_read() Currently, fetchTimeout works for non-SSL connections only, so does fetch -T. Fix it applying specified timeout to SSL_read(). (cherry picked from commit 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e) M lib/libfetch/common.c ____________________________________________________________________________________________________________ Commit: 44b0f31df65ecc96e350f42a79a87b49d7cf8f46 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=44b0f31df65ecc96e350f42a79a87b49d7cf8f46 Author: Kevin Bowling (Tue 19 Aug 2025 17:45:48 BST) Committer: Kevin Bowling (Sat 24 Jan 2026 11:12:55 GMT) Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" We've gotten a report of this breaking a fixed no autoneg setup. Since no link is worse than what this intends to fix (negotiating full duplex at forced speed), revert for the undeway 15.0 release cycle until this can be further reviewed. PR: 288827 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288827 ) Differential Revision: https://reviews.freebsd.org/D47336 This reverts commit 645c45e297c0fcbbb9d2d24cdeeb124234825019. (cherry picked from commit 3ff0231c87f360afa4521e635b46f6c711dc4ee3) M sys/dev/e1000/e1000_phy.c M sys/dev/e1000/if_em.c ____________________________________________________________________________________________________________ Commit: b016fa60c87f9806e76c2992aae1dedd4a7fedd4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b016fa60c87f9806e76c2992aae1dedd4a7fedd4 Author: Michael Osipov (Mon 29 Dec 2025 21:31:49 GMT) Committer: Michael Osipov (Mon 19 Jan 2026 22:13:23 GMT) sockstat: improve printaddr() according to style(9) Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54412 (cherry picked from commit f89f7e58ba1d54c6a683e3cc899938895496c088) M usr.bin/sockstat/sockstat.c ____________________________________________________________________________________________________________ Commit: fc614b08ef6cce1568f449de1bf562d0b2d5f777 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fc614b08ef6cce1568f449de1bf562d0b2d5f777 Author: Jose Luis Duran (Sun 11 Jan 2026 16:42:18 GMT) Committer: Jose Luis Duran (Sun 18 Jan 2026 03:57:12 GMT) Import latest mtree from NetBSD Merge commit '7e59b238fcf32f3d365e78ddc702ca494e1ff68d' This commit partially reverts the previous vendor import, given that the "type" keyword has been historically mandatory and should not be removed by "-R all". This was clarified in the man page. Reported by: glebius PR: 219467 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219467 ) MFC after: 1 week (cherry picked from commit 4250d2ad991b7bb9915e4c6b6d93b17369747ff0) M contrib/mtree/create.c M contrib/mtree/mtree.8 ____________________________________________________________________________________________________________ Commit: 72ba9e02131820de0fccedd4ad7a53c908e57d8b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=72ba9e02131820de0fccedd4ad7a53c908e57d8b Author: Martin Matuska (Mon 5 Jan 2026 20:14:54 GMT) Committer: Martin Matuska (Thu 15 Jan 2026 21:26:06 GMT) libarchive: merge from vendor branch libarchive 3.8.5 Important bugfixes: #2809 bsdtar: fix regression from 3.8.4 zero-length pattern issue bugfix Obtained from: libarchive Vendor commit: dd897a78c662a2c7a003e7ec158cea7909557bee MFC after: 1 week (cherry picked from commit 4b047c3af3fec1607ba1cfe04e1d442a17fc1cf6) M contrib/libarchive/NEWS M contrib/libarchive/README.md M contrib/libarchive/cpio/cpio.c M contrib/libarchive/libarchive/archive.h M contrib/libarchive/libarchive/archive_entry.h M contrib/libarchive/libarchive/archive_read_support_filter_uu.c M contrib/libarchive/libarchive/archive_read_support_format_cab.c M contrib/libarchive/libarchive/archive_read_support_format_cpio.c M contrib/libarchive/libarchive/archive_read_support_format_lha.c M contrib/libarchive/libarchive/archive_read_support_format_mtree.c M contrib/libarchive/libarchive/archive_string.c M contrib/libarchive/libarchive/archive_util.c M contrib/libarchive/libarchive/archive_write_open_fd.c M contrib/libarchive/libarchive/archive_write_open_file.c M contrib/libarchive/libarchive/archive_write_open_memory.c M contrib/libarchive/libarchive/archive_write_set_format_shar.c M contrib/libarchive/libarchive/archive_write_set_format_ustar.c M contrib/libarchive/libarchive/test/test_compat_lzip.c M contrib/libarchive/libarchive_fe/line_reader.c M contrib/libarchive/tar/subst.c M contrib/libarchive/tar/write.c M contrib/libarchive/test_utils/test_main.c M contrib/libarchive/unzip/bsdunzip.c M contrib/libarchive/unzip/la_queue.h ____________________________________________________________________________________________________________ Commit: d5881e250e584a40f5e57d211e9051cafe95c8ec URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d5881e250e584a40f5e57d211e9051cafe95c8ec Author: Martin Matuska (Mon 1 Dec 2025 13:05:35 GMT) Committer: Martin Matuska (Thu 15 Jan 2026 21:25:54 GMT) libarchive: merge from vendor branch libarchive 3.8.4 Important bugfixes: #2787 bsdtar: Fix zero-length pattern issue #2797 lib: Fix regression introduced in libarchive 3.8.2 when walking enterable but unreadable directories Obtained from: libarchive Vendor commit: d114ceee6de08a7a60ff1209492ba38bf9436f79 MFC after: 1 week (cherry picked from commit c1e033c33e8b290cd40f4069249c879efcbae6a6) M contrib/libarchive/NEWS M contrib/libarchive/libarchive/archive.h M contrib/libarchive/libarchive/archive_cryptor.c M contrib/libarchive/libarchive/archive_cryptor_private.h M contrib/libarchive/libarchive/archive_entry.h M contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c M contrib/libarchive/libarchive/archive_read_disk_posix.c M contrib/libarchive/libarchive/archive_read_support_format_mtree.c M contrib/libarchive/libarchive/archive_version_details.c M contrib/libarchive/libarchive/archive_write.c M contrib/libarchive/libarchive/archive_write_disk_posix.c M contrib/libarchive/libarchive/archive_write_set_format_xar.c M contrib/libarchive/libarchive/test/test_archive_read_multiple_data_objects.c M contrib/libarchive/libarchive/test/test_write_disk_perms.c M contrib/libarchive/libarchive/test/test_write_filter_bzip2.c M contrib/libarchive/tar/subst.c M contrib/libarchive/tar/test/test_option_s.c ____________________________________________________________________________________________________________ Commit: d2131c8276f3c05a521ce971b6dda194ab417adc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d2131c8276f3c05a521ce971b6dda194ab417adc Author: Martin Matuska (Wed 19 Nov 2025 13:33:40 GMT) Committer: Martin Matuska (Thu 15 Jan 2026 21:25:45 GMT) libarchive: merge from vendor branch libarchive 3.8.3 Important bugfixes: #2753 lib: Create temporary files in the target directory #2768 lha: Fix for an out-of-bounds buffer overrun when using p[H_LEVEL_OFFSET] #2769 7-zip: Fix a buffer overrun when reading truncated 7zip headers #2771 lz4 and zstd: Support both lz4 and zstd data with leading skippable frames Obtained from: libarchive Vendor commit: 1368b08875351df8aa268237b882c8f4ceb0882d MFC after: 1 week (cherry picked from commit 007679a138089676aadc9a712277f4004403b905) M contrib/libarchive/NEWS M contrib/libarchive/libarchive/archive.h M contrib/libarchive/libarchive/archive_entry.h M contrib/libarchive/libarchive/archive_entry_stat.3 M contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c M contrib/libarchive/libarchive/archive_read_disk_posix.c M contrib/libarchive/libarchive/archive_read_support_filter_lz4.c M contrib/libarchive/libarchive/archive_read_support_filter_zstd.c M contrib/libarchive/libarchive/archive_read_support_format_7zip.c M contrib/libarchive/libarchive/archive_read_support_format_lha.c M contrib/libarchive/libarchive/archive_read_support_format_tar.c M contrib/libarchive/libarchive/archive_read_support_format_zip.c M contrib/libarchive/libarchive/archive_string.c M contrib/libarchive/libarchive/archive_string.h M contrib/libarchive/libarchive/archive_write_disk_posix.c M contrib/libarchive/libarchive/archive_write_open_filename.c A contrib/libarchive/libarchive/module.modulemap M contrib/libarchive/libarchive/test/test_archive_string.c M contrib/libarchive/libarchive/test/test_compat_lz4.c A contrib/libarchive/libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu A contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.7z.uu A contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.c M contrib/libarchive/tar/test/test_option_safe_writes.c M contrib/libarchive/tar/util.c M contrib/libarchive/test_utils/test_main.c M lib/libarchive/tests/Makefile ____________________________________________________________________________________________________________ Commit: 70db1cd937e8bf98c75ff7cba2c905cb644ad9e3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=70db1cd937e8bf98c75ff7cba2c905cb644ad9e3 Author: Jose Luis Duran (Mon 5 Jan 2026 20:35:37 GMT) Committer: Jose Luis Duran (Thu 15 Jan 2026 19:48:17 GMT) makefs: Fix typo 's/mirrorring/mirroring/' MFC after: 1 week (cherry picked from commit 73af599fb7be6806b553ac6f470d76711b74286c) M usr.sbin/makefs/msdos/msdosfs_vfsops.c ____________________________________________________________________________________________________________ Commit: a7d9d1b19608b5e1224e8b687aa2b91d714a71ed URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a7d9d1b19608b5e1224e8b687aa2b91d714a71ed Author: Dimitry Andric (Thu 8 Jan 2026 08:35:13 GMT) Committer: Dimitry Andric (Mon 12 Jan 2026 17:59:17 GMT) zfs: emit .note.GNU-stack section for all ELF targets On FreeBSD, linking the zfs kernel module with binutils ld 2.44 shows the following warning: ld: warning: aesni-gcm-avx2-vaes.o: missing .note.GNU-stack section implies executable stack ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker Some of the `.S` files under `module/icp/asm-x86_64/modes` check whether to emit the `.note.GNU-stack` section using: #if defined(__linux__) && defined(__ELF__) We could add `&& defined(__FreeBSD__)` to the test, but since all other `.S` files in the OpenZFS tree use: #ifdef __ELF__ it would seem more logical to use that instead. Any recent ELF platform should support these note sections by now. Reviewed by: emaste, kib, imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54578 (cherry picked from commit eb1b6ec7a79aff05f5f10e1d6b1c63a0d8dc5f2f) M sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S M sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S ____________________________________________________________________________________________________________ Commit: b16ae773509cfd96be975644aad9c325011d8ea2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b16ae773509cfd96be975644aad9c325011d8ea2 Author: Frank Hilgendorf (Mon 27 Jan 2025 21:18:39 GMT) Committer: Ahmad Khalifa (Mon 12 Jan 2026 17:28:03 GMT) loader.efi: add stride & offset for MacBookPro3,1 Note that there are three variants of this MacBook. We only have the stride and offset values for the 17" 1680x1050 model. Reviewed by: vexeduxr Pull Request: https://github.com/freebsd/freebsd-src/pull/1584 (cherry picked from commit be6ba97aaee762c2e5300834f1916ae5dfd5a0b9) M stand/efi/loader/framebuffer.c ____________________________________________________________________________________________________________ Commit: 8591ee986b22007a98ded2f3dc86e8065f14b213 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8591ee986b22007a98ded2f3dc86e8065f14b213 Author: Ahmad Khalifa (Sun 4 Jan 2026 13:15:37 GMT) Committer: Ahmad Khalifa (Mon 12 Jan 2026 17:28:03 GMT) loader.efi: only use firmware provided Blt on GOP gfx_state.tg_private points to a EFI_GRAPHICS_OUTPUT_PROTOCOL only when using GOP. The firmware provided Blt functions on UGA platforms have been observed to not work on old MacBooks, and are likley hit or miss anyways as UGA has been deprecated since 2006. Reviewed by: tsoome PR: 291935 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291935 ) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54432 (cherry picked from commit 9595055ae7494997bb07b4aaed544f88ac4c5e7f) M stand/common/gfx_fb.c ____________________________________________________________________________________________________________ Commit: f4e56d1bda03982c9624e9d098a47bbbe2b834d5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f4e56d1bda03982c9624e9d098a47bbbe2b834d5 Author: Ahmad Khalifa (Sun 4 Jan 2026 13:15:02 GMT) Committer: Ahmad Khalifa (Mon 12 Jan 2026 17:28:02 GMT) loader.efi: probe for UGA if GOP isn't found Probe for UGA instead of returning early if we can't find GOP. Reviewed by: tsoome PR: 291935 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291935 ) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54431 (cherry picked from commit 5d85dde27b4769604fc108b89328607e70e767ed) M stand/efi/loader/framebuffer.c ____________________________________________________________________________________________________________ Commit: da358db1cba7402059187bd74313fa18601df609 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=da358db1cba7402059187bd74313fa18601df609 Author: Ahmad Khalifa (Tue 6 Jan 2026 02:07:29 GMT) Committer: Ahmad Khalifa (Mon 12 Jan 2026 17:28:02 GMT) ng_tty: avoid the sign extention of char When c is compared to sc->hotchar, both undergo integer promotion, which can lead to c being sign extended. Fix this by casting c to an unsigned char. Reviewed by: kevans MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54544 (cherry picked from commit 9b2478f60bfda663c84b48e272a2293159e1b0a0) M sys/netgraph/ng_tty.c ____________________________________________________________________________________________________________ Commit: 61b429198db7af6451ffdeeec95e65562b45f575 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=61b429198db7af6451ffdeeec95e65562b45f575 Author: Dag-Erling Smørgrav (Sat 3 Jan 2026 20:34:44 GMT) Committer: Dag-Erling Smørgrav (Sun 11 Jan 2026 02:30:47 GMT) libgeom: Fix 32-bit gcc build MFC after: 1 week Fixes: 27894e20f140 ("libgeom: Fix segfault in 32-on-64 case") (cherry picked from commit 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe) M lib/libgeom/geom_xml2tree.c ____________________________________________________________________________________________________________ Commit: d39abff4ce1eefdee1a17f3bd47d54c8187f667e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d39abff4ce1eefdee1a17f3bd47d54c8187f667e Author: Dag-Erling Smørgrav (Sat 3 Jan 2026 09:10:03 GMT) Committer: Dag-Erling Smørgrav (Sun 11 Jan 2026 02:30:46 GMT) libgeom: Improve type safety of xml2tree code When resolving references, assert that the type of the object we find is what we expect. This will help prevent memory corruption if two objects of different types somehow end up with the same identifier. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54454 (cherry picked from commit 4b0d5d1d6a7c9773e38882feb4747a76b37a645c) M lib/libgeom/geom_xml2tree.c ____________________________________________________________________________________________________________ Commit: f147d5ea78ab8466a0e94a0d386ebfb0b195d56b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f147d5ea78ab8466a0e94a0d386ebfb0b195d56b Author: Dag-Erling Smørgrav (Sat 3 Jan 2026 09:09:58 GMT) Committer: Dag-Erling Smørgrav (Sun 11 Jan 2026 02:30:46 GMT) libgeom: Clean up xml2tree code MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54453 (cherry picked from commit fad6707e2589d8557ceb6b6bf11f22323b265f01) M lib/libgeom/geom_xml2tree.c M lib/libgeom/libgeom.h ____________________________________________________________________________________________________________ Commit: 0ba11021c46a84855af445e6b0420dd9b8b36023 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0ba11021c46a84855af445e6b0420dd9b8b36023 Author: Dag-Erling Smørgrav (Sat 3 Jan 2026 09:09:51 GMT) Committer: Dag-Erling Smørgrav (Sun 11 Jan 2026 02:30:46 GMT) libgeom: Fix segfault in 32-on-64 case We were using strtoul() to parse object identifiers, which are kernel pointers. This works fine as long as the kernel and userland match, but in a 32-bit libgeom on a 64-bit kernel this will return ULONG_MAX for all objects, resulting in memory corruption when we later pick the wrong object while resolving consumer-producer references. MFC after: 1 week PR: 292127 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292127 ) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54452 (cherry picked from commit 27894e20f140ee2729c14b589035870c8185b87d) M lib/libgeom/geom_xml2tree.c ____________________________________________________________________________________________________________ Commit: 90f57724ef55da23b255b3e1aa12f2dc4f3f375c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=90f57724ef55da23b255b3e1aa12f2dc4f3f375c Author: Michael Osipov (Wed 7 Jan 2026 08:04:14 GMT) Committer: Michael Osipov (Fri 9 Jan 2026 18:52:05 GMT) mrsas.4: Fix devid hex style (cherry picked from commit c2b407244f3a939d8b09f9a22d872ebdce5f6b19) M share/man/man4/mrsas.4 ____________________________________________________________________________________________________________ Commit: 87b6549375c23a18e2a87e3c03352578d3dcb3af URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=87b6549375c23a18e2a87e3c03352578d3dcb3af Author: Michael Osipov (Tue 6 Jan 2026 20:31:24 GMT) Committer: Michael Osipov (Fri 9 Jan 2026 15:56:22 GMT) mrsas.4: Add Fujitsu RAID Controller SAS 6Gbit/s 1GB (D3116) This is an OEM card from Fujitsu using an LSI SAS2208 ROC controller shipped with many Fujitsu PRIMERGY servers like RX300 S7. Controller description: https://www.fujitsu.com/global/products/computing/servers/primergy/blades/connection/cb-pmod-110426.html Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54566 (cherry picked from commit ccec94bf63de8ee067b03b981a283d9f968c3667) M share/man/man4/mrsas.4 ____________________________________________________________________________________________________________ Commit: 98b9f1dcbc0c35af4d8a8cbe93bb99a6b53c64b1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=98b9f1dcbc0c35af4d8a8cbe93bb99a6b53c64b1 Author: Alexander Ziaee (Sun 28 Sep 2025 04:41:33 BST) Committer: Alexander Ziaee (Wed 7 Jan 2026 13:57:40 GMT) mrsas.4: Cleaning + Rewrite SYNOPSIS for consistency + Rewrite HARDWARE for HW Relnotes, and add some stragglers + Correct mdoc grammar, making sysctls aproposable and linking xrefs + Clean up TODO, cannonicalize to CAVEATS, a standard section + Editorial pass, tag SPDX MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D52125 (cherry picked from commit 52eb7e394a7e28e9b08e2096c4a085a384cc1dd0) M share/man/man4/mrsas.4 ____________________________________________________________________________________________________________ Commit: 56eef386f51284901bd4a6d45bc2b9cd8f957c28 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=56eef386f51284901bd4a6d45bc2b9cd8f957c28 Author: Michael Osipov (Sun 21 Dec 2025 15:53:27 GMT) Committer: Michael Osipov (Tue 6 Jan 2026 19:13:39 GMT) mfi(4): Add subvendor and subdevice for Fujitsu RAID Controller SAS 6Gbit/s 1GB (D3116) This is an OEM card from Fujitsu using an LSI SAS2208 ROC controller shipped with many Fujitsu PRIMERGY servers like RX300 S7. This chip is also recognized by mrsas(4) under the generic name for the controller chip. Controller description: https://www.fujitsu.com/global/products/computing/servers/primergy/blades/connection/cb-pmod-110426.html Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54520 (cherry picked from commit 8b210276cde207ca3dc1f7f46d5a6d32e0a1c51d) M share/man/man4/mfi.4 M sys/dev/mfi/mfi_pci.c ____________________________________________________________________________________________________________ Commit: 496fce83a59d40a261dce57890d25148ea4e81d3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=496fce83a59d40a261dce57890d25148ea4e81d3 Author: Dimitry Andric (Fri 2 Jan 2026 20:29:05 GMT) Committer: Dimitry Andric (Tue 6 Jan 2026 12:30:57 GMT) bsd.sys.mk: suppress another gcc warning for libc++ Similar to base 63d1c3c43690, suppress -Wc++20-extensions for gcc. Otherwise libc++ headers will lead to many -Werror warnings, due to our use of -Wsystem-headers, which is not officially supported upstream. MFC after: 3 days (cherry picked from commit 62a7fdc13ab45b48977424ef77bbc0f11f601e39) M share/mk/bsd.sys.mk ____________________________________________________________________________________________________________ Commit: 57f1d519e02d60c6d50f81aa6098a04a92152ab3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=57f1d519e02d60c6d50f81aa6098a04a92152ab3 Author: Cy Schubert (Fri 19 Dec 2025 04:59:38 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:12 GMT) ntp: Fix buildworld with MK_OPENSSL=no Reported by: wosch Tested by: wosch (cherry picked from commit 2804461adfc670c78c1dcb9cab6b2191c8d486ec) M usr.sbin/ntp/Makefile.inc M usr.sbin/ntp/config.h ____________________________________________________________________________________________________________ Commit: c4cc8ef864d198c1011f4ed5521d2debb1443ac9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c4cc8ef864d198c1011f4ed5521d2debb1443ac9 Author: Warner Losh (Thu 27 Nov 2025 00:04:29 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:12 GMT) ipfilter: fix broken build Every commit earns me a dozen emails that LINT is broken. This should stop that. Fixes: eda1756d0454f ipfilter: Verify frentry on entry into kernel Sponsored by: Netflix (cherry picked from commit ddec4209b10d65ef19e1d1b884e1b876eab58c7d) M sys/netpfil/ipfilter/netinet/fil.c M sys/netpfil/ipfilter/netinet/ip_nat.c ____________________________________________________________________________________________________________ Commit: 35d427d6d0a58644daf8e81f1b23553403c6c0bf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=35d427d6d0a58644daf8e81f1b23553403c6c0bf Author: Cy Schubert (Mon 15 Dec 2025 16:21:56 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:11 GMT) ipfilter: Add missing kenv fetch When a module the environment must be explicitly fetched. Fixes: d9788eabffa4 PR: 291548 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291548 ) Noted by: markj Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54242 MFC after: 3 days (cherry picked from commit a6ea80bc917510b5e056cc5a29b62dfd7b39d068) M sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c ____________________________________________________________________________________________________________ Commit: 55ea321fe65ee438e237543c95ce7e6c0329e907 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=55ea321fe65ee438e237543c95ce7e6c0329e907 Author: Cy Schubert (Sun 16 Nov 2025 07:39:19 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:11 GMT) ipfilter: Disable ipfs(8) by default At the moment ipfs(8) is a tool that can be easily abused. Though the concept is sound the implementation needs some work. ipfs(8) should be considered experimental at the moment. This commit also makes ipfs support in the kernel optional. Reviewed by: emaste, glebius MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53787 (cherry picked from commit 0ff0c19e7f70bc4d3f98196a8ad43de635cf13e5) M sbin/ipf/Makefile M share/mk/src.opts.mk M sys/conf/NOTES M sys/conf/options M sys/modules/ipfilter/Makefile M sys/netpfil/ipfilter/netinet/ip_nat.c M sys/netpfil/ipfilter/netinet/ip_state.c M tools/build/mk/OptionalObsoleteFiles.inc ____________________________________________________________________________________________________________ Commit: e3b9f73e126e5b75142c1efbd825da3f0944b49f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e3b9f73e126e5b75142c1efbd825da3f0944b49f Author: Cy Schubert (Wed 29 Oct 2025 18:29:39 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:11 GMT) ipfilter: Restrict ipfilter within a jail Add a sysctl/tunable (net.inet.ipf.jail_allowed) to control whether a jail can manage its own ipfilter rules, pools, and settings. A jail's control over its own ipfilter rules and settings may not be desireable. The default is jail access to ipfilter is denied. The host system can stil manage a jail's rules by attaching the rules, using the on keyword, limiting the rule to the jail's interface. Or the sysctl/tunable can be enabled to allow a jail control over its own ipfilter rules and settings. Implementation note: Rather than store the jail_allowed variable, referenced by sysctl(9), in a global area, storing the variable in the ipfilter softc is consistent with ipfilter's use of its softc. Discussed with: emaste, jrm MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53623 (cherry picked from commit d9788eabffa4b67fc534685fc3d9b8e3334af196) M sbin/ipf/libipf/interror.c M sys/netpfil/ipfilter/netinet/fil.c M sys/netpfil/ipfilter/netinet/ip_fil.h M sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c M sys/netpfil/ipfilter/netinet/mlfk_ipl.c ____________________________________________________________________________________________________________ Commit: ceda9eb20f3efe0cfa4a444a972b2a47fdde044c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ceda9eb20f3efe0cfa4a444a972b2a47fdde044c Author: Cy Schubert (Wed 26 Nov 2025 23:39:24 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:11 GMT) ipfilter: Restore used variable One of the "unused" i variables is actually used. Fixes: 20c48f090b27 (cherry picked from commit 78c6cfdc3dc0b84aa2daf0f32c7c9cdf3b34fee5) M sys/netpfil/ipfilter/netinet/fil.c ____________________________________________________________________________________________________________ Commit: 27b1e9d16f30b441259f90e449d87f0fc9594854 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=27b1e9d16f30b441259f90e449d87f0fc9594854 Author: Cy Schubert (Wed 26 Nov 2025 23:24:17 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:10 GMT) ipfilter: Remove unused variable Reported by: jlduran Fixes: eda1756d0454, 821774dfbdaa MFC after: 1 week X-MFC with: eda1756d0454, 821774dfbdaa (cherry picked from commit 20c48f090b270d0124d5f0b31c6f3a639efbbc80) M sys/netpfil/ipfilter/netinet/fil.c M sys/netpfil/ipfilter/netinet/ip_nat.c ____________________________________________________________________________________________________________ Commit: 75fbf1d27b6d00fb12e22b41d22b43c4279fd77d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=75fbf1d27b6d00fb12e22b41d22b43c4279fd77d Author: Cy Schubert (Mon 3 Nov 2025 04:59:15 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:10 GMT) ipfilter: Verify ipnat on entry into kernel The ipnat struct is built by ipnat(8), specifically ipnat_y.y when parsing the ipnat configuration file (typically ipnat.conf). ipnat contains a variable length string field at the end of the struct. This data field, called in_names, may contain various text strings such as NIC names. There is no upper bound limit to the length of strings as long as the in_namelen length field specifies the length of in_names within the ipnat structure and in_size specifies the size of the ipnat structure itself. Reported by: Ilja Van Sprundel Reviewed by: markj MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53843 (cherry picked from commit 821774dfbdaa12ef072ff7eaea8f9966a7e63935) M sbin/ipf/libipf/interror.c M sys/netpfil/ipfilter/netinet/ip_nat.c ____________________________________________________________________________________________________________ Commit: 70eba39e866572c987cc9d78492aa0ce7d4d35e6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=70eba39e866572c987cc9d78492aa0ce7d4d35e6 Author: Cy Schubert (Wed 29 Oct 2025 17:23:23 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:10 GMT) ipfilter: Verify frentry on entry into kernel The frentry struct is built by ipf(8), specifically ipf_y.y when parsing the ipfilter configuration file (typically ipf.conf). frentry contains a variable length string field at the end of the struct. This data field, called fr_names, may contain various text strings such as NIC names, destination list (dstlist) names, and filter rule comments. The length field specifies the length of fr_names within the frentry structure and fr_size specifies the size of the frentry structure itself. The upper bound limit to the length of strings field is controlled by the fr_max_namelen sysctl/kenv or the max_namelen ipfilter tuneable. The initial concepts were discussed with emaste and jrm. Reported by: Ilja Van Sprundel Reviewed by: markj MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53843 (cherry picked from commit eda1756d0454f9383940dc825cf571ff67e0c013) M sbin/ipf/libipf/interror.c M sys/netpfil/ipfilter/netinet/fil.c M sys/netpfil/ipfilter/netinet/ip_fil.h M sys/netpfil/ipfilter/netinet/mlfk_ipl.c ____________________________________________________________________________________________________________ Commit: 01bf278bd92e9b809bc15cd5d68201f426d5b208 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=01bf278bd92e9b809bc15cd5d68201f426d5b208 Author: Cy Schubert (Tue 18 Nov 2025 19:23:06 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:10 GMT) ipfilter: Add ipf_check_names_string() ipf_check_names_string will verify userland inputs in names strings (fr.fr_names, in.in_names) for correctness. Original concept of ipf_check_names_string() instead of macros by markj. Reviewed by: markj MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53843 (cherry picked from commit 525c535d5aa87f686dcfee620619827f7c6090db) M sys/netpfil/ipfilter/netinet/fil.c M sys/netpfil/ipfilter/netinet/ip_fil.h ____________________________________________________________________________________________________________ Commit: 1b7195a1695745a9b3cf2977dc000d14967cf934 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1b7195a1695745a9b3cf2977dc000d14967cf934 Author: Cy Schubert (Tue 28 Oct 2025 03:43:14 GMT) Committer: Cy Schubert (Mon 5 Jan 2026 03:40:09 GMT) ipfs: Fix typo in error message MFC after: 3 days (cherry picked from commit 5ae7b106cfd4801ef5e0f69b02ad9b3ae3ccfbec) M sbin/ipf/ipfs/ipfs.c ____________________________________________________________________________________________________________ Commit: a96eb797b2d4eab42b8d03935850532939df8fcc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a96eb797b2d4eab42b8d03935850532939df8fcc Author: Alex Richardson (Tue 16 Sep 2025 05:54:36 BST) Committer: Dimitry Andric (Sun 4 Jan 2026 01:46:55 GMT) sys/xen: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week (cherry picked from commit 4cd7be3e81863bd22aacccc34fc2e8b2cfcb14d9) M sys/dev/xen/blkback/blkback.c M sys/xen/xen_intr.h M sys/xen/xenbus/xenbusvar.h M sys/xen/xenstore/xenstorevar.h ____________________________________________________________________________________________________________ Commit: b94022db9aed8e01675baafde096e09c63bf6cf6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b94022db9aed8e01675baafde096e09c63bf6cf6 Author: Alex Richardson (Tue 16 Sep 2025 05:58:36 BST) Committer: Dimitry Andric (Sun 4 Jan 2026 01:46:39 GMT) ocs_fc: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week (cherry picked from commit 3c0ea1b629764c49611e3e3adfa0c44f9afa3558) M sys/dev/ocs_fc/ocs_ddump.h M sys/dev/ocs_fc/ocs_mgmt.h M sys/dev/ocs_fc/ocs_os.h M sys/dev/ocs_fc/ocs_utils.h ____________________________________________________________________________________________________________ Commit: f5b76cb51e2c5b5b939b4d759379907c69ea31db URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f5b76cb51e2c5b5b939b4d759379907c69ea31db Author: Dimitry Andric (Tue 30 Dec 2025 12:46:20 GMT) Committer: Dimitry Andric (Fri 2 Jan 2026 20:50:19 GMT) crypto: avoid warnings about too-long initializer strings Mark `sigma` and `tau` as `__non_string`, to avoid warnings from clang 21 similar to: sys/crypto/chacha20/chacha.c:53:31: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 53 | static const char sigma[16] = "expand 32-byte k"; | ^~~~~~~~~~~~~~~~~~ sys/crypto/chacha20/chacha.c:54:29: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 54 | static const char tau[16] = "expand 16-byte k"; | ^~~~~~~~~~~~~~~~~~ MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54364 (cherry picked from commit 710ec409dffed3306ced253bba85dbdc7758510b) M sys/crypto/chacha20/chacha.c ____________________________________________________________________________________________________________ Commit: 936112e7ff707e3a9cfdbcc3737bed580f400d6b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=936112e7ff707e3a9cfdbcc3737bed580f400d6b Author: Dimitry Andric (Tue 30 Dec 2025 12:48:07 GMT) Committer: Dimitry Andric (Fri 2 Jan 2026 20:50:13 GMT) ncurses: avoid warnings about too-long initializer strings Increase the size of `assoc::from` to 8 bytes, to avoid warnings from clang 21 similar to: contrib/ncurses/progs/infocmp.c:702:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 702 | DATA("\033[2J", "ED2"), /* clear page */ | ^~~~~~~~~ contrib/ncurses/progs/infocmp.c:716:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 716 | DATA("\033[!p", "DECSTR"), /* soft reset */ | ^~~~~~~~~ Reviewed by: markj Obtained from: https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241207.patch.gz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54371 (cherry picked from commit 667259b392ec0a86d066ccc6ba0f4025b3d2a083) M contrib/ncurses/progs/infocmp.c ____________________________________________________________________________________________________________ Commit: 958f2ab6d400de5a8990c392d17eecaf2e47e6c4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=958f2ab6d400de5a8990c392d17eecaf2e47e6c4 Author: Kyle Evans (Sun 28 Dec 2025 22:02:04 GMT) Committer: Dimitry Andric (Fri 2 Jan 2026 20:49:59 GMT) compat: linux: use appropriate variables for copying out old timers We copyout &l_oval but do the conversions into &l_val, leaving us with stack garbage. A build with an LLVM21 cross-toolchain seems to catch this. Reported by: Florian Limberger Reviewed by: markj Fixes: a1fd2911ddb06 ("linux(4): Implement timer_settime64 syscall.") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52985 (cherry picked from commit 541a98d7e28a8e4697ac2fa78dd4c4203c2c3a9c) M sys/compat/linux/linux_timer.c ____________________________________________________________________________________________________________ Commit: 02624874966d57e482baa6f0d1e87c37608506dc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=02624874966d57e482baa6f0d1e87c37608506dc Author: Dimitry Andric (Thu 25 Dec 2025 18:44:34 GMT) Committer: Dimitry Andric (Fri 2 Jan 2026 20:49:54 GMT) bsd.sys.mk: suppress some new clang 21 warnings for C++ Otherwise, these lead to many -Werror warnings in libc++ headers, due to our use of -Wsystem-headers, which is not officially supported upstream: Suppress -Wc++20-extensions, due to: /usr/include/c++/v1/__algorithm/simd_utils.h:96:50: error: explicit template parameter list for lambdas is a C++20 extension [-Werror,-Wc++20-extensions] 96 | inline constexpr size_t __simd_vector_size_v = []() -> size_t { | ^ Suppress -Wc++23-lambda-attributes, due to: /usr/include/c++/v1/__format/format_functions.h:462:32: error: an attribute specifier sequence in this position is a C++23 extension [-Werror,-Wc++23-lambda-attributes] 462 | if (bool __is_identity = [&] [[__gnu__::__pure__]] // Make sure the compiler knows this call can be eliminated | ^ Suppress -Wnullability-completeness, due to: /usr/include/c++/v1/string:1068:80: error: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Werror,-Wnullability-completeness] 1068 | _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s, size_type __n) { | ^ MFC after: 3 days (cherry picked from commit 63d1c3c43690ff3c3e76e1fb03c8640fe30a2663) M share/mk/bsd.sys.mk ____________________________________________________________________________________________________________ Commit: 3015ca9407d14876b1b6e8babc5b94acd939af68 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3015ca9407d14876b1b6e8babc5b94acd939af68 Author: Dimitry Andric (Thu 25 Dec 2025 20:13:48 GMT) Committer: Dimitry Andric (Fri 2 Jan 2026 20:49:46 GMT) sh: avoid warnings about too-long initializer strings Mark `optletter` and `t_op::op_text` as `__non_string`, to avoid warnings from clang 21 similar to: bin/sh/options.h:77:36: error: initializer-string for character array is too long, array size is 19 but initializer has size 20 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 77 | const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; | ^~~~~~~~~~~~~~~~~~~~~ bin/test/test.c:153:3: error: initializer-string for character array is too long, array size is 2 but initializer has size 3 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 153 | {"==", STREQ}, | ^~~~ MFC after: 3 days Reviewed by: jilles Differential Revision: https://reviews.freebsd.org/D54362 (cherry picked from commit e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802) M bin/sh/options.h M bin/test/test.c ____________________________________________________________________________________________________________ Commit: d3a575622839c1998354dab202f0ca53216e41a8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d3a575622839c1998354dab202f0ca53216e41a8 Author: Dimitry Andric (Wed 24 Dec 2025 15:52:48 GMT) Committer: Dimitry Andric (Fri 2 Jan 2026 20:49:35 GMT) OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases In commit cf1eaaf41cef I added the WITH_LLVM_LINK_STATIC_LIBRARIES src.conf(5) build knob, which also affects OptionalObsoleteFiles.inc. However, the checks were incorrect: when WITH_LLVM_LINK_STATIC_LIBRARIES is active, the OLD_LIBS libprivatellvm.so.19, libprivateclang.so.19 and libprivatelldb.so.19 should always be cleaned up. Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 160077a4d75186a979f28f0778259c66d8cac8be) M tools/build/mk/OptionalObsoleteFiles.inc ____________________________________________________________________________________________________________ Commit: 6acae3bbe3377aa59fe44c8646dfb778c034ca78 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6acae3bbe3377aa59fe44c8646dfb778c034ca78 Author: Dimitry Andric (Wed 18 Jun 2025 11:06:25 BST) Committer: Dimitry Andric (Fri 2 Jan 2026 20:48:56 GMT) src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, this also comes at the cost of some performance, since the dynamic libraries are quite large, and contain lots of long symbols (mangled C++ identifiers). Add a WITH_LLVM_LINK_STATIC_LIBRARIES build knob that can be used to go back to the previous behavior: libllvm, libclang and liblldb are built as internal static libraries, i.e. only available during buildworld, and fully linked into the various executables such as clang, lld, etc. PR: 287447 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287447 ) Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50956 (cherry picked from commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a) M lib/clang/libclang/Makefile M lib/clang/liblldb/Makefile M lib/clang/libllvm/Makefile M share/man/man5/src.conf.5 M share/mk/src.opts.mk M tools/build/mk/OptionalObsoleteFiles.inc A tools/build/options/WITH_LLVM_LINK_STATIC_LIBRARIES M usr.bin/clang/Makefile.inc M usr.bin/clang/clang.prog.mk M usr.bin/clang/lld/Makefile M usr.bin/clang/lldb-server/Makefile M usr.bin/clang/lldb/Makefile M usr.bin/clang/llvm.prog.mk ____________________________________________________________________________________________________________ Commit: 7a5dfa03dc6cb5bd0a161c7e2cc3d423cbd465ec URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7a5dfa03dc6cb5bd0a161c7e2cc3d423cbd465ec Author: Eugene Grosbein (Sun 28 Dec 2025 17:47:08 GMT) Committer: Eugene Grosbein (Fri 2 Jan 2026 19:34:57 GMT) MFC: ipfw.8: document how to delete nat configuration instance (cherry picked from commit e51047118cb1d15abe8077a5b47b8063fa364ad9) M sbin/ipfw/ipfw.8 ____________________________________________________________________________________________________________ Commit: 3f41c92c6b27c8e1110dec8d52d16bd3a16a9cb0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3f41c92c6b27c8e1110dec8d52d16bd3a16a9cb0 Author: Michael Osipov (Mon 29 Dec 2025 20:49:49 GMT) Committer: Michael Osipov (Thu 1 Jan 2026 12:38:18 GMT) linprocfs.5: Synchronize style and format with 15-STABLE This is a logical backport of 1d193b1808098328d3ad16b436a329b258935e0c including the changes happended after that. Reviewed by: fernape Differential Revision: https://reviews.freebsd.org/D54411 M share/man/man5/linprocfs.5 ____________________________________________________________________________________________________________ Commit: 8b4f1d73496cf433d165220f6546d9e05115af74 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8b4f1d73496cf433d165220f6546d9e05115af74 Author: Xin LI (Tue 23 Dec 2025 08:24:13 GMT) Committer: Xin LI (Tue 30 Dec 2025 02:21:15 GMT) MFV 762f11d98d5cd57ebbe85c36e9e86a557a91fe4e: xz 5.8.2. (cherry picked from commit ae12432049e7873ab3912643ae5d08297b8cbc49) M contrib/xz/ChangeLog M contrib/xz/THANKS M contrib/xz/doxygen/Doxyfile M contrib/xz/src/common/my_landlock.h M contrib/xz/src/common/mythread.h M contrib/xz/src/liblzma/api/lzma/base.h M contrib/xz/src/liblzma/api/lzma/container.h M contrib/xz/src/liblzma/api/lzma/version.h M contrib/xz/src/liblzma/check/crc32_arm64.h M contrib/xz/src/liblzma/check/crc32_fast.c M contrib/xz/src/liblzma/check/crc64_fast.c M contrib/xz/src/liblzma/check/crc_common.h M contrib/xz/src/liblzma/common/alone_decoder.c M contrib/xz/src/liblzma/common/filter_common.c M contrib/xz/src/liblzma/common/lzip_decoder.c M contrib/xz/src/liblzma/common/outqueue.h M contrib/xz/src/liblzma/common/stream_decoder_mt.c M contrib/xz/src/liblzma/common/vli_decoder.c M contrib/xz/src/liblzma/lzma/lzma_common.h M contrib/xz/src/liblzma/lzma/lzma_decoder.h M contrib/xz/src/liblzma/rangecoder/range_decoder.h M contrib/xz/src/liblzma/validate_map.sh M contrib/xz/src/xz/args.c M contrib/xz/src/xz/file_io.c M contrib/xz/src/xz/hardware.c M contrib/xz/src/xz/list.c M contrib/xz/src/xz/message.h M contrib/xz/src/xz/sandbox.c M contrib/xz/src/xz/signals.c M contrib/xz/src/xz/util.c M contrib/xz/src/xz/xz.1 M contrib/xz/src/xzdec/xzdec.c M lib/liblzma/config.h ____________________________________________________________________________________________________________ Commit: 68c94c3bc0decf90f7173587e370cffa473c58a3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=68c94c3bc0decf90f7173587e370cffa473c58a3 Author: Dimitry Andric (Mon 29 Dec 2025 23:48:21 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 23:48:21 GMT) Remove __deprecated definition from OpenZFS compiler.h Since it is now provided by . Direct commit to stable/13, since OpenZFS compiler.h has been substantially changed in newer branches. M sys/contrib/openzfs/include/os/freebsd/linux/compiler.h ____________________________________________________________________________________________________________ Commit: c7826c81fe43995910b58e01f948faaa41d82fa6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c7826c81fe43995910b58e01f948faaa41d82fa6 Author: John Baldwin (Fri 6 Dec 2024 22:26:27 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 23:46:49 GMT) cdefs: Add __deprecated1 which accepts a message as an argument This message will be included in any warning issued by the compiler for use of the deprecated function. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47701 (cherry picked from commit 6da04bcff9efedeae7d4046553002b9e3b2bc24f) M sys/sys/cdefs.h ____________________________________________________________________________________________________________ Commit: 9622eff37fbd62b2c5227c959973c565dbf774e6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9622eff37fbd62b2c5227c959973c565dbf774e6 Author: Warner Losh (Tue 15 Oct 2024 20:49:53 BST) Committer: Dimitry Andric (Mon 29 Dec 2025 23:46:49 GMT) cdefs: Add __deprecated Add __deprecated decorator. This is for a deprecated interface. copystr is tagged with this today in copy(9), but don't actually provide it or use it. copystr is a #define so adding it will have to wait. LinuxKPI was defining this away completely in compiler.h. Since this is shared between Linux KPI consumers and OpenZFS, if it's already defined, use the FreeBSD sys/cdefs.h version, otherwise define it away. For OpenZFS this will retain it, while for Linux KPI it will tend to drop it (I think always, but I didn't look at everything). Sponsored by: Netflix Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D46137 (cherry picked from commit 16672453f12586703f1c51d909bd1900691bf884) M sys/compat/linuxkpi/common/include/linux/compiler.h M sys/sys/cdefs.h ____________________________________________________________________________________________________________ Commit: cd2a65a60701d806e8ebbf97b6c77c880e0c9746 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cd2a65a60701d806e8ebbf97b6c77c880e0c9746 Author: Lexi Winter (Fri 2 Feb 2024 16:41:40 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 23:46:45 GMT) sys/cdefs.h: add __noexcept and __noexcept_if These macros provide the C++11 noexcept and noexcept(...) keywords if we're compiling in a C++11 environment. Otherwise, they expand to an empty string. This will be used to add the required noexcept specifier to several libc functions as required in C++11. MFC after: 2 weeks Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1085 (cherry picked from commit 02b0d4b688cc4deb14cb6e7534a2a4958e48b753) M sys/sys/cdefs.h ____________________________________________________________________________________________________________ Commit: 0487408a76c66b8bf7edddf1ec8025f60c6d0474 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0487408a76c66b8bf7edddf1ec8025f60c6d0474 Author: Michael Osipov (Fri 26 Dec 2025 12:12:03 GMT) Committer: Michael Osipov (Mon 29 Dec 2025 19:18:00 GMT) bhyve_config.5: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54370 (cherry picked from commit 66604463e737f4754ae6268171031ceefc226837) M usr.sbin/bhyve/bhyve_config.5 ____________________________________________________________________________________________________________ Commit: b4f84b19b4826e8af2b20af95c5f2b63a826f40d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b4f84b19b4826e8af2b20af95c5f2b63a826f40d Author: Michael Osipov (Fri 26 Dec 2025 13:40:37 GMT) Committer: Michael Osipov (Mon 29 Dec 2025 18:51:50 GMT) bhyve: Document that MAC address has to be unicast bhyve accepts any MAC address even foreign as long it is a unicast one. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54372 (cherry picked from commit e1bfd541c7cdee1e184cacb2ea3bbebb3a500dfb) M usr.sbin/bhyve/bhyve.8 M usr.sbin/bhyve/bhyve_config.5 ____________________________________________________________________________________________________________ Commit: d8c35dc1df476a6fe4666f6dbbb9d6c540eb2423 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d8c35dc1df476a6fe4666f6dbbb9d6c540eb2423 Author: Dimitry Andric (Fri 26 Dec 2025 14:31:43 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 12:23:01 GMT) sys/font.h: avoid warnings about too-long initializer strings Mark `font_header::fh_magic` as `__non_string`, to avoid a warning from clang 21 similar to: /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:763:15: error: initializer-string for character array is too long, array size is 8 but initializer has size 9 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 763 | .fh_magic = FONT_HEADER_MAGIC, | ^~~~~~~~~~~~~~~~~ /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/font.h:109:27: note: expanded from macro 'FONT_HEADER_MAGIC' 109 | #define FONT_HEADER_MAGIC "VFNT0002" | ^~~~~~~~~~ MFC after: 3 days (cherry picked from commit e2c93ed09f259ed049923bdaa9b697b3586e2f1a) M sys/sys/font.h ____________________________________________________________________________________________________________ Commit: 497aab21bd59ee2b0d02970079ab556b15914578 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=497aab21bd59ee2b0d02970079ab556b15914578 Author: Dimitry Andric (Fri 26 Dec 2025 13:27:08 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 12:21:20 GMT) bsnmpd: avoid warnings about too-long initializer strings Mark `UTC` as `__non_string`, to avoid a warning from clang 21 similar to: usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c:339:29: error: initializer-string for character array is too long, array size is 3 but initializer has size 4 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] --- all_subdir_usr.sbin --- 339 | static const char UTC[3] = "UTC"; | ^~~~~ MFC after: 3 days (cherry picked from commit 3054e22e4524df24908d7e9379681c1ccf829b93) M usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c ____________________________________________________________________________________________________________ Commit: 8a620bd7088075808103639338e35f730ac93f3b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8a620bd7088075808103639338e35f730ac93f3b Author: Dimitry Andric (Fri 26 Dec 2025 00:22:03 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 12:20:56 GMT) makefs: avoid warnings about too-long initializer strings Mark `direntry::deName` as `__non_string`, to avoid warnings from clang 21 similar to: usr.sbin/makefs/msdos/msdosfs_vnops.c:512:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 512 | { ". ", /* the . entry */ | ^~~~~~~~~~~~~ usr.sbin/makefs/msdos/msdosfs_vnops.c:522:4: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 522 | { ".. ", /* the .. entry */ | ^~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit ba0a11512237681fc621670023d56195cb8c82ad) M usr.sbin/makefs/msdos/direntry.h ____________________________________________________________________________________________________________ Commit: c765646beedb49441f6fa782cf90a305417758f8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c765646beedb49441f6fa782cf90a305417758f8 Author: Dimitry Andric (Fri 26 Dec 2025 00:30:25 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 12:20:37 GMT) m4: avoid warnings about too-long initializer strings Mark `digits` as `__non_string`, to avoid warnings from clang 21 similar to: usr.bin/m4/misc.c:123:27: error: initializer-string for character array is too long, array size is 36 but initializer has size 37 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 123 | static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit a3394b6a23fb66ccb7e588129d2465ef8ea26d30) M usr.bin/m4/misc.c ____________________________________________________________________________________________________________ Commit: 4cea8771f77330537c99da8d3db2bde315954759 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4cea8771f77330537c99da8d3db2bde315954759 Author: Eric Blake (Sat 24 May 2025 18:21:38 BST) Committer: Dimitry Andric (Mon 29 Dec 2025 12:20:29 GMT) m4: Fix OOB access displaying MIN_INT Previously displaying INT_MIN resulted in an out of bounds access to digits[-8]. In twos-complement -INT_MIN is still negative. PR: 287013 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287013 ) Reviewed by: emaste (cherry picked from commit ab4edcd552c967a400e85afc0fd3e6729fa9ee2c) M usr.bin/m4/misc.c ____________________________________________________________________________________________________________ Commit: 21708f480a10738f1930c312c500d9a2a25cb5b8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=21708f480a10738f1930c312c500d9a2a25cb5b8 Author: Dimitry Andric (Thu 25 Dec 2025 20:28:14 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 12:19:16 GMT) fsck_msdosfs: avoid warnings about too-long initializer strings Mark `dot_name` and `dotdot_name` as as `__non_string`, to avoid warnings from clang 21 similar to: sbin/fsck_msdosfs/dir.c:466:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 466 | static const u_char dot_name[11] = ". "; | ^~~~~~~~~~~~~ sbin/fsck_msdosfs/dir.c:467:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 467 | static const u_char dotdot_name[11] = ".. "; | ^~~~~~~~~~~~~ MFC after: 3 days (cherry picked from commit 98c3d868fb5a7da7356c58e8c51423975bbd078b) M sbin/fsck_msdosfs/dir.c ____________________________________________________________________________________________________________ Commit: b354a138c0cb672dc6540917f3fdada49bac4b2c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b354a138c0cb672dc6540917f3fdada49bac4b2c Author: Ayrton Munoz (Mon 29 Dec 2025 02:02:28 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 12:16:55 GMT) cross-build: Avoid adding to SYSINCS Summary: The sys/cdefs.h in src is incompatible with glibc's sys/cdefs.h so cross-building broke when the former was added to SYSINCS in 1c9ff80f06. This commit adds a guard around that to only do that when building on FreeBSD. This should fix github CI. Test Plan: Ran buildkernel using tools/build/make.py on linux in github CI and locally on FreeBSD to double check nothing broke. Reviewed by: dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54385 (cherry picked from commit b6672803a1cf10dd1c912fe6571a8d426b8868bd) M tools/build/Makefile ____________________________________________________________________________________________________________ Commit: 50c02805f6711b16a4315ed1bc736a372539604f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=50c02805f6711b16a4315ed1bc736a372539604f Author: Dimitry Andric (Fri 26 Dec 2025 15:26:13 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 12:16:49 GMT) tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it This is needed to let the legacy stage compile against newer versions of sys/font.h, which transitively includes sys/cdefs.h, and requires the new __nonstring macro from it. Fixes: e2c93ed09f25 MFC after: 3 days (cherry picked from commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) M tools/build/Makefile ____________________________________________________________________________________________________________ Commit: bb4de3d2cf88c2e407c2d0ffd9542377f7b0049c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bb4de3d2cf88c2e407c2d0ffd9542377f7b0049c Author: Alex Richardson (Tue 16 Dec 2025 18:03:44 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 11:58:35 GMT) cdefs.h: Introduce __nonstring attribute This attribute can be used to annotate char arrays that are not supposed to be terminated with a NUL char and is needed to silence clang's new -Wunterminated-string-initialization warning. The name matches linuxkpi. Reviewed by: emaste, jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52565 (cherry picked from commit 802c6d5d61d15494a54a386dc2ffbcfefc68c8ab) M sys/sys/cdefs.h M tools/build/cross-build/include/common/sys/cdefs.h ____________________________________________________________________________________________________________ Commit: 14ab9445f71454c21620f9a7f69352bea1349779 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=14ab9445f71454c21620f9a7f69352bea1349779 Author: Dimitry Andric (Fri 26 Dec 2025 13:37:47 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 02:11:58 GMT) pmcannotate: avoid accessing uninitialized local variables Initialize `tbfl` and `tofl` to NULL, and check whether they are non-NULL before calling remove(3) on them, to avoid warnings from clang 21 similar to: usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tbfl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:57:9: note: expanded from macro 'FATAL' 57 | remove(tbfl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:12: note: initialize the variable 'tbfl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL usr.sbin/pmcannotate/pmcannotate.c:746:3: error: variable 'tofl' is uninitialized when used here [-Werror,-Wuninitialized] 746 | FATAL(exec, "%s: Impossible to locate the binary file\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 747 | exec); | ~~~~~ usr.sbin/pmcannotate/pmcannotate.c:58:9: note: expanded from macro 'FATAL' 58 | remove(tofl); \ | ^~~~ usr.sbin/pmcannotate/pmcannotate.c:695:19: note: initialize the variable 'tofl' to silence this warning 695 | char *tbfl, *tofl, *tmpdir; | ^ | = NULL MFC after: 3 days (cherry picked from commit cd880010c49a5d4ec529f4204d4e88cd27727255) M usr.sbin/pmcannotate/pmcannotate.c ____________________________________________________________________________________________________________ Commit: 61383038bc7709d9262bfc2e9f65e3d6837650c1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=61383038bc7709d9262bfc2e9f65e3d6837650c1 Author: Dimitry Andric (Mon 22 Dec 2025 11:49:27 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 02:11:53 GMT) Remove debug crutch I accidentally left in Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 3b1126208f44a90c7dc04a87207e54b22d45893c) M lib/clang/libllvm/Makefile ____________________________________________________________________________________________________________ Commit: d56ebf78c5a4a6fdc1fd79666d9bdfa55326bbbf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d56ebf78c5a4a6fdc1fd79666d9bdfa55326bbbf Author: Dimitry Andric (Sun 21 Dec 2025 21:37:57 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 02:11:42 GMT) Reduce number of external symbols in libllvm, libclang and liblldb In commit 2e47f35be5dc libllvm, libclang and liblldb were converted into private shared libraries. This allowed clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. However, upstream builds the shared libraries using several visibility options, which reduces the number of external symbols, and makes the libraries a bit smaller. On my test machine: * libprivatellvm.so goes from 75643 to 34706 symbols (~54% reduction) * libprivateclang.so goes from 53250 to 33531 symbols (~37% reduction) * libprivatelldb.so goes from 27242 to 18798 symbols (~31% reduction) Note: to get the full benefit, a clean build is required. Incremental builds should still work, but I didn't want to force a full rebuild on everybody. MFC after: 1 week (cherry picked from commit cf1eaaf41cefe7e3aef45f6dab862191a3939ed8) M lib/clang/libllvm/Makefile M lib/clang/llvm.build.mk ____________________________________________________________________________________________________________ Commit: 1f5a55504f09ff4b236dc3d414d30e42b7826336 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1f5a55504f09ff4b236dc3d414d30e42b7826336 Author: Dimitry Andric (Thu 25 Dec 2025 18:02:27 GMT) Committer: Dimitry Andric (Mon 29 Dec 2025 02:07:14 GMT) cuse(3): annotate cuse_init() to suppress thread safety analysis This avoids warnings from clang 21, similar to: /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 111 | TAILQ_INIT(&h_cuse); | ^ /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] 112 | TAILQ_INIT(&h_cuse_entered); | ^ /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis] MFC after: 3 days (cherry picked from commit 5629b5cf79934e0b94ddbbd93b7756f74fe4050a) M lib/libcuse/cuse_lib.c ____________________________________________________________________________________________________________ Commit: 5ea3ad01e6f511ee573e993e89810c27a7cf4198 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5ea3ad01e6f511ee573e993e89810c27a7cf4198 Author: Jose Luis Duran (Fri 19 Dec 2025 20:14:35 GMT) Committer: Jose Luis Duran (Sat 27 Dec 2025 16:29:02 GMT) Import latest mtree from NetBSD Merge commit 'eb2ccba0c11b405ac613c3046997765317cc8b5c' PR: 192839 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192839 ) PR: 219467 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219467 ) MFC after: 1 week (cherry picked from commit f8cee1f2c2dfba6223385fd711cce9faeca76451) M contrib/mtree/compare.c M contrib/mtree/create.c M contrib/mtree/mtree.c M contrib/mtree/spec.c ____________________________________________________________________________________________________________ Commit: 9aca11b4b14abe47dbc605e0bb9ba2282047e7f2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9aca11b4b14abe47dbc605e0bb9ba2282047e7f2 Author: Michael Osipov (Sun 21 Dec 2025 16:41:41 GMT) Committer: Michael Osipov (Tue 23 Dec 2025 19:40:26 GMT) bhyve.8: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54332 (cherry picked from commit 5819f8b285fc55a75e5dea56ffe73b376525150c) M usr.sbin/bhyve/bhyve.8 ____________________________________________________________________________________________________________ Commit: 7eb5a5b111e90c374bec1166b16d52b367d3ec03 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7eb5a5b111e90c374bec1166b16d52b367d3ec03 Author: Paweł Krawczyk (Fri 10 May 2024 05:21:18 BST) Committer: Alexander Ziaee (Tue 23 Dec 2025 14:13:25 GMT) at cron file is now in /etc/cron.d PR: 243380 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=243380 ) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1106 (cherry picked from commit 783baf00128f6cf6fc08404eaad6a11b29d4025d) M libexec/atrun/atrun.man ____________________________________________________________________________________________________________ Commit: 2011380115d0d1a862dc3b09bd2043e218333731 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2011380115d0d1a862dc3b09bd2043e218333731 Author: Jose Luis Duran (Tue 9 Dec 2025 15:45:01 GMT) Committer: Jose Luis Duran (Sat 20 Dec 2025 01:08:49 GMT) mtree: tests: Import NetBSD's mtree test suite Manually import latest mtree test suite from NetBSD. MFC after: 1 week (cherry picked from commit 2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d) M contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh ____________________________________________________________________________________________________________ Commit: 23d971abe8f02b251bb1222bb0da97f1b0dc8180 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=23d971abe8f02b251bb1222bb0da97f1b0dc8180 Author: Jose Luis Duran (Tue 9 Dec 2025 13:18:23 GMT) Committer: Jose Luis Duran (Sat 20 Dec 2025 01:08:37 GMT) mtree: Fix typos Manually apply a typo fix. This change has already been submitted upstream as bin/59824. MFC after: 1 week (cherry picked from commit dab5daf54cc26aaf2679a2eda5f378461f279ec5) M contrib/mtree/compare.c M contrib/mtree/spec.c ____________________________________________________________________________________________________________ Commit: a3b349e439870eeb4f58c74b990f721d86a75e1d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a3b349e439870eeb4f58c74b990f721d86a75e1d Author: Jose Luis Duran (Sat 13 Dec 2025 14:28:16 GMT) Committer: Jose Luis Duran (Sat 20 Dec 2025 01:08:28 GMT) Import latest mtree from NetBSD Merge commit 'f600477feb4ae61a75f61949eb600caff4aeea8c' MFC after: 1 week Discussed with: brooks (cherry picked from commit 49b6dda4d71175ad615718401573be5fd024822b) M contrib/mtree/compare.c M contrib/mtree/crc.c M contrib/mtree/create.c M contrib/mtree/extern.h M contrib/mtree/misc.c M contrib/mtree/mtree.8 M contrib/mtree/mtree.c M contrib/mtree/spec.c M contrib/mtree/specspec.c M contrib/mtree/verify.c ____________________________________________________________________________________________________________ Commit: 0c37e6e295fb980b52b0fb865f4e01823759e8e8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0c37e6e295fb980b52b0fb865f4e01823759e8e8 Author: Dag-Erling Smørgrav (Tue 16 Dec 2025 16:11:24 GMT) Committer: Dag-Erling Smørgrav (Fri 19 Dec 2025 18:07:05 GMT) ipfilter: Prevent stack buffer overflow When copying ipfs data from user space, don't just check that the payload length is nonzero, but also that it does not exceed the size of the stack buffer we're copying it into. While we're at it, use a union to create a buffer of the exact size we need instead of guessing that 2048 will be enough (and not too much). Finally, check the size of the payload once it gets to where it's used. MFC after: 3 days Reported by: Ilja Van Sprundel Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D54194 (cherry picked from commit a34c50fbd2a52bb63acde82e5aec4cb57880e39b) M sbin/ipf/libipf/interror.c M sys/netpfil/ipfilter/netinet/ip_sync.c ____________________________________________________________________________________________________________ Commit: 307cbd494b593dd3fa6828d2cceb5dc2fc06a517 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=307cbd494b593dd3fa6828d2cceb5dc2fc06a517 Author: Dag-Erling Smørgrav (Sun 14 Dec 2025 13:16:22 GMT) Committer: Dag-Erling Smørgrav (Fri 19 Dec 2025 18:07:05 GMT) proc: Fix proc_init / proc_dtor ordering issues * Move the initialization of p_ktr into proc_init() and make the check in proc_dtor() unconditional. Prior to this, it was possible to fail and invoke proc_dtor() after the first thread had been created (which was the condition for checking p_ktr in proc_dtor()) but before p_ktr had been initialized. * Move the p_klist initialization in fork1() past the last possible failure point so we don't have to free it on failure. We didn't, which meant we were leaking a knlist every time we failed to fork due to hitting the resource limit. PR: 291470 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291470 ) MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54215 (cherry picked from commit 026d962ef14dafe19fa73361bea6dcc95f141dfa) M sys/kern/kern_fork.c M sys/kern/kern_proc.c ____________________________________________________________________________________________________________ Commit: b063e9c13a916cea96596de5c32cd0206aaf1c08 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b063e9c13a916cea96596de5c32cd0206aaf1c08 Author: Dag-Erling Smørgrav (Sun 14 Dec 2025 13:16:16 GMT) Committer: Dag-Erling Smørgrav (Fri 19 Dec 2025 18:07:04 GMT) vfs: Let prison_enforce_statfs zero the fsid Currently, we unconditionally zero the fsid before returning a struct statfs to a jailed process. Move this into prison_enforce_statfs() so it only happens if enforce_statfs is greater than 1, or enforce_statfs is 1 but the mountpoint is outside the jail. PR: 291301 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291301 ) MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54214 (cherry picked from commit d4f25d0c7957f0f1960028eec82625c2d6405537) M sys/kern/kern_jail.c M sys/kern/vfs_syscalls.c ____________________________________________________________________________________________________________ Commit: 33bc1fb48e32bba89535d6814850a9e98e2658d5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=33bc1fb48e32bba89535d6814850a9e98e2658d5 Author: John Baldwin (Wed 10 Dec 2025 15:30:31 GMT) Committer: John Baldwin (Fri 19 Dec 2025 16:55:36 GMT) netlink: Don't overwrite existing data in a linear buffer in snl_writer First, a bit of background on some of the data structures netlink uses to manage data associated with a netlink connection. - struct linear_buffer contains a single virtually-contiguous buffer of bytes. Regions of this buffer are suballocated via lb_allocz() which uses a simple "bump" where the buffer is split into an allocated region at the start and a free region at the end. Each allocation "bumps" the boundary (lb->offset) forward by the allocation size. Individual allocations are not freed. Instead, the entire buffer is freed once all of the allocations are no longer in use. Linear buffers also contain an embedded link to permit chaining buffers together. - snl_state contains various state for a netlink connection including a chain of linear buffers. This chain of linear buffers can contain allocations for netlink messages as well as other ancillary data buffers such as socket address structures. The chain of linear buffers are freed once the connection is torn down. - snl_writer is used to construct a message written on a netlink connection. It contains a single virtually-contiguous buffer (nw->base) allocated from the associated snl_state's linear buffer chain. The buffer distinguishes between the amount of space reserved from the underlying allocator (nw->size) and the current message length actually written (nw->offset). As new chunks of data (e.g. netlink attributes) are added to the write buffer, the buffer is grown by snl_realloc_msg_buffer by reallocating a larger buffer from the associated snl_state and copying over the current message data to the new buffer. Commit 0c511bafdd5b309505c13c8dc7c6816686d1e103 aimed to fix two bugs in snl_realloc_msg_buffer. The first bug is that snl_realloc_msg_buffer originally failed to update nw->size after growing the buffer which could result in spurious re-allocations when growing in the future. It also probably could eventually lead to overflowing the buffer since each reallocation request was just adding the new bytes needed for a chunk to the original 'nw->size' while 'nw->offset' kept growing. Eventually the new 'nw->offset' would be larger than 'nw->size + sz' causing routines like snl_reserve_msg_data_raw() to return an out-of-bounds pointer. The second change in this commit I think was trying to fix the buffer overflows due to 'nw->size' being wrong, but instead introduced a new set of bugs. The second change ignored the returned pointer from snl_allocz() and instead assumed it could use all of the currently-allocated data in the current linear buffer. This is only ok if the only data in the linear buffer chain for the associated snl_state is the snl_writer's message buffer. If there is any other data allocated from the snl_state, it could be earlier in the current linear buffer, so resetting new_base to nw->ss->lb->base can result in overwriting that other data. The second change was also over-allocating storage from the underlying chain of linear buffers (e.g. a writer allocation of 256 followed by 512 would end up using the first 512 bytes, but 768 bytes would be reserved in the underlying linear buffer). To fix, revert the second change keeping only the fix for 'nw->size' being wrong. Reviewed by: igoro, markj Fixes: 0c511bafdd5b ("netlink: fix snl_writer and linear_buffer re-allocation logic") Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54148 (cherry picked from commit 255af72c8059b0117db646f82efa2e4848fa7570) M sys/netlink/netlink_snl.h ____________________________________________________________________________________________________________ Commit: 5ea68e7ea78ee12466f3667f4bf0de9eb82e9a86 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5ea68e7ea78ee12466f3667f4bf0de9eb82e9a86 Author: Cy Schubert (Fri 19 Dec 2025 02:37:43 GMT) Committer: Cy Schubert (Fri 19 Dec 2025 02:37:43 GMT) Revert "ipfilter: Add missing kenv fetch" The commit depends on d9788eabffa4b67fc534685fc3d9b8e3334af196 which has not been merged yet. This reverts commit fb20aad3e846bf42d98f9e84d5035e4d16115f95. M sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c ____________________________________________________________________________________________________________ Commit: fb20aad3e846bf42d98f9e84d5035e4d16115f95 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fb20aad3e846bf42d98f9e84d5035e4d16115f95 Author: Cy Schubert (Mon 15 Dec 2025 16:21:56 GMT) Committer: Cy Schubert (Fri 19 Dec 2025 00:26:56 GMT) ipfilter: Add missing kenv fetch When a module the environment must be explicitly fetched. Fixes: d9788eabffa4 PR: 291548 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291548 ) Noted by: markj Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54242 (cherry picked from commit a6ea80bc917510b5e056cc5a29b62dfd7b39d068) M sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c ____________________________________________________________________________________________________________ Commit: 4fef5819cca9c54bb6d45520ac125c97979b845a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4fef5819cca9c54bb6d45520ac125c97979b845a Author: Mark Johnston (Mon 15 Dec 2025 20:50:08 GMT) Committer: Mark Johnston (Tue 16 Dec 2025 23:44:05 GMT) rtsold: Validate entries in domain search lists Reported by: Kevin Day Approved by: so Security: FreeBSD-SA-25:12.rtsold Security: CVE-2025-14558 (cherry picked from commit bf804f69dd94b3c98962618b4ad3b48a35bff2ff) M usr.sbin/rtsold/rtsol.c ____________________________________________________________________________________________________________ Commit: c93d9e082b4e3d3fb367a1fd56cf447bccae2e93 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c93d9e082b4e3d3fb367a1fd56cf447bccae2e93 Author: Eugene Grosbein (Tue 9 Dec 2025 14:47:26 GMT) Committer: Eugene Grosbein (Tue 16 Dec 2025 16:09:30 GMT) trim.8: minor update for manual page Further explain that trim(8) is not for trimming free blocks in populated file systems/ZFS pools, as people still take it wrong sometimes. (cherry picked from commit dbc4a1c69191909a7210cad6da46b755557d0d34) (cherry picked from commit b2f8d46d898fb50222aefca47d687a852c647b2f) M usr.sbin/trim/trim.8 ____________________________________________________________________________________________________________ Commit: f1b50f2cb0dbaf4c036fb8123b075ad8329559e4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f1b50f2cb0dbaf4c036fb8123b075ad8329559e4 Author: Mark Peek (Mon 1 Dec 2025 20:50:24 GMT) Committer: Mark Peek (Mon 15 Dec 2025 22:50:10 GMT) ctfmerge: fix segfault when building on macOS The barrier code was using semaphores which have been deprecated in macOS and not working at all, causing a race condition. Since macOS does not have pthread_barrier_*(), this change uses a condition variable instead. PR: 290958 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290958 ) Reported by: wosch Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D54018 (cherry picked from commit 732b4aa05d78ca6831d02e67a43f34ad104f4f01) M cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c M cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h ____________________________________________________________________________________________________________ Commit: daedb9122a1812d0e9c9baef01afbe115a4edfcc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=daedb9122a1812d0e9c9baef01afbe115a4edfcc Author: Ed Maste (Tue 25 Nov 2025 18:40:35 GMT) Committer: Ed Maste (Mon 15 Dec 2025 18:39:11 GMT) agp: Export intel_gtt_read_pte, required by i915kms This isn't used by modern cards, but is needed for i915kms to load on a system that has agp as a module not compiled into the kernel. PR: 291214 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291214 ) Reviewed by: cy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53906 (cherry picked from commit a87c1e2dd8fc997d6ee603c252c543afe8a4d2a4) (cherry picked from commit 8befd2d2b6a0c5d54fa53246a89ae09009007799) (cherry picked from commit ae1f6fd47c4584d1abe5ecf26f291d282e6f6a67) M sys/modules/agp/Makefile ____________________________________________________________________________________________________________ Commit: 79fc0a5b50361042849766c7ef8fb0766c7f4e83 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=79fc0a5b50361042849766c7ef8fb0766c7f4e83 Author: Jessica Clarke (Mon 15 Dec 2025 18:16:54 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 18:16:54 GMT) mips: Include CCLDFLAGS when linking kernel.tramp.bin This ensures we pick up -fuse-ld/--ld-path for external toolchains rather than trying to use the default system linker, which may not exist (e.g. on macOS). This is a direct commit to stable/13 as mips no longer exists in main. M sys/conf/Makefile.mips ____________________________________________________________________________________________________________ Commit: eb955433b1e791cf0088018aa3f9df048ea2ecdb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eb955433b1e791cf0088018aa3f9df048ea2ecdb Author: Jessica Clarke (Mon 15 Dec 2025 18:10:19 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 18:10:19 GMT) mips: Drop unused TRAMP_LDFLAGS This has always been empty since e8dce5b9b3a5 ("Complete the integration of tbemd branch into head."). This is a direct commit to stable/13 as mips no longer exists in main. M sys/conf/Makefile.mips ____________________________________________________________________________________________________________ Commit: 056563a1580f9614d7eba4c7e2855787f4d50664 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=056563a1580f9614d7eba4c7e2855787f4d50664 Author: Konstantin Belousov (Thu 10 Jul 2025 22:02:37 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:37 GMT) cross-build: fix after the recent sqlite3 import Stop adding contrib/sqlite3 into the include path for usr.bin/kyua, take headers from the install sysroot env. sqilte3 now has the VERSION file, which clashes with c++ include . Submitted by: jrtc27 (see https://reviews.freebsd.org/D51217) Tested by: kib Fixes: 17f0f75308f2 ("sqlite3: Vendor import of sqlite3 3.50.2") (cherry picked from commit 09d28419c646650a77721e168ef43bc1bac96b67) M usr.bin/kyua/Makefile ____________________________________________________________________________________________________________ Commit: 4aa306667080dc2dc77ecbb146eccb081f9e63b2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4aa306667080dc2dc77ecbb146eccb081f9e63b2 Author: John Baldwin (Mon 28 Apr 2025 18:10:41 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:37 GMT) cross-build: Workaround system-provided strchrnul on macOS 15.4+ macOS added a native strchrnul in 15.4. There is not an easy way to detect it at compile time, so use a macro to rename our local inline version to avoid conflicts while also forcing its use during bootstrap. The local version can be removed once macOS versions older than 15.4 are no longer supported as build hosts. Co-authored by: jrtc27 Reported by: kib Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D49893 (cherry picked from commit 4e2616b74cb7eed921aa10fb776cdc2d5fd4e42f) M tools/build/cross-build/include/mac/string.h ____________________________________________________________________________________________________________ Commit: 3e264f4d35863f9888f3779c64bf027e52fc9bc0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3e264f4d35863f9888f3779c64bf027e52fc9bc0 Author: Jessica Clarke (Mon 8 Dec 2025 13:01:57 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:37 GMT) imgact_elf: Fix off-by-one in note size check Prior to c86af2cc4cd1 ("imgact_elf: Check note body sizes"), this was note_name + n_namesz >= note_end, which checks that there is at least one byte after the unpadded name (which could be either padding or data), and given our notes always have data with them this was fine. However, once we started checking the padded name (note that "FreeBSD\0" is already a multiple of 4 bytes, so has no padding) and data, this turned into checking that there is at least one byte after the unpadded data, and since our ELF notes already have a multiple of 4 bytes for their data and therefore have no padding, this means that we are now checking that there is at least one byte after the ELF note, which is not going to be the case for the last ELF note. Instead, switch this to a strict greater than, as should be used when comparing one-past-the-end pointers, which both sides of the inequality are. For executables, this was generally not a problem in reality, since the last of our ELF notes is NT_FREEBSD_NOINIT_TAG, which isn't read by the kernel. However, ld-elf.so.1 (and libcompat variants), like shared libraries, only has NT_FREEBSD_ABI_TAG, which meant the kernel did not see this ELF note when directly executing it (e.g. as done by ldd), and on RISC-V this is the only branding present, so doing so would fail with ENOEXEC. This does also mean on non-RISC-V direct exec ld-elf.so.1 runs with the wrong p_osrel, but given it sets kern.proc.osrel.PID to the executable's NT_FREEBSD_ABI_TAG that it loads, this probably doesn't matter in practice. PR: 291446 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291446 ) Reported by: bdragon Tested by: bdragon Fixes: c86af2cc4cd1 ("imgact_elf: Check note body sizes") MFC after: 3 days (cherry picked from commit 5d58198ccc2b562098ee5fc4898013622b32b065) M sys/kern/imgact_elf.c ____________________________________________________________________________________________________________ Commit: 577b231f3ae6b4b94711cd8be7e8c79158216f07 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=577b231f3ae6b4b94711cd8be7e8c79158216f07 Author: Jessica Clarke (Sat 6 Dec 2025 00:33:20 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:37 GMT) freebsd-update: Mention upgrading packages, not just ports These days most end users are likely using pre-built packages, not locally-built ports. Thus be sure to mention this as an important case, and put it ahead of ports. Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42968 (cherry picked from commit ced74610217ff0be071e4614c64a4ff66c40bc6b) M usr.sbin/freebsd-update/freebsd-update.sh ____________________________________________________________________________________________________________ Commit: 29e74434e4d0c9b11ef5cbf5c7bafa32bfcddfc5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=29e74434e4d0c9b11ef5cbf5c7bafa32bfcddfc5 Author: Jessica Clarke (Fri 22 Aug 2025 21:46:16 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:37 GMT) bsd.compat.mk: Honour XSTRIPBIN for lib32 Currently we only honour XNM and XOBJCOPY, but XSTRIPBIN is important during install. Otherwise we end up using STRIPBIN for the host, not the target, which is normally the same, but may not be, especially on non-FreeBSD systems. In particular, cheribuild will build FreeBSD with STRIPBIN=/usr/bin/strip XSTRIPBIN=strip (with the latter referring to the bootstrap strip in PATH), which breaks for WITH_LIB32 when the host's /usr/bin/strip is unable to process the lib32 binaries (e.g. building arm64 FreeBSD's lib32 on an amd64 GNU/Linux system). MFC after: 1 week (cherry picked from commit ad13dc1ece2fe4a6192bceffea4a868ba6a2e0e2) M share/mk/bsd.compat.mk ____________________________________________________________________________________________________________ Commit: dc6d1c831d74af01b97fc7fe751bc6717500d172 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dc6d1c831d74af01b97fc7fe751bc6717500d172 Author: Jessica Clarke (Fri 11 Jul 2025 02:07:04 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:37 GMT) rtld-elf: Delete unused RELOC_ALIGNED_P copies This was copied from arm to aarch64 to riscv, but only arm uses it. MFC after: 1 week (cherry picked from commit 02d06043ba88f931f9debd5aa519fc303ca70d11) M libexec/rtld-elf/aarch64/reloc.c M libexec/rtld-elf/riscv/reloc.c ____________________________________________________________________________________________________________ Commit: cb891745397b08f91951d2017f093bb811ef708a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cb891745397b08f91951d2017f093bb811ef708a Author: Jessica Clarke (Thu 10 Jul 2025 23:58:07 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:37 GMT) sys: Various whitespace style(9) fixes for sys/elf_common.h MFC after: 1 week (cherry picked from commit 22ae840b9f0ff290cb08edacf975a99d264d3a0d) M sys/sys/elf_common.h ____________________________________________________________________________________________________________ Commit: 7a41a7442ae4e7efb6aaf03f02ea4ee56a5695f6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7a41a7442ae4e7efb6aaf03f02ea4ee56a5695f6 Author: Jessica Clarke (Thu 10 Jul 2025 23:58:06 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:37 GMT) sys: Sync RISC-V relocations MFC after: 1 week (cherry picked from commit 65bd6c7acd1fba38ce0b234d5d777a2ebad7e807) M sys/sys/elf_common.h ____________________________________________________________________________________________________________ Commit: 275e5537486c60254f83217cc3b13cf23e41b0a6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=275e5537486c60254f83217cc3b13cf23e41b0a6 Author: Jessica Clarke (Tue 20 Jul 2021 06:13:43 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:37 GMT) elf: Remove R_RISCV_[GT]PREL_[IS] relocation defines These were internal binutils relocations that have no way to be generated in assembly nor will ever be seen in the output, and so should never have been defined in the psABI in the first place. They have therefore been removed from the spec as of [1], so do so here too. [1] https://github.com/riscv/riscv-elf-psabi-doc/commit/44f98e0fd8104def00f2a5a8d94b23dd647d18fb (cherry picked from commit f221000127767d33ea06d3a00e731c0164f9a70f) M sys/sys/elf_common.h ____________________________________________________________________________________________________________ Commit: 205f65bcdd91de9bd6d1cfdf0626430897633d8a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=205f65bcdd91de9bd6d1cfdf0626430897633d8a Author: Jessica Clarke (Thu 10 Jul 2025 23:58:06 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) sys: Delete stale comments in sys/elf_common.h Originally the relocations for RISC-V were partitioned into dynamic and static (with those that are both being classed as dynamic), but they were packed next to each other, and so as new relocations were added they were allocated sequentially, at the end of the static block, even if really dynamic, R_RISCV_IRELATIVE being the first such case (and only one we currently have a definition for). Delete the misleading comments. Fixes: 4b88ccbc79cc ("Sync relocation definitions") MFC after: 1 week (cherry picked from commit d26f481bcdfec9354614ccc0f7f694bd7bcc5a6c) M sys/sys/elf_common.h ____________________________________________________________________________________________________________ Commit: ec80f8a3ada0d35f364ca0136cb8518f98750ce8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ec80f8a3ada0d35f364ca0136cb8518f98750ce8 Author: Jessica Clarke (Thu 10 Jul 2025 20:36:08 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) share: Delete bitrotted make_*_driver.sh scripts These scripts have not seen the necessary changes to keep them up to date with current KPIs and coding practices. They use I/O ports directly rather than any bus abstractions, use i386 (which is on the way out for kernel configs) as the architecture of choice for generated kernel configs, use ISA KPIs, use INTR_TYPE_FAST (renamed in 2000 to INTR_FAST and removed in 2011), and likely have other issues too that render them more harm than good for the uninitiated developer looking for a driver template. If anyone wants to invest time in modernising them they can do so and bring them back, but for now delete them. Reviewed by: cperciva, imp, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50468 (cherry picked from commit 8f0a6a9aadb1fe4ce87345c6d2fbb2d2b6f6cedf) M ObsoleteFiles.inc M share/examples/Makefile D share/examples/drivers/README D share/examples/drivers/make_pseudo_driver.sh M tools/build/mk/OptionalObsoleteFiles.inc ____________________________________________________________________________________________________________ Commit: 749af7d9d89f45057357c8f10cf836007e13c3ba URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=749af7d9d89f45057357c8f10cf836007e13c3ba Author: Jessica Clarke (Wed 28 May 2025 21:24:52 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) Revert "rtld: fix allocate_module_tls() variant I fallback to static allocation" This was applying a NetBSD fix to FreeBSD. However, the original code was correct for FreeBSD. NetBSD's obj->tlsoffset is relative to the end of the TCB, not the TCB itself, whilst ours is relative to the TCB[1] itself. For example, our allocate_tls uses (char *)tcb + obj->tlsoffset for the memcpy and memset calls. Without this reverted, for dynamically loaded shared objects, Initial Exec accesses to TLS variables on variant I architectures (non-x86) use the correct address, whilst General Dynamic and dlsym(3) use the incorrect address (TLS_TCB_SIZE past the start). Note that, on arm64, LLVM only supports TLSDESC (including LLD) and TLSDESC will use the static resolver if the variable ends up allocated to the static TLS block, even in the presence of dlopen(3), so only dlsym(3) shows the discrepancy there. Whilst here, add a comment to explain this difference to try and avoid the same mistake being made in future. [1] In the case of variant II, it's the amount to subtract, so still positive This reverts commit e9a38ed2fa61fd264a80f24ceb35f39b0ac6463d. Reviewed by: kib (prior version) Fixes: e9a38ed2fa61 ("rtld: fix allocate_module_tls() variant I fallback to static allocation") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50565 (cherry picked from commit ccfb1c50e45dbb7fcadf7e1932f63cf1702ef13a) M libexec/rtld-elf/rtld.c ____________________________________________________________________________________________________________ Commit: c668cd775b2964ca17e14be032c40f1a4ed77c45 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c668cd775b2964ca17e14be032c40f1a4ed77c45 Author: Jessica Clarke (Wed 28 May 2025 21:23:10 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) libc/riscv: Fix initial exec TLS mode for dynamically loaded shared objects The offset here is relative to the TCB, not whatever the thread pointer points to, so as with powerpc and powerpc64 we need to account for that. However, rather than using hard-coded offsets as they did, due to predating machine/tls.h, we can just re-use _tcb_get(). Note that if libthr is used, and its initialiser has been called, it will take a different path that uses _get_static_tls_base, which works just fine on riscv (adding the offset to thr->tcb). This only affects programs that aren't linked against libthr (or that are but manage to dlopen before the initialiser is called, if that's even possible). In future this code should be made MI by just reusing _tcb_get() and checking the TLS variant (since the offset here is positive even for variant II, where it should be subtracted), but this is a targeted fix that makes it clear what's changing. Reviewed by: kib Fixes: 5d00c5a6571c ("Fix initial exec TLS mode for dynamically loaded shared objects.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50564 (cherry picked from commit 0e3dbc64d9f6c95cbb16dba60a32136ae116dada) M lib/libc/riscv/static_tls.h ____________________________________________________________________________________________________________ Commit: a85ba2eca4d6f7a958e3d4b139723e5116e0a623 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a85ba2eca4d6f7a958e3d4b139723e5116e0a623 Author: Jessica Clarke (Wed 28 May 2025 21:22:15 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) rtld-elf/riscv: Don't allocate static TLS for dynamic TLS relocations Provided you don't run out of extra static TLS space this should work, but it's wholly unnecessary and not how things are supposed to be done. Only static TLS relocations should allocate static TLS. Reviewed by: kib Fixes: 4b1859c0e943 ("Add support for RISC-V architecture.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50563 (cherry picked from commit 03801d449a3731cb643a51625c8c4d5d07b2e54c) M libexec/rtld-elf/riscv/reloc.c ____________________________________________________________________________________________________________ Commit: 6216ed808d1b0ec1921f49b5bba454f38d152a0c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6216ed808d1b0ec1921f49b5bba454f38d152a0c Author: Jessica Clarke (Tue 6 May 2025 23:14:51 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) rtld-elf: Fix executable's TLS module index for direct exec For direct exec mode we reuse map_object, but tls_max_index is initialised to 1. As a result, the executable ends up being assigned module 2 (and the generation is pointlessly incremented, unlike in digest_phdr for the normal case). For most architectures this is harmless, since TLS linker relaxation will optimise General Dynamic accesses to Initial Exec or Local Exec for executables, but on RISC-V this relaxation does not exist, yet the linker will initialise the tls_index in the GOT with module 1, and at run time the call to __tls_get_addr will fail with: ld-elf.so.1: Can't find module with TLS index 1 Fix this by making map_object use 1 for obj->tlsindex when it's loading the main executable, and don't bother to increment tls_dtv_generation either, matching digest_phdr (though that one is harmless). (Note this also applies to MIPS on stable/13) Reviewed by: kib Fixes: 0fc65b0ab82c ("Make ld-elf.so.1 directly executable.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50186 (cherry picked from commit a08d92def20a41243d4afc97cf4a2124be5386b9) M libexec/rtld-elf/map_object.c M libexec/rtld-elf/rtld.c M libexec/rtld-elf/rtld.h ____________________________________________________________________________________________________________ Commit: cb48c371f2770a33c7934bb0dc098fee76e28711 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cb48c371f2770a33c7934bb0dc098fee76e28711 Author: Jessica Clarke (Tue 6 May 2025 23:14:51 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) rtld-elf: Fix UB for direct exec with no extra rtld arguments If no extra rtld arguments are provided, rtld_argc will be 1 (for argv[0] and so we are shifting the entire memory range down by a single pointer. However, unlike argv and envp, auxp's entries are two pointers in size, not one, and so in this case the source and destination overlap, meaning simple assignment is UB (C99 6.5.16.1p3). On many architectures this ends up being harmless as the compiler will emit double machine word loads and stores, or if it splits them it may still schedule them such that it works in this case, but our RISC-V baseline does not include such instructions and LLVM ends up picking a schedule that copies the second word before the first word, thereby replacing the first word with a copy of the second word. This results in direct exec mode segfaulting on RISC-V when given no arguments. Fix this by using a temporary in the source and let the compiler safely elide its use. Reviewed by: kib Fixes: 0fc65b0ab82c ("Make ld-elf.so.1 directly executable.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50185 (cherry picked from commit 2b04ba6e08b983d8756552286846059507bca7a3) M libexec/rtld-elf/rtld.c ____________________________________________________________________________________________________________ Commit: c9793e87025e0495bad680e0a1ad6fc174c508c6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c9793e87025e0495bad680e0a1ad6fc174c508c6 Author: Jessica Clarke (Tue 6 May 2025 23:14:51 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) rtld-elf: Fix dl_iterate_phdr's dlpi_tls_data for PowerPC and RISC-V The implementation of dl_iterate_phdr abuses tls_get_addr_slow to get to the start of the TLS block, inlining the implementation of __tls_get_addr as if the tls_index's ti_offset were 0 (historically it called __tls_get_addr itself but changed due to locking issues). For most architectures, tls_index's ti_offset (relocated by DTPOFF/DTPREL for GOT entries) is just the offset within that module's TLS block. However, for PowerPC and RISC-V, which have a non-zero TLS_DTV_OFFSET and thus are designed assuming DTV entries are biased by that value, ti_offset normally has TLS_DTV_OFFSET pre-subtracted, but it's __tls_get_addr's responsibility to compensate for that. By using an offset of zero here, tls_get_addr_slow will return a pointer to the start of the TLS block itself, so by adding TLS_DTV_OFFSET we will point TLS_DTV_OFFSET past the module's TLS block. Fix this by removing the extra bias (the alternative would be to pass -TLS_DTV_OFFSET and keep the addition, which would more closely follow what __tls_get_addr does, but this is more direct). (Note this also applies to MIPS on stable/13) Reviewed by: kib Fixes: d36d68161517 ("rtld dl_iterate_phdr(): dlpi_tls_data is wrong") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50184 (cherry picked from commit c02aaba1b4549c1c3b1481f7c935f6cc80b98e8d) M libexec/rtld-elf/rtld.c ____________________________________________________________________________________________________________ Commit: d5e9943bec698945a68539911c27dc88ccf37a4b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d5e9943bec698945a68539911c27dc88ccf37a4b Author: Jessica Clarke (Tue 6 May 2025 23:14:51 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) rtld-elf: Fix dlsym(3) for TLS symbols on PowerPC and RISC-V The implementation here is meant to mirror what a GOT entry for the given symbol would use for ti_offset. However, on PowerPC and RISC-V, TLS_DTV_OFFSET is non-zero, and so the GOT entries are normally biased by this, but we fail to do so here. As a result we end up getting a pointer TLS_DTV_OFFSET past where the variable actually is. (Note this also applies to MIPS on stable/13) Reviewed by: kib Fixes: 5ceeeba90c6c ("Import DragonFly BSD commit") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50183 (cherry picked from commit 8ad9cec3a2cc643020a286ee68f70eb01225fbdd) M libexec/rtld-elf/rtld.c ____________________________________________________________________________________________________________ Commit: 03d5ae50dc7f2c12427c937d374a679901eaf9dc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=03d5ae50dc7f2c12427c937d374a679901eaf9dc Author: Jessica Clarke (Tue 6 May 2025 23:14:50 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) libc: Fix dl_iterate_phdr's dlpi_tls_data for PowerPC and RISC-V The implementation of dl_iterate_phdr for statically-linked binaries abuses __tls_get_addr to get to the start of the TLS block. For most architectures, tls_index's ti_offset (relocated by DTPOFF/DTPREL for GOT entries) is just the offset within that module's TLS block. However, for PowerPC and RISC-V, which have a non-zero TLS_DTV_OFFSET and thus are designed assuming DTV entries are biased by that value, ti_offset normally has TLS_DTV_OFFSET pre-subtracted. By using an offset of zero here we end up getting a pointer TLS_DTV_OFFSET past what __tls_get_addr would return for the first TLS variable. Fix this by using -TLS_DTV_OFFSET to mirror what the General Dynamic GOT entry for the first TLS variable would be. (Note this also applies to MIPS on stable/13) Reviewed by: kib Fixes: dbd2053026a6 ("libc dl_iterate_phdr(): dlpi_tls_data is wrong") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50182 (cherry picked from commit 78b99f369f75f5df49b506ae750659b07ab34362) M lib/libc/gen/dlfcn.c ____________________________________________________________________________________________________________ Commit: 915a65a92a9f01f31d0af8b492eba0b781ba0999 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=915a65a92a9f01f31d0af8b492eba0b781ba0999 Author: Jessica Clarke (Tue 6 May 2025 23:14:50 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) libc: Don't bias DTV entries by TLS_DTV_OFFSET PowerPC and RISC-V have a non-zero TLS_DTV_OFFSET. The intent behind this in the design is that DTV entries are biased by this, as are (in the other direction) the DTPOFF/DTPREL entries in the GOT. However, this is pretty pointless in practice, and both FreeBSD and glibc's run-time linkers don't bother to bias DTV entries, instead just adding the bias back on at the end in __tls_get_addr. In libc we also have a minimal implementation of this for statically-linked binaries, which is only in practice used for code compiled with -fPIC (not -fPIE) that is also linked without TLS relaxation support. PowerPC supports linker relaxation for TLS sequences, so this likely never gets hit there, but RISC-V does not, and so easily does if you compile an executable with -fPIC. In this implementation we add TLS_DTV_OFFSET both to the DTV entries in __libc_allocate_tls and to the result of __tls_get_addr, meaning that any TLS accesses using the General Dynamic model in static binaries on RISC-V end up off by 0x800. Historically this also did not matter as __tls_get_addr was a stub that always returned NULL, so although 6e16d0bc4376 ("Rework alignment handling in __libc_allocate_tls() for Variant I of TLS layout.") added this DTV implementation, nothing actually read the entries. However, now it's a real implementation, and dl_iterate_phdr also now relies on it, it does matter. Fix this by not biasing the DTV entries, just like RTLD. We could instead stop adding TLS_DTV_OFFSET in __tls_get_addr, but being consistent between libc and RTLD seems better. (Note this also applies to MIPS on stable/13) Reviewed by: kib Fixes: ca46b5698e8a ("libc: implement __tls_get_addr() for static binaries") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50181 (cherry picked from commit d04c93a2adccb4c3a17f7391126a9246326e3fea) M lib/libc/gen/tls.c ____________________________________________________________________________________________________________ Commit: 7adf09f6307b7f2b645b9be108e0ebddc20be558 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7adf09f6307b7f2b645b9be108e0ebddc20be558 Author: Jessica Clarke (Tue 4 Feb 2025 17:28:42 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) riscv: Fix and generalise saving TP (PCPU pointer) whilst in userspace In cpu_fork, we allocate sizeof(struct pcb) + sizeof(struct trapframe) space on the stack, then round it for stack alignment. This not only fails to include the space needed for TP but also doesn't round up the trapframe allocation to be stack-aligned, yet TF_SIZE does, as is the expectation of fork_trampoline and cpu_exception_handler. Given that sizeof(struct pcb) + sizeof(struct trapframe) is a multiple of 16, this causes the saved TP to be stored in the PCB's pcb_sp (the intended trapframe padding aliasing pcb_ra), which is probably harmless in practice as the PCB isn't expected to be current, but definitely not intended. In cpu_thread_alloc, we do include the 8 bytes for TP and then stack align that. This again fails to include the padding for trapframe as present in TF_SIZE, but sizeof(struct pcb) + sizeof(struct trapframe) happens to be a multiple of 16, as above, so adding 8 then rounding to stack alignment (16) includes an extra 8 bytes of padding, giving the right result for the wrong reason (and could be broken by future struct growth). Extract the calculation into a shared function that rounds correctly regardless of the struct layouts. Also introduce a new struct kernframe to encapsulate and clearly document this shared state rather than using magic constants, and also enable it to be easily extended in future, as we intend to do downstream in CheriBSD. Reviewed by: jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48799 (cherry picked from commit 21c534b9f5d5de07137f9a42e016876dd6ae66c1) M sys/riscv/include/frame.h M sys/riscv/riscv/exception.S M sys/riscv/riscv/genassym.c M sys/riscv/riscv/swtch.S M sys/riscv/riscv/vm_machdep.c ____________________________________________________________________________________________________________ Commit: 017ebaa60a8377ec10cb300cfcc6a4ab91b4e27a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=017ebaa60a8377ec10cb300cfcc6a4ab91b4e27a Author: Jessica Clarke (Tue 17 Dec 2024 20:51:56 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) ofw: Fix inverted bcmp in ofw_bus_node_status_okay Otherwise this matches any two-character status except for ok. Fixes: e5e94d2de987 ("Expand OpenFirmware API with ofw_bus_node_status_okay method") MFC after: 1 week (cherry picked from commit e1060f6dfd80b34cab6d439bf7420ad686ddc8f1) M sys/dev/ofw/ofw_bus_subr.c ____________________________________________________________________________________________________________ Commit: d00f1d6858a0caca5c52f819da8381a6be11e3a9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d00f1d6858a0caca5c52f819da8381a6be11e3a9 Author: Jessica Clarke (Mon 9 Dec 2024 21:55:06 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) gic_v3: Correctly handle GICC GIGR Base Address case When using the GICR Base Address field from each GICC structure instead of GICR structures, the field gives the address of a single redistributor page. However, that does not mean that they are not contiguous, and so GICR_TYPER.Last could be clear on them. Thus we must ignore GICR_TYPER.Last in this case and always treat each region as having a single page. Normally we'd do that as a result of checking against the rman's size (though that's a rather roundabout and iffy way of achieving it), but for whatever reason this is bigger on the Qualcomm Snapdragon X Elite (I assume the MADT reports GICv4 but TYPER doesn't report VLPIS and so there is a mismatch between the rman size and the stride used) and we end up walking off the region's mapping. Reviewed by: andrew, phk MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47560 (cherry picked from commit f8c90b704189c94275d22d7cc204d1d74e821d86) M sys/arm64/arm64/gic_v3.c M sys/arm64/arm64/gic_v3_acpi.c M sys/arm64/arm64/gic_v3_var.h ____________________________________________________________________________________________________________ Commit: 7d8ea3c846f03150322720480381566b93134642 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7d8ea3c846f03150322720480381566b93134642 Author: David Gilbert (Thu 21 Nov 2024 20:23:16 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:36 GMT) hexdump.3: Add missing LIBRARY section All the other libutil section 3 manpages document this, and although it's heavily implied by the libutil.h header in the synopsis, we should still be explicit and consistent. PR: 280078 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280078 ) Reviewed by: jrtc27 MFC after: 1 week (cherry picked from commit 169e23d41f8ff16244f4fb04924fdc9828325dce) M lib/libutil/hexdump.3 ____________________________________________________________________________________________________________ Commit: ae54b3ca7831ca0bbfe40b9824e1b80163be94e3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ae54b3ca7831ca0bbfe40b9824e1b80163be94e3 Author: Jessica Clarke (Wed 20 Nov 2024 20:09:28 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) sys/cdefs.h: Add comments to make #if/#else/#endif triple more obvious This block has a lot of nesting, not helped by two adjacent nested blocks involving _POSIX_C_SOURCE, with only the inner one commented, looking like it's the end of the outer one. Comment the outer one as well so it's not quite so hard to figure out. MFC after: 1 week (cherry picked from commit 7a3af393d8ac2dfe72d24fe401344b60c4f87866) M sys/sys/cdefs.h ____________________________________________________________________________________________________________ Commit: 3d292b9ee8cf4efc35c07f69bb9aae41a3f36ef8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3d292b9ee8cf4efc35c07f69bb9aae41a3f36ef8 Author: Jessica Clarke (Sat 19 Oct 2024 00:48:52 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) libc/csu: Unify INIT_RELOCS across architectures Some architectures don't need any arguments, whilst others need auxargs, which they get by passing in env thanks to INIT_RELOCS referencing the local variable in __libc_start1(_gcrt) by name. This is unnecessarily confusing, fragile (one has to look at INIT_IRELOCS's definition to see that it uses env) and duplicates code between architectures. Instead, implement it more like rtld-elf. Each architecture provides an ifunc_init that takes the auxargs directly, and those that don't need it can just ignore it. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47188 (cherry picked from commit 9684658e35ab033c79e0519e3681d9a194976b71) M lib/libc/csu/aarch64/Makefile.inc M lib/libc/csu/aarch64/reloc.c M lib/libc/csu/amd64/Makefile.inc M lib/libc/csu/amd64/reloc.c M lib/libc/csu/arm/Makefile.inc M lib/libc/csu/i386/Makefile.inc M lib/libc/csu/i386/reloc.c M lib/libc/csu/libc_start1.c M lib/libc/csu/mips/Makefile.inc M lib/libc/csu/powerpc/Makefile.inc M lib/libc/csu/powerpc64/Makefile.inc M lib/libc/csu/powerpc64/reloc.c M lib/libc/csu/powerpcspe/Makefile.inc M lib/libc/csu/riscv/Makefile.inc M lib/libc/csu/riscv/reloc.c ____________________________________________________________________________________________________________ Commit: 1b03e7f80e164a02ebe9a96a3b7fd59f77cda830 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1b03e7f80e164a02ebe9a96a3b7fd59f77cda830 Author: Jessica Clarke (Fri 18 Oct 2024 21:39:37 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) tools/build/cross-build: Don't include sys/uio.h from linux limits.h This creates a circular dependency for OpenZFS's libspl in sys/uio.h, and it shouldn't be needed since the system limits.h already defines IOV_MAX, so delete it, and unconditionally assert that to be the case. Otherwise the re-include of libspl's sys/uio.h tries to use PAGESIZE before it has been defined by OpenZFS's own sys/param.h. Fixes: 7a7741af18d6 ("zfs: merge openzfs/zfs@b10992582") MFC after: 1 week (cherry picked from commit 0bdf2535d4f8a571cb6d230f2f19eb20a452a4f8) M tools/build/cross-build/include/linux/limits.h ____________________________________________________________________________________________________________ Commit: 271d0a3119d5d219ecbc2fa9f7850e7597b5f744 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=271d0a3119d5d219ecbc2fa9f7850e7597b5f744 Author: Jessica Clarke (Fri 18 Oct 2024 19:15:30 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) depend-cleanup.sh: Clean up after riscv static binary IFUNC addition reloc.c is conditionally included by libc_start1.c so existing builds don't feature it in the .depend file and won't know they need to rebuild libc_start1.c. MFC after: 1 week (cherry picked from commit d41a40f484826e90ed78dce5f006712b0eeaf501) M tools/build/depend-cleanup.sh ____________________________________________________________________________________________________________ Commit: 3abb712c23087cec2b64fcd78d5e3c8ff4cdae63 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3abb712c23087cec2b64fcd78d5e3c8ff4cdae63 Author: Jessica Clarke (Fri 18 Oct 2024 19:14:58 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) libc/csu: Support IFUNCs on riscv When adding support to rtld-elf I neglected the fact that static binaries can have IFUNCs. Add support for this too. Fixes: 729d2b16b74f ("rtld-elf: Support IFUNCs on riscv") MFC after: 1 week (cherry picked from commit 1363acbf25de4c36e183cfa0b0e801d4dd9bf2ad) M lib/libc/csu/riscv/Makefile.inc A lib/libc/csu/riscv/reloc.c ____________________________________________________________________________________________________________ Commit: fc195afbb4cbbd0f5624717ae66787c64ef1f9a4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fc195afbb4cbbd0f5624717ae66787c64ef1f9a4 Author: Jessica Clarke (Fri 18 Oct 2024 13:59:48 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) lib/clang: Commit cleaned-up workaround for building on RISC-V There is a long-standing issue on RISC-V around --gc-sections when statically linking, which affects the bootstrap build of LLVM. Since fixing this properly has remained a TODO for years, commit the workaround with documentation so that building natively from source works out of the box. PR: 258358 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258358 ) MFC after: 1 week (cherry picked from commit 7aa6667623bef7306009d50a571e5e8c7766a174) M lib/clang/llvm.build.mk ____________________________________________________________________________________________________________ Commit: db284e1732ef9a08438552ac8586c59e0ba42ac0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=db284e1732ef9a08438552ac8586c59e0ba42ac0 Author: Jessica Clarke (Wed 11 Sep 2024 18:01:06 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) Merge commit 88433e640ddb from upstream OpenZFS (by Jessica Clarke) sys/types32.h: Remove struct timeval32 from libspl's header (#16491) macOS Sequoia's sys/sockio.h, as included by various bootstrap tools whilst building FreeBSD, has started to include net/if.h, which then includes sys/_types/_timeval32.h and provide a conflicting definition for struct timeval32. Since this type is entirely unused within OpenZFS, simply delete the type rather than adding in some kind of OS detection. This fixes building FreeBSD on macOS Sequoia (Beta). Signed-off-by: Jessica Clarke Reviewed-by: Rob Norris Reviewed-by: Alexander Motin Reviewed-by: Tony Hutter MFC after: 1 week (cherry picked from commit 796c6031cde6dfdd92b4d178792fc0534bf788c5) M sys/contrib/openzfs/lib/libspl/include/sys/types32.h ____________________________________________________________________________________________________________ Commit: 9c9f4654e4dbfda9921055f32e2e225f1bf1743e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9c9f4654e4dbfda9921055f32e2e225f1bf1743e Author: Jessica Clarke (Tue 10 Sep 2024 18:56:22 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) kldxref: Don't warn and skip file if no relocations are found This case is hit for the kernel itself on riscv64, and did not used to be checked. Since the code here can already handle missing Elf_Rel and/or Elf_Rela just delete the check. Reviewed by: jhb, imp Fixes: 0299afdff145 ("kldxref: Make use of libelf to be a portable cross tool") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46517 (cherry picked from commit 05996f453de2f2c7a03437a492d9d53831fccb2e) M usr.sbin/kldxref/ef.c ____________________________________________________________________________________________________________ Commit: 19b23effacafe1313cce83a1f03151e905b6c9b8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=19b23effacafe1313cce83a1f03151e905b6c9b8 Author: Jessica Clarke (Mon 2 Sep 2024 23:21:18 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) gpart: Add u-boot-env alias for U-Boot's environment GPT partition UUID This is a platform-independent UUID, and this is the name U-Boot uses. MFC after: 1 week (cherry picked from commit b162fc3f3094c50c8ed47ab50981c5448cf0052c) M lib/geom/part/gpart.8 M sys/geom/part/g_part.c M sys/geom/part/g_part.h M sys/geom/part/g_part_gpt.c M sys/sys/disk/gpt.h ____________________________________________________________________________________________________________ Commit: 09e84ec73eef29838aa5aa44c3a716a88490a621 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=09e84ec73eef29838aa5aa44c3a716a88490a621 Author: Jessica Clarke (Thu 22 Aug 2024 20:36:45 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) riscv: Add machine/ifunc.h corresponding to rtld-elf's resolver interface Reviewed by: kib, mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D46279 (cherry picked from commit 8afae0caf4c4816eb56b732fcd1a4b185e86098a) A sys/riscv/include/ifunc.h ____________________________________________________________________________________________________________ Commit: 8ccd9c23e64ca07b22375610e89bf686dad6e46c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8ccd9c23e64ca07b22375610e89bf686dad6e46c Author: Jessica Clarke (Thu 22 Aug 2024 20:36:44 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) rtld-elf: Support IFUNCs on riscv GNU/Linux has historically had the following two resolver prototypes: 1. Elf_Addr(uint64_t, void *) 2. Elf_Addr(uint64_t, void *, void *) For the former, AT_HWCAP is passed in the first argument, and NULL in the second. For the latter, AT_HWCAP is still passed, and the second argument is a pointer to their home-grown __riscv_hwprobe function. Should they want to use the third argument in future, they'll have to introduce yet another prototype to allow for later expansion, and then all users will have to check whether the second argument is NULL to know if the third argument really exists. This is all rather silly and will surely prove fun in the face of type-checking CFI. Instead, be like arm64 and just define all 8 possible general purpose register arguments up front. To naive source code that forgets non-Linux OSes exist this will be compatible with prototype 1 above, since the second argument will be 0 and it won't look further (though should we start using the second argument for something that wouldn't be true any more and it might think it's __riscv_hwprobe, but that incompatibility is one we can defer committing to, and can choose to never adopt). Until the standard interface for querying extension information[1] is settled and implemented in FreeBSD there's not much you can do in a resolver other than use HWCAP_ISA_B, but this gets the infrastructure in place for when that day comes. [1] https://github.com/riscv-non-isa/riscv-c-api-doc/pull/74 Reviewed by: kib, mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D46278 (cherry picked from commit 729d2b16b74fa5207a12aa1de190bd930432810e) M libexec/rtld-elf/riscv/reloc.c M libexec/rtld-elf/riscv/rtld_machdep.h ____________________________________________________________________________________________________________ Commit: aaf455cfdc5f24f827fd381664a535846791f5db URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=aaf455cfdc5f24f827fd381664a535846791f5db Author: Jessica Clarke (Thu 22 Aug 2024 20:36:44 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) riscv: Recognise B extension for AT_HWCAP This was ratified earlier this year as an alias for Zba_Zbb_Zbs. Whilst we don't currently export multi-letter extensions, we can still export this alias in AT_HWCAP. Reviewed by: mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D46277 (cherry picked from commit 228a3e73e16983bc7f985b24ef20909500792d3c) M sys/riscv/include/elf.h M sys/riscv/riscv/identcpu.c ____________________________________________________________________________________________________________ Commit: 91104d97ef248f9122dd5a7ae02daf540e695039 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=91104d97ef248f9122dd5a7ae02daf540e695039 Author: Jessica Clarke (Thu 22 Aug 2024 20:36:44 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) rtld-elf: Pass parsed aux_info to ifunc_init Currently we pass the raw pointer to the on-stack auxargs. This can legitimately have fewer than AT_COUNT entries, so the use of __min_size(AT_COUNT), i.e. static AT_COUNT, is inaccurate, and also needlessly forces the callee to iterate over the elements to find the entry for a given type. Instead we can just pass aux_info like we use for everything else. Note that the argument has been left unused by every callee since its introduction in 4352999e0e6c ("Pass CPUID[1] %edx (cpu_feature), %ecx (cpu_feature2) and CPUID[7].%ebx (cpu_stdext_feature), %ecx (cpu_stdext_feature2) to the ifunc resolvers on x86.") Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D46276 (cherry picked from commit 33658afd4e4d11cd71d92e52ca9da5381cdd829b) M libexec/rtld-elf/aarch64/reloc.c M libexec/rtld-elf/amd64/reloc.c M libexec/rtld-elf/arm/reloc.c M libexec/rtld-elf/i386/reloc.c M libexec/rtld-elf/mips/reloc.c M libexec/rtld-elf/powerpc/reloc.c M libexec/rtld-elf/powerpc64/reloc.c M libexec/rtld-elf/riscv/reloc.c M libexec/rtld-elf/rtld.c M libexec/rtld-elf/rtld.h ____________________________________________________________________________________________________________ Commit: d3fc73b79c6c590d10678986c47aa44e94989da9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d3fc73b79c6c590d10678986c47aa44e94989da9 Author: Jessica Clarke (Tue 11 Jun 2024 17:43:18 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) mx25l.4: Document the correct disk device path This was true at time of commit, but the path was changed 2 weeks later to just be the /dev/flash/spiN name, without updating the manpage. Reported by: David Gilbert Fixes: 68dd77957786 ("Give the mx25l device sole ownership of the name /dev/flash/spi* ...") MFC after: 1 week (cherry picked from commit 703768a23590d8faf65b0f16dd395248ff7273f6) M share/man/man4/mx25l.4 ____________________________________________________________________________________________________________ Commit: e41762d412d7d06a85db031de100cd0b2a5c0c02 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e41762d412d7d06a85db031de100cd0b2a5c0c02 Author: Dapeng Gao (Mon 3 Jun 2024 20:30:36 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:35 GMT) Fix off-by-one bug in btpand `ul` reaches `__arraycount(services)` before the bound-check happens, causing undefined behaviour. Reviewed by: imp, jrtc27 Fixes: 7718ced0ea98 ("Add btpand(8) daemon from NetBSD.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45463 (cherry picked from commit fbfdf57d65bedfab28f9debc8a4a8d6802f9338a) M usr.sbin/bluetooth/btpand/btpand.c ____________________________________________________________________________________________________________ Commit: 8aaae40a354a831b0c2ac13f34dbf0f99faa8b8b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8aaae40a354a831b0c2ac13f34dbf0f99faa8b8b Author: Jessica Clarke (Sun 2 Jun 2024 23:53:09 BST) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:34 GMT) ee: Fix use of uninitialised pointer in ispell_op This used to be name = mktemp followed by fd = open downstream, replacing upstream's crude PID-based sprintf, but in 1.4.7 this was changed upstream to this buggy code, which we then picked up in the 1.5.0 import. Presumably nobody's actually used ee's ispell function in the past 15 years; that or it's just ended up using junk file names as temporary files if name's happened to be a valid address to something that can be interpreted as a string. Reported by: Dapeng Gao Fixes: 96b676e99984 ("Update ee(1) in the base system to version 1.5.0.") MFC after: 1 week (cherry picked from commit 25a33bfe9ce2b55812201f475e9d3e64009b40dc) M contrib/ee/ee.c ____________________________________________________________________________________________________________ Commit: c4f666e81c6e7c4b726d7c5ff34a95e652848914 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c4f666e81c6e7c4b726d7c5ff34a95e652848914 Author: Jessica Clarke (Fri 23 Feb 2024 02:36:21 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:34 GMT) efibootmgr: Simplify make_next_boot_var_name and fix cnt == 0 case If cnt == 0 we access element 0 unconditionally, which is out of bounds, and then if that doesn't crash and happens to be 0 we will access element - 1, also out of bounds, and then if that doesn't crash will add 1 to whatever junk is there and use that for the variable. On CHERI, though, this does crash. This code is also overly complicated, with unnecessary special cases and tracking more state than needed. Rewrite it in a more general manner that doesn't need those special cases and naturally works for cnt == 0. Found by: CHERI Reviewed by: imp Fixes: 1285bcc833a3 ("Import Netflix's efibootmgr to help manage UEFI boot variables") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44029 (cherry picked from commit 09cb8031b43c8e98abb5ff9b43ff649031d1e808) M usr.sbin/efibootmgr/efibootmgr.c ____________________________________________________________________________________________________________ Commit: 8a29ebd6eac87c340d1abf4b0f37a2c5e3ec8b60 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8a29ebd6eac87c340d1abf4b0f37a2c5e3ec8b60 Author: Jessica Clarke (Sat 3 Feb 2024 01:52:53 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:34 GMT) bsdinstall: Drop Error from title in netconfig no interfaces dialog This isn't inherently an error. It is if you're attempting to download dist tarballs or later install packages, but a FreeBSD system with no NIC is a reasonable setup to have, especially in a throwaway VM setting, so we shouldn't say it is one. Leaving the exit code as 1 is still fine, since auto will ignore it, and avoids breaking other uses. MFC after: 1 week (cherry picked from commit 7414d14bd51d8378057bbe952c2715b9f32d1d3e) M usr.sbin/bsdinstall/scripts/netconfig ____________________________________________________________________________________________________________ Commit: 919db8472a3e88e7da79c522de1f0a16c4c28c7a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=919db8472a3e88e7da79c522de1f0a16c4c28c7a Author: Jessica Clarke (Sat 3 Feb 2024 01:52:37 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:34 GMT) bsdinstall: Fix netconfig script when no interfaces are present The script uses [ -z "$INTERFACES" ] to check if the list of interfaces is empty and will exit early if so, but INTERFACES always contains at least a space due to the way it appends the list of wireless devices. Fix this by only adding the space when there are devices to append, mirroring the behaviour for non-wireless devices above (both will result in a redundant leading space when the list is non-empty, but that one is harmless). Fixes: 159ca5c844cd ("Adapt to new wireless scheme where base wlan interfaces do not show up in ifconfig anymore.") MFC after: 1 week (cherry picked from commit b809c7d6a26924ac351e49a15011da718cc3feec) M usr.sbin/bsdinstall/scripts/netconfig ____________________________________________________________________________________________________________ Commit: ede1087a40152d764a5067a550dfecea0133a530 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ede1087a40152d764a5067a550dfecea0133a530 Author: Jessica Clarke (Fri 2 Feb 2024 21:17:23 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:34 GMT) bsd.subdir.mk: Drop broken optimisation for realinstall parallelisation Not all of the tree is happy for realinstall to be done in parallel. In particular, Makefile.inc1 uses .WAIT to force etc to be installed after earlier subdirectories, since etc calls into share/man's makedb to run makewhatis on the tree and needs all manpages to have been installed. Also, libexec/Makefile doesn't set SUBDIR_PARALLEL, and the link from ld-elf32.1 to ld-elf.1 relies on rtld-elf having been installed before rtld-elf32, otherwise creating the link will fail. In general, core behavioural differences like this between NO_ROOT and "normal" builds are also dangerous and confusing. If this optimisation is deemed important, it should be reintroduced in a more limited and robust manner that doesn't break the above situations. Until then value correctness over slight efficiency gains on high core count machines, the same machines where you're more likely to encounter issues from this optimisation. This reverts commits cd19ecdbdc87 ("Similar to r296013 for NO_ROOT, force SUBDIR_PARALLEL for buildworld WORLDTMP staging.") and b9c6f3168112 ("Add more STANDALONE_SUBDIR_TARGETS."). Found by: CheriBSD Jenkins Reviewed by: bdrewery, brooks Fixes: cd19ecdbdc87 ("Similar to r296013 for NO_ROOT, force SUBDIR_PARALLEL for buildworld WORLDTMP staging.") Fixes: b9c6f3168112 ("Add more STANDALONE_SUBDIR_TARGETS.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43705 (cherry picked from commit fbae308319b7678cd9d879f60b1efd8d4c99b5eb) M share/mk/bsd.subdir.mk ____________________________________________________________________________________________________________ Commit: 8a95bcc10b23b13e8b14bacba4a0cfb310a2aa88 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8a95bcc10b23b13e8b14bacba4a0cfb310a2aa88 Author: Jessica Clarke (Tue 30 Jan 2024 20:33:30 GMT) Committer: Jessica Clarke (Mon 15 Dec 2025 17:56:34 GMT) riscv: Remove the unused riscv64_cpu driver This is a repeat of 63bf2d735ca3 ("Remove the unused arm64_cpu driver.") for RISC-V, which copied the defunct code from arm64 with no changes beyond substituting riscv64 for arm64, and made no use of it elsewhere. It has thus always been entirely superfluous. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43672 (cherry picked from commit 722b40377198e384a808f9561ae7262767068ab2) M sys/riscv/riscv/mp_machdep.c ____________________________________________________________________________________________________________ Commit: faf64970ac80caa5293ee58fe8614aa68d4c9b8e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=faf64970ac80caa5293ee58fe8614aa68d4c9b8e Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Tue 15 Jul 2025 00:09:24 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Mon 15 Dec 2025 17:26:14 GMT) vfs_cache: Fix the SDT definition of vfs:fplookup:lookup:done 1. The definition lists struct nameidata as the type of the first argument. However, the actual probes always pass a variable of type struct nameidata* to SDT_PROBE3. 2. The third argument (args[2]) is actually enum cache_fpl_status. Reviewed by: markj Approved by: markj (mentor) Fixes: 07d2145a1717 vfs: add the infrastructure for lockless lookup MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51315 (cherry picked from commit 6567623f831daaffa67777d17780e8f424c1bb01) M sys/kern/vfs_cache.c ____________________________________________________________________________________________________________ Commit: 8ddb5aff83c275866e505afaea8ebdc87bad7f57 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8ddb5aff83c275866e505afaea8ebdc87bad7f57 Author: Mark Johnston (Fri 17 Oct 2025 13:55:17 BST) Committer: Mark Johnston (Mon 15 Dec 2025 16:00:56 GMT) netmap: Fix error handling in nm_os_extmem_create() We bump the object reference count prior to mapping it into the kernel map, at which point the vm_map_entry owns the reference. Then, if vm_map_wire() fails, vm_map_remove() will release the reference, so we should avoid decrementing it in the error path. Reported by: Ilja van Sprundel Reviewed by: vmaffione MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53066 (cherry picked from commit dfc1041c08ba32f24b8050b4d635a0bbbfd9b767) M sys/dev/netmap/netmap_freebsd.c ____________________________________________________________________________________________________________ Commit: c7edaaf43fe894f4915e05dc11295c0ad4d31a3f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c7edaaf43fe894f4915e05dc11295c0ad4d31a3f Author: Philip Paeps (Thu 11 Dec 2025 06:55:42 GMT) Committer: Philip Paeps (Sun 14 Dec 2025 08:30:23 GMT) contrib/tzdata: import tzdata 2025c Changes: https://github.com/eggert/tz/blob/2025c/NEWS (cherry picked from commit a86dc94b84d177da8f00d1c9420ef0860576e4c4) M contrib/tzdata/CONTRIBUTING M contrib/tzdata/Makefile M contrib/tzdata/NEWS M contrib/tzdata/README M contrib/tzdata/SECURITY M contrib/tzdata/africa M contrib/tzdata/antarctica M contrib/tzdata/asia M contrib/tzdata/australasia M contrib/tzdata/backzone M contrib/tzdata/calendars M contrib/tzdata/checknow.awk M contrib/tzdata/europe M contrib/tzdata/leap-seconds.list M contrib/tzdata/leapseconds M contrib/tzdata/leapseconds.awk M contrib/tzdata/northamerica M contrib/tzdata/southamerica M contrib/tzdata/theory.html M contrib/tzdata/version M contrib/tzdata/zone1970.tab M contrib/tzdata/zonenow.tab ____________________________________________________________________________________________________________ Commit: 13ffee9940082f1a6c134f3b3d40e464bf9fb3b3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=13ffee9940082f1a6c134f3b3d40e464bf9fb3b3 Author: Dag-Erling Smørgrav (Fri 5 Dec 2025 14:57:44 GMT) Committer: Dag-Erling Smørgrav (Fri 12 Dec 2025 18:53:02 GMT) fsync: Open files in non-blocking mode This avoids blocking forever when invoked on a fifo. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54084 (cherry picked from commit 69e041521a80a0b8950f6ec25269a9c3949d6590) M usr.bin/fsync/fsync.c ____________________________________________________________________________________________________________ Commit: b09c986c63abee739356005e26a480ea2d6d8782 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b09c986c63abee739356005e26a480ea2d6d8782 Author: Dag-Erling Smørgrav (Fri 5 Dec 2025 14:57:37 GMT) Committer: Dag-Erling Smørgrav (Fri 12 Dec 2025 18:53:02 GMT) bus: Return 0 if reading an ivar fails In the non-INVARIANTS case, return 0 rather than stack garbage if reading an ivar fails (in the INVARIANTS case, we still panic). MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D54078 (cherry picked from commit 4c2295c15860e70c8bd3f05f9229d2fc40dfd50d) M sys/sys/bus.h ____________________________________________________________________________________________________________ Commit: 7b4482f3834a93142f10a7dfe47b4456dbdf3660 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7b4482f3834a93142f10a7dfe47b4456dbdf3660 Author: Kristof Provost (Tue 25 Nov 2025 09:59:02 GMT) Committer: Kristof Provost (Thu 11 Dec 2025 09:22:15 GMT) pf: relax sctp v_tag verification pf was too strict when validating SCTP tags. When a server receives a retransmitted INIT it will reply with a random initiate tag every time. However, pf saves the first initiate tag and expects every subsequent INIT_ACK retransmission to have the same tag. This is not the case, leading to endless INIT/INIT_ACK cycles. Allow the tag to be updated as long as we've not gone past COOKIE_WAIT. Add a test case to verify this. MFC after: 2 weeks See also: https://redmine.pfsense.org/issues/16516 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit bc3b72ff48953551e0e8bd6e5a2c718ecd973285) M sys/netpfil/pf/pf.c M tests/sys/netpfil/pf/sctp.py ____________________________________________________________________________________________________________ Commit: d077ec7c0fa3d1fef03cbd63e1b70dae625b05b7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d077ec7c0fa3d1fef03cbd63e1b70dae625b05b7 Author: Cy Schubert (Tue 9 Dec 2025 23:42:07 GMT) Committer: Cy Schubert (Wed 10 Dec 2025 21:10:47 GMT) rc.d/ipfilter: ipfilter must be enabled for options to take ipfilter options are erased and reset to default when ipfilter is disabled. This results in nullifying options from rc.conf that were previously set. 8d6feaaaa26f, which added this code, was incorrect as it was for a bug in ipfilter 4.2.28 and no longer applies to ipfilter 5.1.2. Fixes: 8d6feaaaa26f (cherry picked from commit cc1e4aae5a67a20f3c0fff13612364e6e4404f93) M libexec/rc/rc.d/ipfilter ____________________________________________________________________________________________________________ Commit: 07b5eb3b6a5c7727ec66e50135fad5b9df5dd31d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=07b5eb3b6a5c7727ec66e50135fad5b9df5dd31d Author: Cy Schubert (Tue 9 Dec 2025 20:32:24 GMT) Committer: Cy Schubert (Wed 10 Dec 2025 21:10:47 GMT) rc.d/{ipfilter,ippool}: Fix typo in variable name (cherry picked from commit f04b23ce3547c238dcd52d4fa1a7d401ad38d1b1) M libexec/rc/rc.d/ipfilter M libexec/rc/rc.d/ippool ____________________________________________________________________________________________________________ Commit: 9b2551051fce2b56bcc8f4d03596205225d5832b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9b2551051fce2b56bcc8f4d03596205225d5832b Author: Kristof Provost (Mon 1 Dec 2025 21:30:56 GMT) Committer: Kristof Provost (Mon 8 Dec 2025 09:34:20 GMT) pfsync: fix incorrect unlock during destroy During pfsync_clone_destroy() we clean up pending packets. This may involve calling pfsync_undefer() or callout_drain(). We may not hold the bucket lock during callout_drain(), but must hold it during pfsync_undefer(). We incorrectly always released the lock, leading to assertion failures during cleanup if there were pending deferred packets. MFC after: 1 week Sponsored by: Orange Business Services (cherry picked from commit 639e65144aa71cb03b5431861803f528308760dc) M sys/netpfil/pf/if_pfsync.c ____________________________________________________________________________________________________________ Commit: ef8a5af2a3ec6ae1ade610ce0c33298eb6cd3bae URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ef8a5af2a3ec6ae1ade610ce0c33298eb6cd3bae Author: Dag-Erling Smørgrav (Wed 3 Dec 2025 10:09:31 GMT) Committer: Dag-Erling Smørgrav (Fri 5 Dec 2025 18:28:45 GMT) rtld-elf: Mark LD_SHOW_AUXV insecure This prevents dumping the memory layout of setugid processes. MFC after: 3 days Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54033 (cherry picked from commit 5242bcff202fa2a5a39895423c8d8c11c02ad76a) M libexec/rtld-elf/rtld.c ____________________________________________________________________________________________________________ Commit: 5b084744bb212e2783ffca8b8d332e40df9b6b02 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5b084744bb212e2783ffca8b8d332e40df9b6b02 Author: Cy Schubert (Tue 2 Dec 2025 15:22:26 GMT) Committer: Cy Schubert (Fri 5 Dec 2025 13:20:12 GMT) sqlite3: Update to 3.50.4 Release notes at https://www.sqlite.org/releaselog/3_50_4.html. Obtained from: https://www.sqlite.org/2025/sqlite-autoconf-3500400.tar.gz Merge commit 'e7e917ee3cf2b3010b1c511c6ebaf8b65b983ad7' (cherry picked from commit 07d5a9b1b2dd95d95137c6c2afcb84ad40c05b75) M contrib/sqlite3/VERSION M contrib/sqlite3/sqlite3.c M contrib/sqlite3/sqlite3.h M contrib/sqlite3/sqlite3.pc.in M contrib/sqlite3/sqlite3rc.h ____________________________________________________________________________________________________________ Commit: 02a810d9b4cc8b3cd30d7e6bfe01b5e3c68ee492 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=02a810d9b4cc8b3cd30d7e6bfe01b5e3c68ee492 Author: Jose Luis Duran (Wed 26 Nov 2025 20:34:56 GMT) Committer: Jose Luis Duran (Wed 3 Dec 2025 02:35:56 GMT) strfmon: Fix negative sign handling for C locale If the locale's positive_sign and negative_sign values would both be returned by localeconv() as empty strings, strfmon() shall behave as if the negative_sign value was the string "-". This occurs with the C locale. The implementation previously assigned "0" to sign_posn (parentheses around the entire string); now it assigns it to "1" (sign before the string) when it is undefined (CHAR_MAX). Austin Group Defect 1199[1] is applied, changing the requirements for the '+' and '(' flags. [1]: https://www.austingroupbugs.net/view.php?id=1199 Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53913 (cherry picked from commit cf85e7034ad5640b18a3b68d6b291b7bf89bfc80) M lib/libc/stdlib/strfmon.c M lib/libc/tests/stdlib/strfmon_test.c ____________________________________________________________________________________________________________ Commit: 6b0e99570fa208cc299c047591b7ded7b1b9a58d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6b0e99570fa208cc299c047591b7ded7b1b9a58d Author: Jose Luis Duran (Wed 26 Nov 2025 20:34:55 GMT) Committer: Jose Luis Duran (Wed 3 Dec 2025 02:35:42 GMT) strfmon: EINVAL if the '+' flag and both signs are empty According to the Open Group Base Specifications Issue 8[1], strfmon(3) should return EINVAL when the '+' flag was included in a conversion specification and the locale's positive_sign and negative_sign values would both be returned by localeconv(3) as empty strings. Austin Group Defect 1199[2] is applied, adding the [EINVAL] error. [1]: https://pubs.opengroup.org/onlinepubs/9799919799/functions/strfmon.html [2]: https://www.austingroupbugs.net/view.php?id=1199 Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53912 (cherry picked from commit 1fd018972a18b682521bb8f004dfd162327e5db2) M lib/libc/stdlib/strfmon.3 M lib/libc/stdlib/strfmon.c M lib/libc/tests/stdlib/strfmon_test.c ____________________________________________________________________________________________________________ Commit: 33189f868ab9d2c672413916b6510c856db3dd4c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=33189f868ab9d2c672413916b6510c856db3dd4c Author: Jose Luis Duran (Wed 26 Nov 2025 20:34:55 GMT) Committer: Jose Luis Duran (Wed 3 Dec 2025 02:35:23 GMT) strfmon: Add tests for Austin Group Defect 1199 Add tests for The Open Group Base Specifications Issue 8[1], Austin Group Defect 1199[2]. Items marked with XXX represent an invalid output. These items will be fixed in subsequent commits. Notice that an existing test is now considered invalid. Our locale definitions do not include int_p_sep_by_space nor int_n_sep_by_space[3]. Those will be addressed in a subsequent commit. However, the CLDR project defines them as "0", which causes the output to appear as "USD123.45". If our locale definitions were to set the international {n,p}_sep_by_space to "1", the output would display as the expected "USD 123.45". While here, use the SPDX license identifier and add my name to the file. [1]: https://pubs.opengroup.org/onlinepubs/9799919799/functions/strfmon.html [2]: https://www.austingroupbugs.net/view.php?id=1199 [3]: https://unicode-org.atlassian.net/browse/CLDR-237 Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53911 (cherry picked from commit 19e153004fb63c32eba0ef40249f5ede61a93170) M lib/libc/tests/stdlib/strfmon_test.c ____________________________________________________________________________________________________________ Commit: 6cccf4db1346d64dcd8b2247e8d597e220dadf02 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6cccf4db1346d64dcd8b2247e8d597e220dadf02 Author: Jose Luis Duran (Sun 23 Nov 2025 16:58:55 GMT) Committer: Jose Luis Duran (Wed 3 Dec 2025 02:35:07 GMT) strfmon: Fix typo s/poistion/position/ MFC after: 1 week (cherry picked from commit 91e7f19ec4056587a85c1461a4f34a6d5d4b7b52) M lib/libc/stdlib/strfmon.c ____________________________________________________________________________________________________________ Commit: c7cfc16f7ce08ae91b9ec6544348d750d08e65c1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c7cfc16f7ce08ae91b9ec6544348d750d08e65c1 Author: Cy Schubert (Wed 26 Nov 2025 19:40:36 GMT) Committer: Cy Schubert (Tue 2 Dec 2025 15:28:55 GMT) ipfilter: Load optionlist prior to ippool invocation As a safety precaution df381bec2d2b limits ippool hash table size to 1K. This causes any legitimely large hash table to fail to load. The htable_size_max ipf tuneable adjusts this but the adjustment is made in the ipfilter rc script, invoked after the ippool script (because it depends on ippool). Let's load the ipfilter_optionlist in ippool as well. ipfilter_optionlist load will also occur in the ipfilter rc script in case the user uses ipfilter without ippool. Fixes: df381bec2d2b (cherry picked from commit d5d005e9bf4933d5680dd0bb5d42bdf440122aa4) M libexec/rc/rc.d/ippool ____________________________________________________________________________________________________________ Commit: f4ff747cb709efeed3c1867060a81ae3ee72d474 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f4ff747cb709efeed3c1867060a81ae3ee72d474 Author: Dimitry Andric (Fri 28 Nov 2025 18:12:01 GMT) Committer: Dimitry Andric (Mon 1 Dec 2025 11:57:17 GMT) Remove TableGen objects from libllvm, fixing bad option registrations In 986e05bc2a18 I revamped the build for all the llvm subprojects. Among others I added objects under contrib/llvm-project/llvm/lib/TableGen, but I missed that upstream explicitly removes these when building the shared llvm library: https://github.com/llvm/llvm-project/blob/llvmorg-19.1.7/llvm/tools/llvm-shlib/CMakeLists.txt#L23 In 2e47f35be5dc I converted libllvm to a shared library. From that point onwards, some of the global command line option objects registered in llvm/lib/TableGen/Main.cpp conflict with similar objects in tools like llvm-cov, llvm-as, etc. This results in an error when running these tools: "CommandLine Error: Option 'o' registered more than once!", followed by a fatal exit. Fix this by removing the TableGen objects from libllvm. Note that we no longer install any of the tblgen binaries, these are only used during buildworld, and then in a statically linked form. PR: 291233 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291233 ) MFC after: 3 days (cherry picked from commit 9978553d0199e7ec0bdd1c44fc7f6c7b0c11e43b) M lib/clang/libllvm/Makefile ____________________________________________________________________________________________________________ Commit: 81385f622037a5b78fd4f8046163367fa607d37a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=81385f622037a5b78fd4f8046163367fa607d37a Author: Kristof Provost (Sat 15 Nov 2025 13:44:54 GMT) Committer: Kristof Provost (Sat 29 Nov 2025 20:02:00 GMT) pf: handle divert packets In a divert setup pf_test_state() may return PF_PASS, but not set the state pointer. We didn't handle that, and as a result crashed immediately afterwards trying to dereference that NULL state pointer. Add a test case to provoke the problem. PR: 260867 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260867 ) MFC after: 2 weeks Submitted by: Phil Budne Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 66f2f1c83247f05a3a599d7e88c7e7efbedd16b5) M sys/netpfil/pf/pf.c ____________________________________________________________________________________________________________ Commit: 8d338f99f8b1dc16d2175721c48201fce117fe43 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8d338f99f8b1dc16d2175721c48201fce117fe43 Author: Jose Luis Duran (Wed 19 Nov 2025 15:59:25 GMT) Committer: Jose Luis Duran (Sat 29 Nov 2025 00:32:36 GMT) beep: Sort usage and man page options Sort usage and man page options, mention possible minimum and maximum values, fix punctuation marks, and cleanup the man page. PR: 291092 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291092 ) Reviewed by: pauamma_gundo.com, christos MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53827 (cherry picked from commit 55d98b024f25403f60efe04f90a391014b6bc388) M usr.bin/beep/beep.1 M usr.bin/beep/beep.c ____________________________________________________________________________________________________________ Commit: 2aed524b2329fd4af929c7b6ef97fcdb02391177 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2aed524b2329fd4af929c7b6ef97fcdb02391177 Author: Gordon Tetlow (Fri 21 Nov 2025 21:24:58 GMT) Committer: Gordon Tetlow (Wed 26 Nov 2025 16:02:20 GMT) Mitigate YXDOMAIN and nodata non-referral answer poisoning. Add a fix to apply scrubbing of unsolicited NS RRSets (and their respective address records) for YXDOMAIN and nodata non-referral answers. This prevents a malicious actor from exploiting a possible cache poison attack. Obtained from: NLnet Labs Security: FreeBSD-SA-25:10.unbound Security: CVE-2025-11411 (cherry picked from commit 2a3a6a1771148a709c2d9694c1d66c41ce8dee79) M contrib/unbound/iterator/iter_scrub.c ____________________________________________________________________________________________________________ Commit: 111b60a2fddca6051c6e782c4a9a4da258ed4cdf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=111b60a2fddca6051c6e782c4a9a4da258ed4cdf Author: Jose Luis Duran (Wed 19 Nov 2025 01:09:58 GMT) Committer: Jose Luis Duran (Wed 26 Nov 2025 15:34:23 GMT) local-unbound: Read a tab separated resolv.conf Use [[:space:]] rather than a white space character to delimit the keys and the values in the resolv.conf file. PR: 236079 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236079 ) Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53811 (cherry picked from commit 0628400590e025b7db1c0905e6ee488a24ef3f60) M usr.sbin/unbound/setup/local-unbound-setup.sh ____________________________________________________________________________________________________________ Commit: e0c79f13d755c480ff6c3ca1f5c78ed1c04db400 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e0c79f13d755c480ff6c3ca1f5c78ed1c04db400 Author: Dimitry Andric (Sun 23 Nov 2025 15:52:46 GMT) Committer: Dimitry Andric (Wed 26 Nov 2025 06:06:40 GMT) Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):" [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) The compiler_rt helper functions have been built since 12.4, 13.1, 14 and anything newer. This reverts commit bd27bd1f51d049538cc7a0053be9d99110a53ae1. Only some people (including the release manager, unfortunately) ran into build issues with the previous iteration of this commit, because they were bootstrapping the compiler, either via the WITHOUT_SYSTEM_COMPILER src.conf(5) setting, or because the build system determined that their base system compiler was out of date. The bootstrapped compiler would then enable outline atomics and compile libgcc_s with these, but because libgcc_s is linked with -nodefaultlibs, it could not find the helper routines in libcompiler_rt.a. In contrast, people who did not bootstrap the compiler never saw any issues, because libgcc_s was built using their 'old' base system compiler, and so libgcc_s would not contain any calls to those helper routines. Fix this by ensuring that libgcc_s is linked against libcompiler_rt.a explicitly, similar to some other binaries and libraries that are built with -nodefaultlibs. Also, bump FREEBSD_CC_VERSION to ensure that everybody gets the updated compiler with outline atomics enabled. (This should have been done in the first iteration of this commit, because the error would have shown up right away then.) MFC after: 3 days (cherry picked from commit 3289bace53f31545976fec310b41fa784de75e64) M contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h M lib/clang/freebsd_cc_version.h M lib/libgcc_s/Makefile ____________________________________________________________________________________________________________ Commit: f6bd9b266dc4aa342f735a7ade07061f54f7f740 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f6bd9b266dc4aa342f735a7ade07061f54f7f740 Author: Dag-Erling Smørgrav (Fri 21 Nov 2025 06:28:13 GMT) Committer: Dag-Erling Smørgrav (Tue 25 Nov 2025 03:19:35 GMT) openssh: Don't attempt to connect to unsupported addresses When iterating over known addresses for the requested target host name, skip those that are not supported by the running kernel. MFC after: 1 week PR: 195231 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195231 ) Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53588 (cherry picked from commit 5818b6ee552b302f5300934f9b8cb94881867a5f) M crypto/openssh/FREEBSD-upgrade M crypto/openssh/sshconnect.c ____________________________________________________________________________________________________________ Commit: d9c345c9d3cac00d055ca748e43b308861529a01 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d9c345c9d3cac00d055ca748e43b308861529a01 Author: Cy Schubert (Fri 21 Nov 2025 00:16:04 GMT) Committer: Cy Schubert (Mon 24 Nov 2025 04:00:43 GMT) ntpd: Fix segfault when same IP on multiple interfaces Use the protype socket to obtain the IP address for an error message. Using the resultant socket address, a NULL because create_interface() had failed, results in SIGSEGV. To reproduce this bug, ifconfig bridge100 create ifconfig bridge100 10.10.10.10/24 ifconfig bridge101 create ifconfig bridge101 10.10.10.10/24 ntpd -n PR: 291119 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291119 ) (cherry picked from commit ac1f48b4a7be104d222dea60f1da946fcb345fb1) M contrib/ntp/ntpd/ntp_io.c ____________________________________________________________________________________________________________ Commit: 503ab844ceced16c7e8736c0caa586ff0bab5f0e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=503ab844ceced16c7e8736c0caa586ff0bab5f0e Author: Mark Johnston (Tue 27 May 2025 14:29:14 BST) Committer: Mark Johnston (Wed 19 Nov 2025 20:47:50 GMT) namei: Fix cn_flags width in various places This truncation is mostly harmless today, but fix it anyway to avoid pain later down the road. Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50417 (cherry picked from commit 0d224af399a66f00a5b33e5512fc018062cabf1d) M sys/fs/cd9660/cd9660_lookup.c M sys/fs/fuse/fuse_vnops.c M sys/fs/smbfs/smbfs_vnops.c M sys/fs/unionfs/union_vnops.c M sys/kern/uipc_mqueue.c M sys/kern/vfs_cache.c ____________________________________________________________________________________________________________ Commit: adb8c1a9d09d5a29167b845f423e989bfdba46ab URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=adb8c1a9d09d5a29167b845f423e989bfdba46ab Author: Mark Johnston (Tue 27 May 2025 14:27:49 BST) Committer: Mark Johnston (Wed 19 Nov 2025 20:47:50 GMT) vfs cache: Add NAMEILOOKUP to the whitelist of fastpath lookup flags Otherwise the lockless name lookup path is inadvertently disabled since NAMEILOOKUP isn't recognized. Reviewed by: olce, kib Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") Differential Revision: https://reviews.freebsd.org/D50532 (cherry picked from commit f4158953007f557061d91f99d2374d48d8376cc6) M sys/kern/vfs_cache.c ____________________________________________________________________________________________________________ Commit: 4e31059f80d162a1f496f25ef297268d47614dd2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4e31059f80d162a1f496f25ef297268d47614dd2 Author: Mark Johnston (Fri 23 May 2025 16:35:05 BST) Committer: Mark Johnston (Wed 19 Nov 2025 20:47:50 GMT) namei: Remove a now-unused variable Reported by: bapt Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") (cherry picked from commit 14ec281a09d7818def2083ef0c3e28f8101f4268) M sys/kern/vfs_cache.c ____________________________________________________________________________________________________________ Commit: b55b92729641e05a05cc8526b08bd7ac3dfcb4fc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b55b92729641e05a05cc8526b08bd7ac3dfcb4fc Author: Mark Johnston (Wed 28 May 2025 16:28:36 BST) Committer: Mark Johnston (Wed 19 Nov 2025 20:47:50 GMT) tests: Add a regression test for commit 7587f6d4840f8 Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50533 (cherry picked from commit a5dac34f6e98c47bd7cb1946e39cc45432e167a8) M tests/sys/kern/Makefile A tests/sys/kern/jail_lookup_root.c ____________________________________________________________________________________________________________ Commit: 8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 Author: Mark Johnston (Wed 28 May 2025 14:35:24 BST) Committer: Mark Johnston (Wed 19 Nov 2025 20:47:50 GMT) vfs: Don't clobber namei flags in vn_open_cred() Otherwise NAMEILOOKUP is cleared. More generally it seems quite surprising that the flags set by vn_open_cred() callers are not automatically preserved. Modify open2nameif() such that it takes already-set namei flags into account. Reviewed by: olce, kib Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") Differential Revision: https://reviews.freebsd.org/D50531 (cherry picked from commit e05e33041c252dc236939683c01ca4b7b083562c) M sys/kern/vfs_vnops.c ____________________________________________________________________________________________________________ Commit: 592de68e328b4edf8acdb2a0b0b66a813747b440 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=592de68e328b4edf8acdb2a0b0b66a813747b440 Author: Mark Johnston (Fri 23 May 2025 13:52:24 BST) Committer: Mark Johnston (Wed 19 Nov 2025 20:47:50 GMT) namei: Make stackable filesystems check harder for jail roots Suppose a process has its cwd pointing to a nullfs directory, where the lower directory is also visible in the jail's filesystem namespace. Suppose that the lower directory vnode is moved out from under the nullfs mount. The nullfs vnode still shadows the lower vnode, and dotdot lookups relative to that directory will instantiate new nullfs vnodes outside of the nullfs mountpoint, effectively shadowing the lower filesystem. This phenomenon can be abused to escape a chroot, since the nullfs vnodes instantiated by these dotdot lookups defeat the root vnode check in vfs_lookup(), which uses vnode pointer equality to test for the process root. Fix this by extending nullfs and unionfs to perform the same check, exploiting the fact that the passed componentname is embedded in a nameidata structure to avoid changing the VOP_LOOKUP interface. That is, add a flag to indicate that containerof can be used to get the full nameidata structure, and perform the root vnode check on the lower vnode when performing a dotdot lookup. PR: 262180 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262180 ) Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50418 (cherry picked from commit 7587f6d4840f8d363e457cddc14c184cf1fe7cc1) M sys/fs/nullfs/null_vnops.c M sys/fs/unionfs/union_vnops.c M sys/kern/vfs_cache.c M sys/kern/vfs_lookup.c M sys/sys/namei.h ____________________________________________________________________________________________________________ Commit: 19b91b15530d1ed0453ce073fb15d1f790ff85e4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=19b91b15530d1ed0453ce073fb15d1f790ff85e4 Author: Konstantin Belousov (Sat 17 May 2025 06:37:48 BST) Committer: Mark Johnston (Wed 19 Nov 2025 20:47:50 GMT) nullfs lookup: cn_flags is 64bit Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50390 (cherry picked from commit 89549c2348170921cc4270ac95bfabfd78d42739) M sys/fs/nullfs/null_vnops.c ____________________________________________________________________________________________________________ Commit: 90118a35a3ae469ca91a4c52b3623bf4d0c5212e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=90118a35a3ae469ca91a4c52b3623bf4d0c5212e Author: Mark Johnston (Sat 7 Sep 2024 15:36:28 BST) Committer: Mark Johnston (Wed 19 Nov 2025 20:47:50 GMT) src.conf: Add a MK_ZFS_TESTS knob The in-tree ZFS test suite is somewhat outdated and I see a number of failures there. I tend to think that we want to integrate the OpenZFS test suite somehow, replacing the legacy one, though it's also possible to run that as a separate test suite. In any case, if one wants to run the OpenZFS test suite separately, it's useful to be able to disable installation of the legacy ZFS test suite, so let's provide a src.conf option to do that. Reviewed by: asomers MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46476 (cherry picked from commit 24affded3d4ec5fafb6b22f773ec1e20d73b9b03) M share/mk/src.opts.mk M tests/sys/cddl/Makefile A tools/build/options/WITHOUT_ZFS_TESTS ____________________________________________________________________________________________________________ Commit: a2630fec78b60844e68cae8b9e1f65b7322a5f05 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a2630fec78b60844e68cae8b9e1f65b7322a5f05 Author: Dag-Erling Smørgrav (Fri 14 Nov 2025 14:28:40 GMT) Committer: Dag-Erling Smørgrav (Wed 19 Nov 2025 11:20:30 GMT) quot: Rewrite -n mode input parser The existing parser was needlessly complicated and wildly inconsistent in how it handled invalid input. Rewrite using getline() and treat invalid input consistently: silently ignore lines that don't begin with a number, and print a warning if the inode number is out of range. PR: 290992 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290992 ) MFC after: 1 week Reviewed by: obrien Differential Revision: https://reviews.freebsd.org/D53726 (cherry picked from commit fa272a5276865a97b01823fe6546940eaaf1b164) (cherry picked from commit 179fa1d81c73ab7ef231e17da73f230e4f8ee5a2) M usr.sbin/quot/quot.8 M usr.sbin/quot/quot.c M usr.sbin/quot/tests/quot_test.sh ____________________________________________________________________________________________________________ Commit: 29343c4b8f94f3e7a6f0d26fec8fda625773a4c3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=29343c4b8f94f3e7a6f0d26fec8fda625773a4c3 Author: Dag-Erling Smørgrav (Fri 17 Oct 2025 12:55:12 BST) Committer: Dag-Erling Smørgrav (Wed 19 Nov 2025 11:20:30 GMT) quot: Add tests To facilitate the task, we change the comparison function so that users with equal filesystem usage are sorted by UID, and add an undocumented option that prevents quot from replacing numerical UIDs with names. We also switch from getfsfile(3) to getmntpoint(3) so the first line is identical regardless of whether we pass quot a mountpoint or a device. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53133 (cherry picked from commit aa870a1935bccb66e02c4c31630706768a3e7d74) (cherry picked from commit b5f3f1a661ab69986c3379fa4c9c2b38785933db) (cherry picked from commit b41551753a2baff6646e2958acb4a7fcd205b69c) M etc/mtree/BSD.tests.dist M usr.sbin/quot/Makefile M usr.sbin/quot/quot.c A usr.sbin/quot/tests/Makefile A usr.sbin/quot/tests/quot_test.sh ____________________________________________________________________________________________________________ Commit: 6ec3d4402af60ad91d4dae829c77416ed60cf896 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6ec3d4402af60ad91d4dae829c77416ed60cf896 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Sun 9 Nov 2025 14:46:40 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Tue 18 Nov 2025 13:39:49 GMT) geom_zero.4: Document PR: 250593 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250593 ) Reviewed by: bcr, ziaee Thanks to: imp, markj MFC after: 1 week Fixes: 3843eba85d98 Add unmapped BIO support to GEOM ZERO Fixes: 24e1fdcd1a69 Allow to specify the byte which will be used for filling read buffer Fixes: 565bc101112c Add a very simple and small GEOM class - ZERO (cherry picked from commit 39acb7fd86eda721df402c2f1368b78cede161c3) M share/man/man4/Makefile A share/man/man4/geom_zero.4 M share/man/man4/zero.4 ____________________________________________________________________________________________________________ Commit: 760b71a4936330032c727da8ebcecfa6440fe489 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=760b71a4936330032c727da8ebcecfa6440fe489 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Tue 4 Nov 2025 11:10:55 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Tue 18 Nov 2025 13:37:10 GMT) dtrace_callout_execute.4: Document the DTrace callout_execute provider MFC after: 2 weeks Fixes: 91dd9aae1ab8 Add explicit static DTrace tracing to the callout mechanism Differential Revision: https://reviews.freebsd.org/D51397 (cherry picked from commit 3ccb2d9513e6a2e046e635c186da68acf8f8498b) M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 M share/man/man4/Makefile A share/man/man4/dtrace_callout_execute.4 M share/man/man9/callout.9 ____________________________________________________________________________________________________________ Commit: ecc1e61d31407680c9acee9c7adcf2ca2aa21432 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ecc1e61d31407680c9acee9c7adcf2ca2aa21432 Author: Mark Johnston (Tue 20 May 2025 21:19:30 BST) Committer: Mark Johnston (Mon 17 Nov 2025 15:06:28 GMT) file: Qualify pointers to capsicum rights as const File descriptor lookup routines typically take a set of capsicum rights as input to the lookup, so that the fd's rights can be atomically checked. This set should be qualified with const. No functional change intended. Reviewed by: olce, oshogbo, brooks, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50419 (cherry picked from commit 5319cb21610ad947c56fd0cd4f18ef5b58bc8db7) M sys/kern/kern_descrip.c M sys/kern/sys_procdesc.c M sys/kern/uipc_mqueue.c M sys/kern/uipc_sem.c M sys/kern/uipc_syscalls.c M sys/kern/vfs_syscalls.c M sys/sys/file.h M sys/sys/filedesc.h M sys/sys/namei.h M sys/sys/procdesc.h M sys/sys/socketvar.h ____________________________________________________________________________________________________________ Commit: e2956be814a1ae86d7b5f83144b517e54424da27 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e2956be814a1ae86d7b5f83144b517e54424da27 Author: Mark Johnston (Wed 14 May 2025 00:26:49 BST) Committer: Mark Johnston (Mon 17 Nov 2025 14:29:25 GMT) file: Simplify an INVARIANTS check in _fdrop() No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit a2e22ed3420d92d9d98a1e9681b5c9b1fbe40fca) M sys/kern/kern_descrip.c ____________________________________________________________________________________________________________ Commit: 3d0e2327e983ac76098da7572fe210c193e755c5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3d0e2327e983ac76098da7572fe210c193e755c5 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Thu 6 Nov 2025 22:41:44 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 15 Nov 2025 07:19:26 GMT) dtrace.1: Document DTRACE_DEBUG Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53627 (cherry picked from commit f811c0a555546e4154dfa159e8f56b3ba1c70d0d) M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ____________________________________________________________________________________________________________ Commit: 3e8d5f36082414373462743d775db005daf07339 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3e8d5f36082414373462743d775db005daf07339 Author: Dag-Erling Smørgrav (Mon 10 Nov 2025 13:58:11 GMT) Committer: Dag-Erling Smørgrav (Fri 14 Nov 2025 14:43:53 GMT) cd9660: Unbreak symbolic links Since the introduction of permission masks, cd9660_getattr() returns a size of zero for all symbolic links, because the code to retrieve the length of the link target (as required by POSIX) is dead, since we strip away the type bits before we try to use them to identify the file as a link. Address this by checking the vnode type instead. PR: 290556 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290556 ) MFC after: 3 days Fixes: 82f2275b73e5 ("cd9660: Add support for mask,dirmask,uid,gid options") Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D53598 (cherry picked from commit 978aaa72f3196f5489630052762cac5a7863e774) M sys/fs/cd9660/cd9660_vnops.c ____________________________________________________________________________________________________________ Commit: dbe0b2c986cbd4c01d5ba5a3b367aba9740c137b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dbe0b2c986cbd4c01d5ba5a3b367aba9740c137b Author: Cy Schubert (Thu 23 Oct 2025 00:19:54 BST) Committer: Cy Schubert (Wed 12 Nov 2025 04:02:31 GMT) ipfilter: Don't trust userland supplied iph_size ipf_htable_create() trusts a user-supplied iph_size from iphtable_t and computes the allocation size as iph->iph_size * sizeof(*iph->iph_table) without checking for integer overflow. A sufficiently large iph_size causes the multiplication to wrap, resulting in an under-sized allocation for the table pointer array. Subsequent code (e.g., in ipf_htent_insert()) can then write past the end of the allocated buffer, corrupting kernel memory and causing DoS or potential privilege escalation. This is not typically a problem when using the ipfilter provided userland tools as calculate the correct lengths. This mitigates a rogue actor calling ipfilter ioctls directly. Reported by: Ilja Van Sprundel Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53286 (cherry picked from commit df381bec2d2b73697a3d163177df042dd272022d) M sbin/ipf/libipf/interror.c M sys/netpfil/ipfilter/netinet/ip_htable.c ____________________________________________________________________________________________________________ Commit: e82f63c7257e561a1b2b826b2712cec32eb9c787 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e82f63c7257e561a1b2b826b2712cec32eb9c787 Author: Cy Schubert (Wed 22 Oct 2025 23:56:50 BST) Committer: Cy Schubert (Wed 12 Nov 2025 04:02:31 GMT) ipfilter: Add an htable max size tuneable. Add an ipfilter runtime option (ipf -T) to adjust the default maximum hash table size. Default it to 1024 entries. It will be used by a subsequent commit to limit any damage due to excessively large hash table input by the user. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53284 (cherry picked from commit f3b94f47f55c502e8983f9bd294e963e75b2963a) M sys/netpfil/ipfilter/netinet/ip_htable.c M sys/netpfil/ipfilter/netinet/ip_htable.h ____________________________________________________________________________________________________________ Commit: 2e13641830206eeddcf3547094d5da7ce47e0a87 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2e13641830206eeddcf3547094d5da7ce47e0a87 Author: Cy Schubert (Wed 22 Oct 2025 23:51:43 BST) Committer: Cy Schubert (Wed 12 Nov 2025 04:02:31 GMT) ipfilter: Add htable (hash table) tunable This is in preparation for addition of a hash table max size. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D53283 (cherry picked from commit c57262716b08717b6a9c5533941d4e0a2d180d46) M sys/netpfil/ipfilter/netinet/ip_htable.c ____________________________________________________________________________________________________________ Commit: eb411cd796fecdff37a9728b158fdda8f545a785 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eb411cd796fecdff37a9728b158fdda8f545a785 Author: Cy Schubert (Thu 23 Oct 2025 03:11:20 BST) Committer: Cy Schubert (Wed 12 Nov 2025 04:02:31 GMT) ipfilter: Calculate the number of elements in ipf_errors It serves no purpose to manually manage the IPF_NUM_ERRORS count. Calculate it instead. Reviewed by: emaste, markj Differential revision: https://reviews.freebsd.org/D53308 (cherry picked from commit ab3c9853285b4907dac147ce2f818e3fb44df5a3) M sbin/ipf/libipf/interror.c ____________________________________________________________________________________________________________ Commit: 1b5d2fc026d35d96ac65995e32cfef9e968f9a99 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1b5d2fc026d35d96ac65995e32cfef9e968f9a99 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Mon 3 Nov 2025 15:54:10 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Mon 10 Nov 2025 09:48:14 GMT) dtrace_vfs.4: Document the DTrace vfs provider Reviewed by: bcr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51317 (cherry picked from commit 2020e76450e2705d33d673a3d183c8f0a3910e28) M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 M share/man/man4/Makefile A share/man/man4/dtrace_vfs.4 M share/man/man9/VFS.9 ____________________________________________________________________________________________________________ Commit: 8febbb2a7d321e62b49e2dae4d26619c0d8cfe8d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8febbb2a7d321e62b49e2dae4d26619c0d8cfe8d Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Thu 6 Nov 2025 23:04:01 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Sun 9 Nov 2025 15:29:33 GMT) dtrace.1: Fix mdoc macros around -x There should be no space between -x's "arg" and "=value". MFC after: 3 days (cherry picked from commit 753cef701dbea03627c1fe11dd5556e74df415b2) M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ____________________________________________________________________________________________________________ Commit: 956938cd28b27403a0e3b6279ad3266d2cf665f0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=956938cd28b27403a0e3b6279ad3266d2cf665f0 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Thu 6 Nov 2025 22:11:22 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Sun 9 Nov 2025 15:28:54 GMT) ports.7: Add /var/db/ports to FILES PR: 272426 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272426 ) MFC after: 3 days Co-authored-by: Piotr Smyrak (cherry picked from commit b8ff8a11c0d1d1f1b3bd1e60fae9c05ada7b28c5) M share/man/man7/ports.7 ____________________________________________________________________________________________________________ Commit: 5cf8a3cbd9dc824811f639ed0c38bac8b42de888 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5cf8a3cbd9dc824811f639ed0c38bac8b42de888 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Wed 18 Jun 2025 18:40:27 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 8 Nov 2025 11:18:57 GMT) truss.1: Reference sysdecode(3) MFC after: 1 week (cherry picked from commit fa9ac741d03342c33a0e8f85114949625ba4901f) M usr.bin/truss/truss.1 ____________________________________________________________________________________________________________ Commit: 3b7358bebd30cc7dea34c329cbc3e7e14264c2bb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3b7358bebd30cc7dea34c329cbc3e7e14264c2bb Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Mon 14 Jul 2025 15:51:37 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 8 Nov 2025 11:15:05 GMT) dtrace.1: Document evaltime Reviewed by: christos, ziaee MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51301 (cherry picked from commit 1fe7af0635810a96a292638d11d25ddbe95bd581) M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ____________________________________________________________________________________________________________ Commit: 4735f556b9c949799a49770f850a8fc873ef64dd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4735f556b9c949799a49770f850a8fc873ef64dd Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Tue 15 Jul 2025 00:40:50 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 8 Nov 2025 11:13:33 GMT) vnode.9: Fix a typo in sys/tools/vnode_if.awk path name Fixes: e01826567938 vnode.9: Document vnode_if.awk and vnode_if.src MFC after: 1 week (cherry picked from commit 0abee387e1dfd0bf09becadb39b9bc9fef240d95) M share/man/man9/vnode.9 ____________________________________________________________________________________________________________ Commit: cd77df4c057e51d3a36368d40019b23f9c8a8296 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cd77df4c057e51d3a36368d40019b23f9c8a8296 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Fri 24 Oct 2025 19:08:31 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 8 Nov 2025 11:04:54 GMT) deadfs.9: Document Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53334 (cherry picked from commit daa6660f899309f832bba0c7ac72dada125cfed5) M share/man/man9/Makefile A share/man/man9/deadfs.9 ____________________________________________________________________________________________________________ Commit: 53912e303f833b61ba6aa83c1836a87fffcb94ad URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=53912e303f833b61ba6aa83c1836a87fffcb94ad Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Tue 4 Nov 2025 11:04:43 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 8 Nov 2025 10:55:47 GMT) buf.9: Sprinkle with mdoc macros I did not bump the date here as the manual page looks more like a draft and I'm not sure if it is actually up-to-date considering that it's current Dd dates back to 1998. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52770 (cherry picked from commit fc7f5452c6ff1a9d01a9d8d0638da593ae4f080c) M share/man/man9/buf.9 ____________________________________________________________________________________________________________ Commit: 1772049a8ace71b1263ac87839288786c6a07e60 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1772049a8ace71b1263ac87839288786c6a07e60 Author: Dimitry Andric (Fri 31 Oct 2025 15:48:31 GMT) Committer: Dimitry Andric (Fri 7 Nov 2025 21:58:49 GMT) Revert "Merge commit e24f90190c77 from llvm git (by Brad Smith):" [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) The compiler_rt helper functions have been built since 12.4, 13.1, 14 and anything newer. This reverts commit 51e8e8b0f36933814b1be08913857727876aece5. MFC after: immediately (cherry picked from commit bd27bd1f51d049538cc7a0053be9d99110a53ae1) M contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h ____________________________________________________________________________________________________________ Commit: a432ffb091ebf7b72227d7b57fb02490a870d645 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a432ffb091ebf7b72227d7b57fb02490a870d645 Author: Seyed Pouria Mousavizadeh Tehrani (Tue 21 Oct 2025 19:58:26 BST) Committer: Kristof Provost (Fri 7 Nov 2025 08:57:49 GMT) if_vxlan: fix byteorder of source port Fix the htons byteorder of vxlan packets after `vxlan_pick_source_port` picks a source port during encapsulation. Reviewed by: zlei, kp, adrian Differential Revision: https://reviews.freebsd.org/D53022 (cherry picked from commit 1cc316727ebae157b3d035d9fb1ad38310a80698) M sys/net/if_vxlan.c ____________________________________________________________________________________________________________ Commit: 58f534ec408c77d365426a03e8037d874151c421 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=58f534ec408c77d365426a03e8037d874151c421 Author: Tiago Gasiba (Wed 29 Oct 2025 20:09:39 GMT) Committer: Dag-Erling Smørgrav (Wed 5 Nov 2025 15:37:44 GMT) truss: Properly display first argument to nmount The first argument to nmount(2) is an nvlist in the form of an iovec, which truss already knows how to decode. Set the correct flag so this happens automatically. MFC after: 1 week PR: 290667 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290667 ) (cherry picked from commit b9f848ecbafce4e56ba9c8b7993b85347e83484a) M usr.bin/truss/syscalls.c ____________________________________________________________________________________________________________ Commit: b781ee1e0b8523ff42d798288225d802164abab5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b781ee1e0b8523ff42d798288225d802164abab5 Author: Jose Luis Duran (Wed 5 Nov 2025 15:18:15 GMT) Committer: Jose Luis Duran (Wed 5 Nov 2025 15:18:48 GMT) blacklist: Update the blacklistd-helper script Update the blacklistd-helper script, it provides a better mechanism for detecting the active packet filter. This is a direct commit to stable/13, as blacklist has been renamed to blocklist. PR: 290645 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290645 ) M contrib/blacklist/libexec/blacklistd-helper ____________________________________________________________________________________________________________ Commit: 50376dcb22cbf92addc299934cf4e85397995685 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=50376dcb22cbf92addc299934cf4e85397995685 Author: Stefan Eßer (Thu 11 Sep 2025 15:16:39 BST) Committer: Dag-Erling Smørgrav (Tue 4 Nov 2025 20:24:57 GMT) contrib/bc: MFC upgrade from version 7.02 to 7.1.0 This update fixes a few bugs: - Improper response to double SIGINT with editline. - Not letting libedit handle terminal size changes. - A dc crash from improperly handling an error. - A duplicate check for reference arrays. - Build failures with GCC 15. Add extra defines required for bc-7.1.0 to the Makefiles. The “all.sh” script in version 7.1.0 accepts one less parameter for selecting the tests to be run. (cherry picked from commit 4c178fe36e01f84f3c65f6953cbe8dbe5b3fc908) (cherry picked from commit ab36487a79cd0093d76ec3cdc8eb8c0e114835db) M contrib/bc/LICENSE.md A contrib/bc/MAINTENANCE-TERMS.md M contrib/bc/Makefile.in M contrib/bc/NEWS.md M contrib/bc/NOTICE.md M contrib/bc/README.md A contrib/bc/VERSION.txt A contrib/bc/build.gaml A contrib/bc/build.pkg.rig A contrib/bc/build.rig M contrib/bc/compile_flags.txt M contrib/bc/configure.sh M contrib/bc/gen/bc_help.txt M contrib/bc/gen/dc_help.txt M contrib/bc/gen/lib.bc M contrib/bc/gen/lib2.bc M contrib/bc/gen/strgen.c M contrib/bc/gen/strgen.sh M contrib/bc/include/args.h M contrib/bc/include/bc.h M contrib/bc/include/bcl.h M contrib/bc/include/dc.h M contrib/bc/include/file.h M contrib/bc/include/history.h M contrib/bc/include/lang.h M contrib/bc/include/lex.h M contrib/bc/include/library.h M contrib/bc/include/num.h M contrib/bc/include/opt.h M contrib/bc/include/ossfuzz.h M contrib/bc/include/parse.h M contrib/bc/include/program.h M contrib/bc/include/rand.h M contrib/bc/include/read.h M contrib/bc/include/status.h M contrib/bc/include/vector.h D contrib/bc/include/version.h M contrib/bc/include/vm.h M contrib/bc/locales/de_DE.ISO8859-1.msg M contrib/bc/locales/de_DE.UTF-8.msg M contrib/bc/locales/en_US.msg M contrib/bc/locales/es_ES.ISO8859-1.msg M contrib/bc/locales/es_ES.UTF-8.msg M contrib/bc/locales/fr_FR.ISO8859-1.msg M contrib/bc/locales/fr_FR.UTF-8.msg M contrib/bc/locales/ja_JP.UTF-8.msg M contrib/bc/locales/ja_JP.eucJP.msg M contrib/bc/locales/nl_NL.ISO8859-1.msg M contrib/bc/locales/nl_NL.UTF-8.msg M contrib/bc/locales/pl_PL.ISO8859-2.msg M contrib/bc/locales/pl_PL.UTF-8.msg M contrib/bc/locales/pt_PT.ISO8859-1.msg M contrib/bc/locales/pt_PT.UTF-8.msg M contrib/bc/locales/ru_RU.CP1251.msg M contrib/bc/locales/ru_RU.CP866.msg M contrib/bc/locales/ru_RU.ISO8859-5.msg M contrib/bc/locales/ru_RU.KOI8-R.msg M contrib/bc/locales/ru_RU.UTF-8.msg M contrib/bc/locales/zh_CN.GB18030.msg M contrib/bc/locales/zh_CN.GB2312.msg M contrib/bc/locales/zh_CN.GBK.msg M contrib/bc/locales/zh_CN.UTF-8.msg M contrib/bc/locales/zh_CN.eucCN.msg M contrib/bc/manuals/bc/A.1 M contrib/bc/manuals/bc/A.1.md M contrib/bc/manuals/bc/E.1 M contrib/bc/manuals/bc/E.1.md M contrib/bc/manuals/bc/EH.1 M contrib/bc/manuals/bc/EH.1.md M contrib/bc/manuals/bc/EHN.1 M contrib/bc/manuals/bc/EHN.1.md M contrib/bc/manuals/bc/EN.1 M contrib/bc/manuals/bc/EN.1.md M contrib/bc/manuals/bc/H.1 M contrib/bc/manuals/bc/H.1.md M contrib/bc/manuals/bc/HN.1 M contrib/bc/manuals/bc/HN.1.md M contrib/bc/manuals/bc/N.1 M contrib/bc/manuals/bc/N.1.md M contrib/bc/manuals/bcl.3 M contrib/bc/manuals/bcl.3.md M contrib/bc/manuals/build.md M contrib/bc/manuals/dc/A.1 M contrib/bc/manuals/dc/A.1.md M contrib/bc/manuals/dc/E.1 M contrib/bc/manuals/dc/E.1.md M contrib/bc/manuals/dc/EH.1 M contrib/bc/manuals/dc/EH.1.md M contrib/bc/manuals/dc/EHN.1 M contrib/bc/manuals/dc/EHN.1.md M contrib/bc/manuals/dc/EN.1 M contrib/bc/manuals/dc/EN.1.md M contrib/bc/manuals/dc/H.1 M contrib/bc/manuals/dc/H.1.md M contrib/bc/manuals/dc/HN.1 M contrib/bc/manuals/dc/HN.1.md M contrib/bc/manuals/dc/N.1 M contrib/bc/manuals/dc/N.1.md A contrib/bc/project/README.md A contrib/bc/project/gitea.db A contrib/bc/project/github_issues.json A contrib/bc/project/github_prs.json A contrib/bc/project/issue10.md M contrib/bc/scripts/exec-install.sh M contrib/bc/scripts/format.sh M contrib/bc/scripts/functions.sh M contrib/bc/scripts/karatsuba.py M contrib/bc/scripts/link.sh M contrib/bc/scripts/lint.sh M contrib/bc/scripts/locale_install.sh M contrib/bc/scripts/locale_uninstall.sh M contrib/bc/scripts/os.c A contrib/bc/scripts/release.pkg.yao M contrib/bc/scripts/sqrt_frac_guess.bc M contrib/bc/scripts/sqrt_int_guess.bc M contrib/bc/scripts/sqrt_random.bc M contrib/bc/scripts/sqrt_random.sh M contrib/bc/src/args.c M contrib/bc/src/bc.c M contrib/bc/src/bc_fuzzer.c M contrib/bc/src/bc_lex.c M contrib/bc/src/bc_parse.c M contrib/bc/src/data.c M contrib/bc/src/dc.c M contrib/bc/src/dc_fuzzer.c M contrib/bc/src/dc_lex.c M contrib/bc/src/dc_parse.c M contrib/bc/src/file.c M contrib/bc/src/history.c M contrib/bc/src/lang.c M contrib/bc/src/lex.c M contrib/bc/src/library.c M contrib/bc/src/main.c M contrib/bc/src/num.c M contrib/bc/src/opt.c M contrib/bc/src/parse.c M contrib/bc/src/program.c M contrib/bc/src/rand.c M contrib/bc/src/read.c M contrib/bc/src/vector.c M contrib/bc/src/vm.c M contrib/bc/tests/all.sh M contrib/bc/tests/bc/all.txt A contrib/bc/tests/bc/errors/39.txt D contrib/bc/tests/bc/lib2.txt A contrib/bc/tests/bc/lib2_a2.txt A contrib/bc/tests/bc/lib2_a2_results.txt A contrib/bc/tests/bc/lib2_bytes.txt A contrib/bc/tests/bc/lib2_bytes_results.txt A contrib/bc/tests/bc/lib2_ceil.txt A contrib/bc/tests/bc/lib2_ceil_results.txt A contrib/bc/tests/bc/lib2_d2r.txt A contrib/bc/tests/bc/lib2_d2r_results.txt A contrib/bc/tests/bc/lib2_fac.txt A contrib/bc/tests/bc/lib2_fac_results.txt A contrib/bc/tests/bc/lib2_gcd.txt A contrib/bc/tests/bc/lib2_gcd_results.txt A contrib/bc/tests/bc/lib2_log.txt A contrib/bc/tests/bc/lib2_log_results.txt A contrib/bc/tests/bc/lib2_p.txt A contrib/bc/tests/bc/lib2_p_results.txt A contrib/bc/tests/bc/lib2_perm.txt A contrib/bc/tests/bc/lib2_perm_results.txt A contrib/bc/tests/bc/lib2_pi.txt A contrib/bc/tests/bc/lib2_pi_results.txt A contrib/bc/tests/bc/lib2_r.txt A contrib/bc/tests/bc/lib2_r2d.txt A contrib/bc/tests/bc/lib2_r2d_results.txt A contrib/bc/tests/bc/lib2_r_results.txt A contrib/bc/tests/bc/lib2_rand.txt A contrib/bc/tests/bc/lib2_rand_results.txt A contrib/bc/tests/bc/lib2_root.txt A contrib/bc/tests/bc/lib2_root_results.txt A contrib/bc/tests/bc/lib2_tan.txt A contrib/bc/tests/bc/lib2_tan_results.txt A contrib/bc/tests/bc/lib2_uint.txt R072 contrib/bc/tests/bc/lib2_results.txt contrib/bc/tests/bc/lib2_uint_results.txt R086 contrib/bc/tests/bc/scripts/add.bc contrib/bc/tests/bc/scripts/add_00100.bc A contrib/bc/tests/bc/scripts/add_00200.bc A contrib/bc/tests/bc/scripts/add_00300.bc A contrib/bc/tests/bc/scripts/add_00400.bc A contrib/bc/tests/bc/scripts/add_00500.bc A contrib/bc/tests/bc/scripts/add_00600.bc A contrib/bc/tests/bc/scripts/add_00700.bc A contrib/bc/tests/bc/scripts/add_00800.bc A contrib/bc/tests/bc/scripts/add_00900.bc A contrib/bc/tests/bc/scripts/add_01000.bc A contrib/bc/tests/bc/scripts/add_01100.bc A contrib/bc/tests/bc/scripts/add_01200.bc A contrib/bc/tests/bc/scripts/add_01300.bc A contrib/bc/tests/bc/scripts/add_01400.bc A contrib/bc/tests/bc/scripts/add_01500.bc A contrib/bc/tests/bc/scripts/add_01600.bc A contrib/bc/tests/bc/scripts/add_01700.bc A contrib/bc/tests/bc/scripts/add_01800.bc A contrib/bc/tests/bc/scripts/add_01900.bc A contrib/bc/tests/bc/scripts/add_02000.bc A contrib/bc/tests/bc/scripts/add_02100.bc A contrib/bc/tests/bc/scripts/add_02200.bc A contrib/bc/tests/bc/scripts/add_02300.bc A contrib/bc/tests/bc/scripts/add_02400.bc A contrib/bc/tests/bc/scripts/add_02500.bc A contrib/bc/tests/bc/scripts/add_02600.bc A contrib/bc/tests/bc/scripts/add_02700.bc A contrib/bc/tests/bc/scripts/add_02800.bc A contrib/bc/tests/bc/scripts/add_02900.bc A contrib/bc/tests/bc/scripts/add_03000.bc A contrib/bc/tests/bc/scripts/add_03100.bc A contrib/bc/tests/bc/scripts/add_03200.bc A contrib/bc/tests/bc/scripts/add_03300.bc A contrib/bc/tests/bc/scripts/add_03400.bc A contrib/bc/tests/bc/scripts/add_03500.bc A contrib/bc/tests/bc/scripts/add_03600.bc A contrib/bc/tests/bc/scripts/add_03700.bc A contrib/bc/tests/bc/scripts/add_03800.bc A contrib/bc/tests/bc/scripts/add_03900.bc A contrib/bc/tests/bc/scripts/add_04000.bc A contrib/bc/tests/bc/scripts/add_04100.bc A contrib/bc/tests/bc/scripts/add_04200.bc A contrib/bc/tests/bc/scripts/add_04300.bc A contrib/bc/tests/bc/scripts/add_04400.bc A contrib/bc/tests/bc/scripts/add_04500.bc A contrib/bc/tests/bc/scripts/add_04600.bc A contrib/bc/tests/bc/scripts/add_04700.bc A contrib/bc/tests/bc/scripts/add_04800.bc A contrib/bc/tests/bc/scripts/add_04900.bc A contrib/bc/tests/bc/scripts/add_05000.bc A contrib/bc/tests/bc/scripts/add_05100.bc A contrib/bc/tests/bc/scripts/add_05200.bc A contrib/bc/tests/bc/scripts/add_05300.bc A contrib/bc/tests/bc/scripts/add_05400.bc A contrib/bc/tests/bc/scripts/add_05500.bc A contrib/bc/tests/bc/scripts/add_05600.bc A contrib/bc/tests/bc/scripts/add_05700.bc A contrib/bc/tests/bc/scripts/add_05800.bc A contrib/bc/tests/bc/scripts/add_05900.bc A contrib/bc/tests/bc/scripts/add_06000.bc A contrib/bc/tests/bc/scripts/add_06100.bc A contrib/bc/tests/bc/scripts/add_06200.bc A contrib/bc/tests/bc/scripts/add_06300.bc A contrib/bc/tests/bc/scripts/add_06400.bc A contrib/bc/tests/bc/scripts/add_06500.bc A contrib/bc/tests/bc/scripts/add_06600.bc A contrib/bc/tests/bc/scripts/add_06700.bc A contrib/bc/tests/bc/scripts/add_06800.bc A contrib/bc/tests/bc/scripts/add_06900.bc A contrib/bc/tests/bc/scripts/add_07000.bc A contrib/bc/tests/bc/scripts/add_07100.bc A contrib/bc/tests/bc/scripts/add_07200.bc A contrib/bc/tests/bc/scripts/add_07300.bc A contrib/bc/tests/bc/scripts/add_07400.bc A contrib/bc/tests/bc/scripts/add_07500.bc A contrib/bc/tests/bc/scripts/add_07600.bc A contrib/bc/tests/bc/scripts/add_07700.bc A contrib/bc/tests/bc/scripts/add_07800.bc A contrib/bc/tests/bc/scripts/add_07900.bc A contrib/bc/tests/bc/scripts/add_08000.bc A contrib/bc/tests/bc/scripts/add_08100.bc A contrib/bc/tests/bc/scripts/add_08200.bc A contrib/bc/tests/bc/scripts/add_08300.bc A contrib/bc/tests/bc/scripts/add_08400.bc A contrib/bc/tests/bc/scripts/add_08500.bc A contrib/bc/tests/bc/scripts/add_08600.bc A contrib/bc/tests/bc/scripts/add_08700.bc A contrib/bc/tests/bc/scripts/add_08800.bc A contrib/bc/tests/bc/scripts/add_08900.bc A contrib/bc/tests/bc/scripts/add_09000.bc A contrib/bc/tests/bc/scripts/add_09100.bc A contrib/bc/tests/bc/scripts/add_09200.bc A contrib/bc/tests/bc/scripts/add_09300.bc A contrib/bc/tests/bc/scripts/add_09400.bc A contrib/bc/tests/bc/scripts/add_09500.bc A contrib/bc/tests/bc/scripts/add_09600.bc A contrib/bc/tests/bc/scripts/add_09700.bc A contrib/bc/tests/bc/scripts/add_09800.bc A contrib/bc/tests/bc/scripts/add_09900.bc A contrib/bc/tests/bc/scripts/add_10000.bc M contrib/bc/tests/bc/scripts/all.txt R090 contrib/bc/tests/bc/scripts/divide.bc contrib/bc/tests/bc/scripts/divide_00100.bc A contrib/bc/tests/bc/scripts/divide_00200.bc A contrib/bc/tests/bc/scripts/divide_00300.bc A contrib/bc/tests/bc/scripts/divide_00400.bc A contrib/bc/tests/bc/scripts/divide_00500.bc A contrib/bc/tests/bc/scripts/divide_00600.bc A contrib/bc/tests/bc/scripts/divide_00700.bc A contrib/bc/tests/bc/scripts/divide_00800.bc A contrib/bc/tests/bc/scripts/divide_00900.bc A contrib/bc/tests/bc/scripts/divide_01000.bc A contrib/bc/tests/bc/scripts/divide_01100.bc A contrib/bc/tests/bc/scripts/divide_01200.bc A contrib/bc/tests/bc/scripts/divide_01300.bc A contrib/bc/tests/bc/scripts/divide_01400.bc A contrib/bc/tests/bc/scripts/divide_01500.bc A contrib/bc/tests/bc/scripts/divide_01600.bc A contrib/bc/tests/bc/scripts/divide_01700.bc A contrib/bc/tests/bc/scripts/divide_01800.bc A contrib/bc/tests/bc/scripts/divide_01900.bc A contrib/bc/tests/bc/scripts/divide_02000.bc A contrib/bc/tests/bc/scripts/divide_02100.bc A contrib/bc/tests/bc/scripts/divide_02200.bc A contrib/bc/tests/bc/scripts/divide_02300.bc A contrib/bc/tests/bc/scripts/divide_02400.bc A contrib/bc/tests/bc/scripts/divide_02500.bc A contrib/bc/tests/bc/scripts/divide_02600.bc A contrib/bc/tests/bc/scripts/divide_02700.bc A contrib/bc/tests/bc/scripts/divide_02800.bc A contrib/bc/tests/bc/scripts/divide_02900.bc A contrib/bc/tests/bc/scripts/divide_03000.bc A contrib/bc/tests/bc/scripts/divide_03100.bc A contrib/bc/tests/bc/scripts/divide_03200.bc A contrib/bc/tests/bc/scripts/divide_03300.bc A contrib/bc/tests/bc/scripts/divide_03400.bc A contrib/bc/tests/bc/scripts/divide_03500.bc A contrib/bc/tests/bc/scripts/divide_03600.bc A contrib/bc/tests/bc/scripts/divide_03700.bc A contrib/bc/tests/bc/scripts/divide_03800.bc A contrib/bc/tests/bc/scripts/divide_03900.bc A contrib/bc/tests/bc/scripts/divide_04000.bc A contrib/bc/tests/bc/scripts/divide_04100.bc A contrib/bc/tests/bc/scripts/divide_04200.bc A contrib/bc/tests/bc/scripts/divide_04300.bc A contrib/bc/tests/bc/scripts/divide_04400.bc A contrib/bc/tests/bc/scripts/divide_04500.bc A contrib/bc/tests/bc/scripts/divide_04600.bc A contrib/bc/tests/bc/scripts/divide_04700.bc A contrib/bc/tests/bc/scripts/divide_04800.bc A contrib/bc/tests/bc/scripts/divide_04900.bc A contrib/bc/tests/bc/scripts/divide_05000.bc A contrib/bc/tests/bc/scripts/divide_05100.bc A contrib/bc/tests/bc/scripts/divide_05200.bc A contrib/bc/tests/bc/scripts/divide_05300.bc A contrib/bc/tests/bc/scripts/divide_05400.bc A contrib/bc/tests/bc/scripts/divide_05500.bc A contrib/bc/tests/bc/scripts/divide_05600.bc A contrib/bc/tests/bc/scripts/divide_05700.bc A contrib/bc/tests/bc/scripts/divide_05800.bc A contrib/bc/tests/bc/scripts/divide_05900.bc A contrib/bc/tests/bc/scripts/divide_06000.bc A contrib/bc/tests/bc/scripts/divide_06100.bc A contrib/bc/tests/bc/scripts/divide_06200.bc A contrib/bc/tests/bc/scripts/divide_06300.bc A contrib/bc/tests/bc/scripts/divide_06400.bc A contrib/bc/tests/bc/scripts/divide_06500.bc A contrib/bc/tests/bc/scripts/divide_06600.bc A contrib/bc/tests/bc/scripts/divide_06700.bc A contrib/bc/tests/bc/scripts/divide_06800.bc A contrib/bc/tests/bc/scripts/divide_06900.bc A contrib/bc/tests/bc/scripts/divide_07000.bc A contrib/bc/tests/bc/scripts/divide_07100.bc A contrib/bc/tests/bc/scripts/divide_07200.bc A contrib/bc/tests/bc/scripts/divide_07300.bc A contrib/bc/tests/bc/scripts/divide_07400.bc A contrib/bc/tests/bc/scripts/divide_07500.bc A contrib/bc/tests/bc/scripts/divide_07600.bc A contrib/bc/tests/bc/scripts/divide_07700.bc A contrib/bc/tests/bc/scripts/divide_07800.bc A contrib/bc/tests/bc/scripts/divide_07900.bc A contrib/bc/tests/bc/scripts/divide_08000.bc A contrib/bc/tests/bc/scripts/divide_08100.bc A contrib/bc/tests/bc/scripts/divide_08200.bc A contrib/bc/tests/bc/scripts/divide_08300.bc A contrib/bc/tests/bc/scripts/divide_08400.bc A contrib/bc/tests/bc/scripts/divide_08500.bc A contrib/bc/tests/bc/scripts/divide_08600.bc A contrib/bc/tests/bc/scripts/divide_08700.bc A contrib/bc/tests/bc/scripts/divide_08800.bc A contrib/bc/tests/bc/scripts/divide_08900.bc A contrib/bc/tests/bc/scripts/divide_09000.bc A contrib/bc/tests/bc/scripts/divide_09100.bc A contrib/bc/tests/bc/scripts/divide_09200.bc A contrib/bc/tests/bc/scripts/divide_09300.bc A contrib/bc/tests/bc/scripts/divide_09400.bc A contrib/bc/tests/bc/scripts/divide_09500.bc A contrib/bc/tests/bc/scripts/divide_09600.bc A contrib/bc/tests/bc/scripts/divide_09700.bc A contrib/bc/tests/bc/scripts/divide_09800.bc A contrib/bc/tests/bc/scripts/divide_09900.bc A contrib/bc/tests/bc/scripts/divide_10000.bc R089 contrib/bc/tests/bc/scripts/multiply.bc contrib/bc/tests/bc/scripts/multiply_00100.bc A contrib/bc/tests/bc/scripts/multiply_00200.bc A contrib/bc/tests/bc/scripts/multiply_00300.bc A contrib/bc/tests/bc/scripts/multiply_00400.bc A contrib/bc/tests/bc/scripts/multiply_00500.bc A contrib/bc/tests/bc/scripts/multiply_00600.bc A contrib/bc/tests/bc/scripts/multiply_00700.bc A contrib/bc/tests/bc/scripts/multiply_00800.bc A contrib/bc/tests/bc/scripts/multiply_00900.bc A contrib/bc/tests/bc/scripts/multiply_01000.bc A contrib/bc/tests/bc/scripts/multiply_01100.bc A contrib/bc/tests/bc/scripts/multiply_01200.bc A contrib/bc/tests/bc/scripts/multiply_01300.bc A contrib/bc/tests/bc/scripts/multiply_01400.bc A contrib/bc/tests/bc/scripts/multiply_01500.bc A contrib/bc/tests/bc/scripts/multiply_01600.bc A contrib/bc/tests/bc/scripts/multiply_01700.bc A contrib/bc/tests/bc/scripts/multiply_01800.bc A contrib/bc/tests/bc/scripts/multiply_01900.bc A contrib/bc/tests/bc/scripts/multiply_02000.bc A contrib/bc/tests/bc/scripts/multiply_02100.bc A contrib/bc/tests/bc/scripts/multiply_02200.bc A contrib/bc/tests/bc/scripts/multiply_02300.bc A contrib/bc/tests/bc/scripts/multiply_02400.bc A contrib/bc/tests/bc/scripts/multiply_02500.bc A contrib/bc/tests/bc/scripts/multiply_02600.bc A contrib/bc/tests/bc/scripts/multiply_02700.bc A contrib/bc/tests/bc/scripts/multiply_02800.bc A contrib/bc/tests/bc/scripts/multiply_02900.bc A contrib/bc/tests/bc/scripts/multiply_03000.bc A contrib/bc/tests/bc/scripts/multiply_03100.bc A contrib/bc/tests/bc/scripts/multiply_03200.bc A contrib/bc/tests/bc/scripts/multiply_03300.bc A contrib/bc/tests/bc/scripts/multiply_03400.bc A contrib/bc/tests/bc/scripts/multiply_03500.bc A contrib/bc/tests/bc/scripts/multiply_03600.bc A contrib/bc/tests/bc/scripts/multiply_03700.bc A contrib/bc/tests/bc/scripts/multiply_03800.bc A contrib/bc/tests/bc/scripts/multiply_03900.bc A contrib/bc/tests/bc/scripts/multiply_04000.bc A contrib/bc/tests/bc/scripts/multiply_04100.bc A contrib/bc/tests/bc/scripts/multiply_04200.bc A contrib/bc/tests/bc/scripts/multiply_04300.bc A contrib/bc/tests/bc/scripts/multiply_04400.bc A contrib/bc/tests/bc/scripts/multiply_04500.bc A contrib/bc/tests/bc/scripts/multiply_04600.bc A contrib/bc/tests/bc/scripts/multiply_04700.bc A contrib/bc/tests/bc/scripts/multiply_04800.bc A contrib/bc/tests/bc/scripts/multiply_04900.bc A contrib/bc/tests/bc/scripts/multiply_05000.bc A contrib/bc/tests/bc/scripts/multiply_05100.bc A contrib/bc/tests/bc/scripts/multiply_05200.bc A contrib/bc/tests/bc/scripts/multiply_05300.bc A contrib/bc/tests/bc/scripts/multiply_05400.bc A contrib/bc/tests/bc/scripts/multiply_05500.bc A contrib/bc/tests/bc/scripts/multiply_05600.bc A contrib/bc/tests/bc/scripts/multiply_05700.bc A contrib/bc/tests/bc/scripts/multiply_05800.bc A contrib/bc/tests/bc/scripts/multiply_05900.bc A contrib/bc/tests/bc/scripts/multiply_06000.bc A contrib/bc/tests/bc/scripts/multiply_06100.bc A contrib/bc/tests/bc/scripts/multiply_06200.bc A contrib/bc/tests/bc/scripts/multiply_06300.bc A contrib/bc/tests/bc/scripts/multiply_06400.bc A contrib/bc/tests/bc/scripts/multiply_06500.bc A contrib/bc/tests/bc/scripts/multiply_06600.bc A contrib/bc/tests/bc/scripts/multiply_06700.bc A contrib/bc/tests/bc/scripts/multiply_06800.bc A contrib/bc/tests/bc/scripts/multiply_06900.bc A contrib/bc/tests/bc/scripts/multiply_07000.bc A contrib/bc/tests/bc/scripts/multiply_07100.bc A contrib/bc/tests/bc/scripts/multiply_07200.bc A contrib/bc/tests/bc/scripts/multiply_07300.bc A contrib/bc/tests/bc/scripts/multiply_07400.bc A contrib/bc/tests/bc/scripts/multiply_07500.bc A contrib/bc/tests/bc/scripts/multiply_07600.bc A contrib/bc/tests/bc/scripts/multiply_07700.bc A contrib/bc/tests/bc/scripts/multiply_07800.bc A contrib/bc/tests/bc/scripts/multiply_07900.bc A contrib/bc/tests/bc/scripts/multiply_08000.bc A contrib/bc/tests/bc/scripts/multiply_08100.bc A contrib/bc/tests/bc/scripts/multiply_08200.bc A contrib/bc/tests/bc/scripts/multiply_08300.bc A contrib/bc/tests/bc/scripts/multiply_08400.bc A contrib/bc/tests/bc/scripts/multiply_08500.bc A contrib/bc/tests/bc/scripts/multiply_08600.bc A contrib/bc/tests/bc/scripts/multiply_08700.bc A contrib/bc/tests/bc/scripts/multiply_08800.bc A contrib/bc/tests/bc/scripts/multiply_08900.bc A contrib/bc/tests/bc/scripts/multiply_09000.bc A contrib/bc/tests/bc/scripts/multiply_09100.bc A contrib/bc/tests/bc/scripts/multiply_09200.bc A contrib/bc/tests/bc/scripts/multiply_09300.bc A contrib/bc/tests/bc/scripts/multiply_09400.bc A contrib/bc/tests/bc/scripts/multiply_09500.bc A contrib/bc/tests/bc/scripts/multiply_09600.bc A contrib/bc/tests/bc/scripts/multiply_09700.bc A contrib/bc/tests/bc/scripts/multiply_09800.bc A contrib/bc/tests/bc/scripts/multiply_09900.bc A contrib/bc/tests/bc/scripts/multiply_10000.bc D contrib/bc/tests/bc/scripts/parse.bc A contrib/bc/tests/bc/scripts/parse_02.bc A contrib/bc/tests/bc/scripts/parse_03.bc A contrib/bc/tests/bc/scripts/parse_04.bc A contrib/bc/tests/bc/scripts/parse_05.bc A contrib/bc/tests/bc/scripts/parse_06.bc A contrib/bc/tests/bc/scripts/parse_07.bc A contrib/bc/tests/bc/scripts/parse_08.bc A contrib/bc/tests/bc/scripts/parse_09.bc A contrib/bc/tests/bc/scripts/parse_11.bc A contrib/bc/tests/bc/scripts/parse_12.bc A contrib/bc/tests/bc/scripts/parse_13.bc A contrib/bc/tests/bc/scripts/parse_14.bc A contrib/bc/tests/bc/scripts/parse_15.bc A contrib/bc/tests/bc/scripts/parse_16.bc D contrib/bc/tests/bc/scripts/print.bc A contrib/bc/tests/bc/scripts/print_002.bc A contrib/bc/tests/bc/scripts/print_003.bc A contrib/bc/tests/bc/scripts/print_004.bc A contrib/bc/tests/bc/scripts/print_005.bc A contrib/bc/tests/bc/scripts/print_006.bc A contrib/bc/tests/bc/scripts/print_007.bc A contrib/bc/tests/bc/scripts/print_008.bc A contrib/bc/tests/bc/scripts/print_009.bc A contrib/bc/tests/bc/scripts/print_011.bc A contrib/bc/tests/bc/scripts/print_012.bc A contrib/bc/tests/bc/scripts/print_013.bc A contrib/bc/tests/bc/scripts/print_014.bc A contrib/bc/tests/bc/scripts/print_015.bc A contrib/bc/tests/bc/scripts/print_016.bc A contrib/bc/tests/bc/scripts/print_017.bc A contrib/bc/tests/bc/scripts/print_018.bc A contrib/bc/tests/bc/scripts/print_019.bc A contrib/bc/tests/bc/scripts/print_020.bc A contrib/bc/tests/bc/scripts/print_021.bc A contrib/bc/tests/bc/scripts/print_022.bc A contrib/bc/tests/bc/scripts/print_023.bc A contrib/bc/tests/bc/scripts/print_024.bc A contrib/bc/tests/bc/scripts/print_025.bc A contrib/bc/tests/bc/scripts/print_026.bc A contrib/bc/tests/bc/scripts/print_027.bc A contrib/bc/tests/bc/scripts/print_028.bc A contrib/bc/tests/bc/scripts/print_029.bc A contrib/bc/tests/bc/scripts/print_030.bc A contrib/bc/tests/bc/scripts/print_031.bc A contrib/bc/tests/bc/scripts/print_032.bc A contrib/bc/tests/bc/scripts/print_033.bc A contrib/bc/tests/bc/scripts/print_034.bc A contrib/bc/tests/bc/scripts/print_035.bc A contrib/bc/tests/bc/scripts/print_036.bc A contrib/bc/tests/bc/scripts/print_037.bc A contrib/bc/tests/bc/scripts/print_038.bc A contrib/bc/tests/bc/scripts/print_039.bc A contrib/bc/tests/bc/scripts/print_040.bc A contrib/bc/tests/bc/scripts/print_041.bc A contrib/bc/tests/bc/scripts/print_042.bc A contrib/bc/tests/bc/scripts/print_043.bc A contrib/bc/tests/bc/scripts/print_044.bc A contrib/bc/tests/bc/scripts/print_045.bc A contrib/bc/tests/bc/scripts/print_046.bc A contrib/bc/tests/bc/scripts/print_047.bc A contrib/bc/tests/bc/scripts/print_048.bc A contrib/bc/tests/bc/scripts/print_049.bc A contrib/bc/tests/bc/scripts/print_050.bc A contrib/bc/tests/bc/scripts/print_051.bc A contrib/bc/tests/bc/scripts/print_052.bc A contrib/bc/tests/bc/scripts/print_053.bc A contrib/bc/tests/bc/scripts/print_054.bc A contrib/bc/tests/bc/scripts/print_055.bc A contrib/bc/tests/bc/scripts/print_056.bc A contrib/bc/tests/bc/scripts/print_057.bc A contrib/bc/tests/bc/scripts/print_058.bc A contrib/bc/tests/bc/scripts/print_059.bc A contrib/bc/tests/bc/scripts/print_060.bc A contrib/bc/tests/bc/scripts/print_061.bc A contrib/bc/tests/bc/scripts/print_062.bc A contrib/bc/tests/bc/scripts/print_063.bc A contrib/bc/tests/bc/scripts/print_064.bc A contrib/bc/tests/bc/scripts/print_065.bc A contrib/bc/tests/bc/scripts/print_066.bc A contrib/bc/tests/bc/scripts/print_067.bc A contrib/bc/tests/bc/scripts/print_068.bc A contrib/bc/tests/bc/scripts/print_069.bc A contrib/bc/tests/bc/scripts/print_070.bc A contrib/bc/tests/bc/scripts/print_071.bc A contrib/bc/tests/bc/scripts/print_072.bc A contrib/bc/tests/bc/scripts/print_073.bc A contrib/bc/tests/bc/scripts/print_074.bc A contrib/bc/tests/bc/scripts/print_075.bc A contrib/bc/tests/bc/scripts/print_076.bc A contrib/bc/tests/bc/scripts/print_077.bc A contrib/bc/tests/bc/scripts/print_078.bc A contrib/bc/tests/bc/scripts/print_079.bc A contrib/bc/tests/bc/scripts/print_080.bc A contrib/bc/tests/bc/scripts/print_081.bc A contrib/bc/tests/bc/scripts/print_082.bc A contrib/bc/tests/bc/scripts/print_083.bc A contrib/bc/tests/bc/scripts/print_084.bc A contrib/bc/tests/bc/scripts/print_085.bc A contrib/bc/tests/bc/scripts/print_086.bc A contrib/bc/tests/bc/scripts/print_087.bc A contrib/bc/tests/bc/scripts/print_088.bc A contrib/bc/tests/bc/scripts/print_089.bc A contrib/bc/tests/bc/scripts/print_090.bc A contrib/bc/tests/bc/scripts/print_091.bc A contrib/bc/tests/bc/scripts/print_092.bc A contrib/bc/tests/bc/scripts/print_093.bc A contrib/bc/tests/bc/scripts/print_094.bc A contrib/bc/tests/bc/scripts/print_095.bc A contrib/bc/tests/bc/scripts/print_096.bc A contrib/bc/tests/bc/scripts/print_097.bc A contrib/bc/tests/bc/scripts/print_098.bc A contrib/bc/tests/bc/scripts/print_099.bc A contrib/bc/tests/bc/scripts/print_100.bc R086 contrib/bc/tests/bc/scripts/subtract.bc contrib/bc/tests/bc/scripts/subtract_00100.bc A contrib/bc/tests/bc/scripts/subtract_00200.bc A contrib/bc/tests/bc/scripts/subtract_00300.bc A contrib/bc/tests/bc/scripts/subtract_00400.bc A contrib/bc/tests/bc/scripts/subtract_00500.bc A contrib/bc/tests/bc/scripts/subtract_00600.bc A contrib/bc/tests/bc/scripts/subtract_00700.bc A contrib/bc/tests/bc/scripts/subtract_00800.bc A contrib/bc/tests/bc/scripts/subtract_00900.bc A contrib/bc/tests/bc/scripts/subtract_01000.bc A contrib/bc/tests/bc/scripts/subtract_01100.bc A contrib/bc/tests/bc/scripts/subtract_01200.bc A contrib/bc/tests/bc/scripts/subtract_01300.bc A contrib/bc/tests/bc/scripts/subtract_01400.bc A contrib/bc/tests/bc/scripts/subtract_01500.bc A contrib/bc/tests/bc/scripts/subtract_01600.bc A contrib/bc/tests/bc/scripts/subtract_01700.bc A contrib/bc/tests/bc/scripts/subtract_01800.bc A contrib/bc/tests/bc/scripts/subtract_01900.bc A contrib/bc/tests/bc/scripts/subtract_02000.bc A contrib/bc/tests/bc/scripts/subtract_02100.bc A contrib/bc/tests/bc/scripts/subtract_02200.bc A contrib/bc/tests/bc/scripts/subtract_02300.bc A contrib/bc/tests/bc/scripts/subtract_02400.bc A contrib/bc/tests/bc/scripts/subtract_02500.bc A contrib/bc/tests/bc/scripts/subtract_02600.bc A contrib/bc/tests/bc/scripts/subtract_02700.bc A contrib/bc/tests/bc/scripts/subtract_02800.bc A contrib/bc/tests/bc/scripts/subtract_02900.bc A contrib/bc/tests/bc/scripts/subtract_03000.bc A contrib/bc/tests/bc/scripts/subtract_03100.bc A contrib/bc/tests/bc/scripts/subtract_03200.bc A contrib/bc/tests/bc/scripts/subtract_03300.bc A contrib/bc/tests/bc/scripts/subtract_03400.bc A contrib/bc/tests/bc/scripts/subtract_03500.bc A contrib/bc/tests/bc/scripts/subtract_03600.bc A contrib/bc/tests/bc/scripts/subtract_03700.bc A contrib/bc/tests/bc/scripts/subtract_03800.bc A contrib/bc/tests/bc/scripts/subtract_03900.bc A contrib/bc/tests/bc/scripts/subtract_04000.bc A contrib/bc/tests/bc/scripts/subtract_04100.bc A contrib/bc/tests/bc/scripts/subtract_04200.bc A contrib/bc/tests/bc/scripts/subtract_04300.bc A contrib/bc/tests/bc/scripts/subtract_04400.bc A contrib/bc/tests/bc/scripts/subtract_04500.bc A contrib/bc/tests/bc/scripts/subtract_04600.bc A contrib/bc/tests/bc/scripts/subtract_04700.bc A contrib/bc/tests/bc/scripts/subtract_04800.bc A contrib/bc/tests/bc/scripts/subtract_04900.bc A contrib/bc/tests/bc/scripts/subtract_05000.bc A contrib/bc/tests/bc/scripts/subtract_05100.bc A contrib/bc/tests/bc/scripts/subtract_05200.bc A contrib/bc/tests/bc/scripts/subtract_05300.bc A contrib/bc/tests/bc/scripts/subtract_05400.bc A contrib/bc/tests/bc/scripts/subtract_05500.bc A contrib/bc/tests/bc/scripts/subtract_05600.bc A contrib/bc/tests/bc/scripts/subtract_05700.bc A contrib/bc/tests/bc/scripts/subtract_05800.bc A contrib/bc/tests/bc/scripts/subtract_05900.bc A contrib/bc/tests/bc/scripts/subtract_06000.bc A contrib/bc/tests/bc/scripts/subtract_06100.bc A contrib/bc/tests/bc/scripts/subtract_06200.bc A contrib/bc/tests/bc/scripts/subtract_06300.bc A contrib/bc/tests/bc/scripts/subtract_06400.bc A contrib/bc/tests/bc/scripts/subtract_06500.bc A contrib/bc/tests/bc/scripts/subtract_06600.bc A contrib/bc/tests/bc/scripts/subtract_06700.bc A contrib/bc/tests/bc/scripts/subtract_06800.bc A contrib/bc/tests/bc/scripts/subtract_06900.bc A contrib/bc/tests/bc/scripts/subtract_07000.bc A contrib/bc/tests/bc/scripts/subtract_07100.bc A contrib/bc/tests/bc/scripts/subtract_07200.bc A contrib/bc/tests/bc/scripts/subtract_07300.bc A contrib/bc/tests/bc/scripts/subtract_07400.bc A contrib/bc/tests/bc/scripts/subtract_07500.bc A contrib/bc/tests/bc/scripts/subtract_07600.bc A contrib/bc/tests/bc/scripts/subtract_07700.bc A contrib/bc/tests/bc/scripts/subtract_07800.bc A contrib/bc/tests/bc/scripts/subtract_07900.bc A contrib/bc/tests/bc/scripts/subtract_08000.bc A contrib/bc/tests/bc/scripts/subtract_08100.bc A contrib/bc/tests/bc/scripts/subtract_08200.bc A contrib/bc/tests/bc/scripts/subtract_08300.bc A contrib/bc/tests/bc/scripts/subtract_08400.bc A contrib/bc/tests/bc/scripts/subtract_08500.bc A contrib/bc/tests/bc/scripts/subtract_08600.bc A contrib/bc/tests/bc/scripts/subtract_08700.bc A contrib/bc/tests/bc/scripts/subtract_08800.bc A contrib/bc/tests/bc/scripts/subtract_08900.bc A contrib/bc/tests/bc/scripts/subtract_09000.bc A contrib/bc/tests/bc/scripts/subtract_09100.bc A contrib/bc/tests/bc/scripts/subtract_09200.bc A contrib/bc/tests/bc/scripts/subtract_09300.bc A contrib/bc/tests/bc/scripts/subtract_09400.bc A contrib/bc/tests/bc/scripts/subtract_09500.bc A contrib/bc/tests/bc/scripts/subtract_09600.bc A contrib/bc/tests/bc/scripts/subtract_09700.bc A contrib/bc/tests/bc/scripts/subtract_09800.bc A contrib/bc/tests/bc/scripts/subtract_09900.bc A contrib/bc/tests/bc/scripts/subtract_10000.bc M contrib/bc/tests/bc/timeconst.sh M contrib/bc/tests/bcl.c A contrib/bc/tests/dc/scripts/easter.dc D contrib/bc/tests/dc/scripts/easter.sh A contrib/bc/tests/dc/scripts/easter.txt M contrib/bc/tests/dc/scripts/prime.dc M contrib/bc/tests/error.sh M contrib/bc/tests/errors.sh M contrib/bc/tests/extra_required.txt M contrib/bc/tests/history.py M contrib/bc/tests/history.sh D contrib/bc/tests/other.sh D contrib/bc/tests/read.sh M contrib/bc/tests/script.sh M contrib/bc/tests/scripts.sh M contrib/bc/tests/stdin.sh M contrib/bc/tests/test.sh M contrib/bc/vs/bc.vcxproj M contrib/bc/vs/bc.vcxproj.filters M contrib/bc/vs/bcl.vcxproj M contrib/bc/vs/bcl.vcxproj.filters M usr.bin/gh-bc/Makefile M usr.bin/gh-bc/tests/Makefile ____________________________________________________________________________________________________________ Commit: 639eaea58e5ba9f36e23c0f9f928640bd9fb74e3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=639eaea58e5ba9f36e23c0f9f928640bd9fb74e3 Author: Jasper Tran O'Leary (Tue 28 Oct 2025 20:43:35 GMT) Committer: Alexander Ziaee (Tue 4 Nov 2025 18:16:55 GMT) nvme: Add handling for bar5 The NVMe spec allows the Table BIR (TBIR) and PBA DIR (PBIR) to be 0, 4, or 5. The existing NVMe driver basically only has support for 4, perhaps under the assumption that BAR4 is 64-bit and also occupies BAR5. This change adds support for BAR5, covering the case where BAR4 and BAR5 might both be present and 32-bit, where the Table BIR might be 4 and the PBA BIR might be 5, or vice versa. The NVMe spec (in the SR-IOV section) also permits VFs to use BIR=2, so I haven't added stricter checks on which BIR will be permitted by the driver. This enables FreeBSD on Google Compute Engine C4 Machines. MFC after: 3 days Reviewed by: imp Sponsored by: Google Co-authored-by: Matt Delco Signed-off-by: Jasper Tran O'Leary Differential Revision: https://reviews.freebsd.org/D53140 (cherry picked from commit 7b32f4f0a7fe9b1b2f5a3905ca15f656713255ad) M sys/dev/nvme/nvme_ctrlr.c M sys/dev/nvme/nvme_pci.c M sys/dev/nvme/nvme_private.h ____________________________________________________________________________________________________________ Commit: 94360584542abc49a1d947844cf4d8ca1369d4df URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=94360584542abc49a1d947844cf4d8ca1369d4df Author: Kyle Evans (Sat 1 Nov 2025 17:34:11 GMT) Committer: Kyle Evans (Tue 4 Nov 2025 00:52:12 GMT) ipfw: pmod: avoid further rule processing after tcp-mod failures m_pullup() here will have freed the mbuf chain, but we pass back an IP_FW_DENY without any signal that the outer loop should finish. Thus, rule processing continues without an mbuf and there's a chance that we conclude that the packet may pass (but there's no mbuf remaining) depending on the rules that follow it. PR: 284606 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284606 ) Reviewed by: ae (cherry picked from commit c0382512bfce872102d213b9bc2550de0bc30b67) M sys/netpfil/ipfw/pmod/tcpmod.c ____________________________________________________________________________________________________________ Commit: 1b969a57d0d1cd8d4505984820a365f721e6efc6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1b969a57d0d1cd8d4505984820a365f721e6efc6 Author: Martin Matuska (Tue 21 Oct 2025 15:10:15 BST) Committer: Martin Matuska (Mon 3 Nov 2025 09:30:24 GMT) libarchive: merge from vendor branch Update libarchive to 3.8.2 Important bugfixes: #2477 tar writer: fix replacing a regular file with a dir for ARCHIVE_EXTRACT_SAFE_WRITES #2659 lib: improve filter process handling #2664 zip writer: fix a memory leak if write callback error early #2665 lib: archive_read_data: handle sparse holes at end of file correctly #2668 7zip: Fix out of boundary access #2670 zip writer: fix writing with ZSTD compression #2672 lib: fix error checking in writing files #2678 zstd write filter: enable Zstandard's checksum feature #2679 lib: handle possible errors from system calls #2707 lib: avoid leaking file descriptors into subprocesses #2713 RAR5 reader: fix multiple issues in extra field parsing function #2716 RAR5 reader: early fail when file declares data for a dir entry #2717 bsdtar: Allow filename to have CRLF endings #2719 tar reader: fix checking the result of the strftime (CVE-2025-25724) #2737 tar reader: fix an infinite loop when parsing V headers #2742 lib: parse_date: handle dates in 2038 and beyond if time_t is big enough Obtained from: libarchive Vendor commit: 7f53fce04e4e672230f4eb80b219af17975e4f83 Security: CVE-2025-25724 PR: 290303 (exp-run, main) (cherry picked from commit 401026e4825a05abba6f945cf1b74b3328876fa2) M contrib/libarchive/NEWS M contrib/libarchive/SECURITY.md M contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh M contrib/libarchive/cat/bsdcat.c M contrib/libarchive/cat/cmdline.c M contrib/libarchive/cpio/cmdline.c M contrib/libarchive/cpio/cpio.c M contrib/libarchive/cpio/test/test_owner_parse.c M contrib/libarchive/libarchive/archive.h M contrib/libarchive/libarchive/archive_acl.c M contrib/libarchive/libarchive/archive_check_magic.c M contrib/libarchive/libarchive/archive_cryptor.c M contrib/libarchive/libarchive/archive_cryptor_private.h M contrib/libarchive/libarchive/archive_entry.h M contrib/libarchive/libarchive/archive_entry_paths.3 M contrib/libarchive/libarchive/archive_entry_stat.c M contrib/libarchive/libarchive/archive_parse_date.c M contrib/libarchive/libarchive/archive_platform.h A contrib/libarchive/libarchive/archive_platform_stat.h M contrib/libarchive/libarchive/archive_private.h M contrib/libarchive/libarchive/archive_read.c M contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c M contrib/libarchive/libarchive/archive_read_disk_posix.c M contrib/libarchive/libarchive/archive_read_open_fd.c M contrib/libarchive/libarchive/archive_read_open_file.c M contrib/libarchive/libarchive/archive_read_open_filename.c M contrib/libarchive/libarchive/archive_read_set_format.c M contrib/libarchive/libarchive/archive_read_support_filter_program.c M contrib/libarchive/libarchive/archive_read_support_format_7zip.c M contrib/libarchive/libarchive/archive_read_support_format_mtree.c M contrib/libarchive/libarchive/archive_read_support_format_rar.c M contrib/libarchive/libarchive/archive_read_support_format_rar5.c M contrib/libarchive/libarchive/archive_read_support_format_tar.c M contrib/libarchive/libarchive/archive_read_support_format_warc.c M contrib/libarchive/libarchive/archive_read_support_format_xar.c M contrib/libarchive/libarchive/archive_read_support_format_zip.c M contrib/libarchive/libarchive/archive_string.c M contrib/libarchive/libarchive/archive_string_sprintf.c M contrib/libarchive/libarchive/archive_util.c M contrib/libarchive/libarchive/archive_write.c M contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c M contrib/libarchive/libarchive/archive_write_add_filter_gzip.c M contrib/libarchive/libarchive/archive_write_add_filter_program.c M contrib/libarchive/libarchive/archive_write_add_filter_zstd.c M contrib/libarchive/libarchive/archive_write_disk_posix.c M contrib/libarchive/libarchive/archive_write_open_fd.c M contrib/libarchive/libarchive/archive_write_open_file.c M contrib/libarchive/libarchive/archive_write_open_filename.c M contrib/libarchive/libarchive/archive_write_set_format_7zip.c M contrib/libarchive/libarchive/archive_write_set_format_mtree.c M contrib/libarchive/libarchive/archive_write_set_format_xar.c M contrib/libarchive/libarchive/archive_write_set_format_zip.c M contrib/libarchive/libarchive/filter_fork_posix.c M contrib/libarchive/libarchive/test/test_acl_nfs4.c M contrib/libarchive/libarchive/test/test_acl_posix1e.c M contrib/libarchive/libarchive/test/test_archive_parse_date.c M contrib/libarchive/libarchive/test/test_archive_string_conversion.c M contrib/libarchive/libarchive/test/test_entry.c M contrib/libarchive/libarchive/test/test_read_filter_gzip_recursive.c M contrib/libarchive/libarchive/test/test_read_format_7zip.c M contrib/libarchive/libarchive/test/test_read_format_rar5.c A contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu A contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu A contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu A contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu A contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c A contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu M contrib/libarchive/libarchive/test/test_read_set_format.c M contrib/libarchive/libarchive/test/test_write_filter_bzip2.c M contrib/libarchive/libarchive/test/test_write_filter_gzip.c M contrib/libarchive/libarchive/test/test_write_filter_gzip_timestamp.c R099 contrib/libarchive/libarchive_fe/err.c contrib/libarchive/libarchive_fe/lafe_err.c R100 contrib/libarchive/libarchive_fe/err.h contrib/libarchive/libarchive_fe/lafe_err.h M contrib/libarchive/libarchive_fe/line_reader.c M contrib/libarchive/libarchive_fe/passphrase.c M contrib/libarchive/tar/bsdtar.c M contrib/libarchive/tar/bsdtar.h M contrib/libarchive/tar/cmdline.c M contrib/libarchive/tar/creation_set.c M contrib/libarchive/tar/read.c M contrib/libarchive/tar/subst.c A contrib/libarchive/tar/test/test_crlf_mtree.c M contrib/libarchive/tar/test/test_option_safe_writes.c M contrib/libarchive/tar/util.c M contrib/libarchive/tar/write.c M contrib/libarchive/test_utils/test_common.h M contrib/libarchive/test_utils/test_main.c M contrib/libarchive/unzip/bsdunzip.c M contrib/libarchive/unzip/cmdline.c M contrib/libarchive/unzip/test/test_C.c M contrib/libarchive/unzip/test/test_L.c M contrib/libarchive/unzip/test/test_P_encryption.c M contrib/libarchive/unzip/test/test_basic.c M contrib/libarchive/unzip/test/test_d.c M contrib/libarchive/unzip/test/test_doubledash.c M contrib/libarchive/unzip/test/test_glob.c M contrib/libarchive/unzip/test/test_j.c M contrib/libarchive/unzip/test/test_n.c M contrib/libarchive/unzip/test/test_o.c M contrib/libarchive/unzip/test/test_p.c M contrib/libarchive/unzip/test/test_q.c M contrib/libarchive/unzip/test/test_singlefile.c M contrib/libarchive/unzip/test/test_t.c M contrib/libarchive/unzip/test/test_x.c M lib/libarchive/tests/Makefile M usr.bin/bsdcat/Makefile M usr.bin/cpio/Makefile M usr.bin/cpio/tests/Makefile M usr.bin/tar/Makefile M usr.bin/tar/tests/Makefile M usr.bin/unzip/Makefile M usr.bin/unzip/tests/Makefile ____________________________________________________________________________________________________________ Commit: 8f92db3cf5405e38f565591d878c7b1b409dc055 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8f92db3cf5405e38f565591d878c7b1b409dc055 Author: Kristof Provost (Wed 29 Oct 2025 08:28:59 GMT) Committer: Kristof Provost (Mon 3 Nov 2025 08:34:27 GMT) pf: improve DIOCRCLRTABLES validation Unterminated strings in the anchor or name could cause crashes. Validate them, and add a test case. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1da3c0ca5b1decaa9cf55859cd134bdcd1218116) M sys/netpfil/pf/pf_ioctl.c M tests/sys/netpfil/pf/ioctl/validation.c ____________________________________________________________________________________________________________ Commit: ba198fe8a03bbe1e11efcd651d7ef7c83837efbe URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ba198fe8a03bbe1e11efcd651d7ef7c83837efbe Author: Kristof Provost (Wed 29 Oct 2025 10:40:52 GMT) Committer: Kristof Provost (Mon 3 Nov 2025 08:34:26 GMT) pf: improve add state validation Both for the DIOCADDSTATE ioctl and for states imported through pfsync packets. Add a test case to exercise this code path. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit faacc0d968816cf8714c974b6d8df6191cfb0e0d) M sys/netpfil/pf/if_pfsync.c M tests/sys/netpfil/pf/ioctl/validation.c ____________________________________________________________________________________________________________ Commit: 22d678c93e33385442e330fcd493f96574900e3c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=22d678c93e33385442e330fcd493f96574900e3c Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Tue 28 Oct 2025 17:59:11 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Fri 31 Oct 2025 11:38:18 GMT) tuning.7 stats.7: Cross-reference MFC after: 3 days (cherry picked from commit b2c5686755757535a6c3223b31fb96b64a961f15) M share/man/man7/stats.7 M share/man/man7/tuning.7 ____________________________________________________________________________________________________________ Commit: be3e8a9cc8aeac41ad1027e7a1e38a1c2c77355d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=be3e8a9cc8aeac41ad1027e7a1e38a1c2c77355d Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Tue 28 Oct 2025 18:10:25 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Fri 31 Oct 2025 11:37:10 GMT) getvfsbyname.3 mount.8: Reference lsvfs(1) MFC after: 3 days Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D53411 (cherry picked from commit cb1315c15acf7d3fae66b2c5631e076776683f96) M lib/libc/gen/getvfsbyname.3 M sbin/mount/mount.8 ____________________________________________________________________________________________________________ Commit: d99e5a7cc4541cf0476bc353ae7950726badf8f7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d99e5a7cc4541cf0476bc353ae7950726badf8f7 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 27 Sep 2025 16:21:13 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Fri 31 Oct 2025 11:35:06 GMT) geom: zero: Let sysctls .byte and .clear to be settable in loader There is no reason to not allow kern.geom.zero.byte and kern.geom.zero.clear to be settable as a tunable. Reviewed by: imp, markj Approved by: markj (mentor) MFC after: 1 week Event: EuroBSDCon 2025 Differential Revision: https://reviews.freebsd.org/D52763 (cherry picked from commit ae17bca63f0a03e6e46ea679a5be7f8851f82099) M sys/geom/zero/g_zero.c ____________________________________________________________________________________________________________ Commit: 4f87ec9825283e5f3c4eabd31e69acd030236d5e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4f87ec9825283e5f3c4eabd31e69acd030236d5e Author: Mark Johnston (Mon 27 Oct 2025 16:27:13 GMT) Committer: Mark Johnston (Thu 30 Oct 2025 14:09:58 GMT) net: Validate interface group names in ioctl handlers The handlers were not checking that the group names are nul-terminated. Add checks for this. Reported by: Ilja Van Sprundel Reviewed by: zlei MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53344 (cherry picked from commit 32919a34f17ac1af99dec7376f22a8393c251602) M sys/net/if.c ____________________________________________________________________________________________________________ Commit: 83f74730dba10190ee157be129d4dce46592ab2a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=83f74730dba10190ee157be129d4dce46592ab2a Author: Mark Johnston (Mon 27 Oct 2025 16:27:40 GMT) Committer: Mark Johnston (Thu 30 Oct 2025 14:09:58 GMT) altq: Clear stats structures in get_class_stats() These structures are copied out to userspace, and it's possible to leak uninitialized stack bytes since these routines and their callers weren't careful to clear them first. Add memsets to avoid this. Reported by: Ilja Van Sprundel Reviewed by: kp, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53342 (cherry picked from commit ff08916e9ac689e6ce734de72325fc2bd9495a35) M sys/net/altq/altq_cbq.c M sys/net/altq/altq_fairq.c M sys/net/altq/altq_priq.c ____________________________________________________________________________________________________________ Commit: fb7f92c346905a0fde8aeb239c4fb96e576dd604 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fb7f92c346905a0fde8aeb239c4fb96e576dd604 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Thu 9 Oct 2025 16:47:25 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Thu 30 Oct 2025 13:00:35 GMT) uio.9: Improve description of uio_rw flags The direction of the data transfer in uio(9) can be confusing, so state explicitly the difference between UIO_READ and UIO_WRITE. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52996 (cherry picked from commit 0625f470e0956a3a337e4999f6712ec7b7d872e5) M share/man/man9/uio.9 ____________________________________________________________________________________________________________ Commit: 71dcae4412067dd7a95ca31826c1bca6cd9d596a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=71dcae4412067dd7a95ca31826c1bca6cd9d596a Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Fri 24 Oct 2025 20:22:32 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Thu 30 Oct 2025 12:59:24 GMT) style.mdoc.5: Point readers to style(9) regarding copyright headers While here, fix the ordering of the elements in the copyright header per style(9) and remove the text of the license as we already have the SPDX tag here. MFC after: 3 days (cherry picked from commit 3cc7d67155dad57e0d10f02a584fda6c8f2ea0b2) M share/man/man5/style.mdoc.5 ____________________________________________________________________________________________________________ Commit: fbf5c60dc4bdbd76d0e21538fddc1ee34242e972 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fbf5c60dc4bdbd76d0e21538fddc1ee34242e972 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Fri 24 Oct 2025 19:13:02 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Thu 30 Oct 2025 12:55:58 GMT) examples/mdoc: Remove text of BSD-2-Clause from mdoc examples We live in the SPDX world now and our example manual pages should reflect that. Also, fix the order of the SPDX and copyright lines as per style(9). Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53335 (cherry picked from commit 83ac79599f6b94c57321ce3738fc28d1fa6a6c60) M share/examples/mdoc/example.1 M share/examples/mdoc/example.3 M share/examples/mdoc/example.4 M share/examples/mdoc/example.9 ____________________________________________________________________________________________________________ Commit: 78061ae6a9e92282ffadd874ba71c724b90b5248 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=78061ae6a9e92282ffadd874ba71c724b90b5248 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Sun 26 Oct 2025 16:31:37 GMT) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Thu 30 Oct 2025 12:36:43 GMT) g_bio.9: Reference dtrace_io(4) MFC after: 3 days (cherry picked from commit 3559b8e98341d7087771516b1d8f9560a5c555b4) M share/man/man9/g_bio.9 ____________________________________________________________________________________________________________ Commit: 7849f088cde5aec62af040ffbae446320cbcf316 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7849f088cde5aec62af040ffbae446320cbcf316 Author: Dimitry Andric (Wed 29 Oct 2025 18:49:54 GMT) Committer: Dimitry Andric (Thu 30 Oct 2025 08:25:11 GMT) Merge commit e24f90190c77 from llvm git (by Brad Smith): [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) The compiler_rt helper functions have been built since 12.4, 13.1, 14 and anything newer. MFC after: 3 days (cherry picked from commit 51e8e8b0f36933814b1be08913857727876aece5) M contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h ____________________________________________________________________________________________________________ Commit: ce8559897261b0610990b88a18efa44df42a9747 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ce8559897261b0610990b88a18efa44df42a9747 Author: Dag-Erling Smørgrav (Thu 23 Oct 2025 11:28:44 BST) Committer: Dag-Erling Smørgrav (Tue 28 Oct 2025 11:08:30 GMT) w: Trim whitespace and commas from time and uptime When producing formatted output, trim leading whitespace and trailing commas from the human-readable time and uptime before emitting them. The text output remains unchanged. PR: 290089 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290089 ) Fixes: 6e6febb54da9 ("w: Fix idle time in json output, add login/idle times to json output") Reviewed by: marius.h_lden.org Differential Revision: https://reviews.freebsd.org/D53167 (cherry picked from commit 4d5789532a940144c869d66505e756ce816f8a50) M usr.bin/w/w.c ____________________________________________________________________________________________________________ Commit: 93263ae5eab61bedb4a17638dd53b2dd5d0aa71e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=93263ae5eab61bedb4a17638dd53b2dd5d0aa71e Author: Jose Luis Duran (Wed 22 Oct 2025 23:41:03 BST) Committer: Jose Luis Duran (Mon 27 Oct 2025 13:08:11 GMT) mtree: Remove stray wi directory Reviewed by: imp, emaste Fixes: a21def4d568f ("pccard: Remove wi(4) driver") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53264 (cherry picked from commit f942a7465469008f7538436a70f15a44cabecbb0) M etc/mtree/BSD.include.dist ____________________________________________________________________________________________________________ Commit: 4efaa7834793c004deefc79d81cd49f251906e61 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4efaa7834793c004deefc79d81cd49f251906e61 Author: Cy Schubert (Thu 23 Oct 2025 19:56:54 BST) Committer: Cy Schubert (Sun 26 Oct 2025 03:15:14 GMT) unbound: Vendor import 1.24.1 Release notes at https://nlnetlabs.nl/news/2025/Oct/22/unbound-1.24.1-released/ Security: CVE-2025-11411 Merge commit '73dd92916f532cb3fe353220103babe576d30a15' (cherry picked from commit 8b29c373e6ab530b62122ea2adcbe637c07e06c9) M contrib/unbound/aclocal.m4 M contrib/unbound/configure M contrib/unbound/configure.ac M contrib/unbound/daemon/remote.c M contrib/unbound/doc/README M contrib/unbound/doc/example.conf.in M contrib/unbound/doc/libunbound.3.in M contrib/unbound/doc/unbound-anchor.8.in M contrib/unbound/doc/unbound-checkconf.8.in M contrib/unbound/doc/unbound-control.8.in M contrib/unbound/doc/unbound-control.rst M contrib/unbound/doc/unbound-host.1.in M contrib/unbound/doc/unbound.8.in M contrib/unbound/doc/unbound.conf.5.in M contrib/unbound/doc/unbound.conf.rst M contrib/unbound/install-sh M contrib/unbound/iterator/iter_scrub.c M contrib/unbound/ltmain.sh D contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.conf D contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.test D contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.testns D contrib/unbound/testdata/acl_interface.tdir/acl_interface.conf D contrib/unbound/testdata/acl_interface.tdir/acl_interface.test.scenario D contrib/unbound/testdata/auth_nsec3_ent_with_out_of_zone_data.rpl D contrib/unbound/testdata/auth_nsec3_wild_with_out_of_zone_data.rpl D contrib/unbound/testdata/auth_tls.tdir/auth_tls.pre D contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.pre D contrib/unbound/testdata/cachedb_expired.crpl D contrib/unbound/testdata/cachedb_expired_reply_ttl.crpl D contrib/unbound/testdata/cachedb_servfail_cname.crpl D contrib/unbound/testdata/cachedb_val_expired.crpl D contrib/unbound/testdata/common.sh D contrib/unbound/testdata/dns_error_reporting.rpl D contrib/unbound/testdata/dnstap.tdir/dnstap.conf D contrib/unbound/testdata/fast_reload_fwd.tdir/auth1.zone D contrib/unbound/testdata/fast_reload_fwd.tdir/auth2.zone D contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.conf D contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.conf2 D contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.dsc D contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.ns1 D contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.ns2 D contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.post D contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.pre D contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.test D contrib/unbound/testdata/fast_reload_most_options.tdir/auth.nlnetlabs.nl.zone D contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.conf D contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.dsc D contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.post D contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.pre D contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.test D contrib/unbound/testdata/fast_reload_most_options.tdir/rpz.nlnetlabs.nl.zone D contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.conf D contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.dsc D contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.post D contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.pre D contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.test D contrib/unbound/testdata/fwd_0ttlservfail.rpl D contrib/unbound/testdata/iter_failreply.rpl D contrib/unbound/testdata/iter_fwdfirstequaltcp.rpl D contrib/unbound/testdata/iter_fwdstubauth.rpl D contrib/unbound/testdata/iter_minimise_chain.rpl D contrib/unbound/testdata/iter_scrub_rr_length.rpl D contrib/unbound/testdata/log_servfail.tdir/log_servfail.conf D contrib/unbound/testdata/log_servfail.tdir/log_servfail.dsc D contrib/unbound/testdata/log_servfail.tdir/log_servfail.post D contrib/unbound/testdata/log_servfail.tdir/log_servfail.pre D contrib/unbound/testdata/log_servfail.tdir/log_servfail.test D contrib/unbound/testdata/redis_reconnect_interval.tdir/after.zone D contrib/unbound/testdata/redis_reconnect_interval.tdir/before.zone D contrib/unbound/testdata/redis_reconnect_interval.tdir/redis.conf D contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.conf D contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.dsc D contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.post D contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.pre D contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.test D contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.key D contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.pem D contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.key D contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.pem D contrib/unbound/testdata/redis_replica.tdir/after.zone D contrib/unbound/testdata/redis_replica.tdir/before.zone D contrib/unbound/testdata/redis_replica.tdir/redis.conf D contrib/unbound/testdata/redis_replica.tdir/redis_replica.conf D contrib/unbound/testdata/redis_replica.tdir/redis_replica.dsc D contrib/unbound/testdata/redis_replica.tdir/redis_replica.post D contrib/unbound/testdata/redis_replica.tdir/redis_replica.pre D contrib/unbound/testdata/redis_replica.tdir/redis_replica.test D contrib/unbound/testdata/redis_replica.tdir/unbound_control.key D contrib/unbound/testdata/redis_replica.tdir/unbound_control.pem D contrib/unbound/testdata/redis_replica.tdir/unbound_server.key D contrib/unbound/testdata/redis_replica.tdir/unbound_server.pem D contrib/unbound/testdata/rpz_cname_wild.rpl D contrib/unbound/testdata/rpz_nsdname.rpl D contrib/unbound/testdata/rpz_val_block.rpl D contrib/unbound/testdata/serve_expired.rpl D contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl D contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl D contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl D contrib/unbound/testdata/serve_expired_cached_servfail.rpl D contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl D contrib/unbound/testdata/serve_expired_client_timeout_servfail.rpl D contrib/unbound/testdata/serve_expired_client_timeout_val_bogus.rpl D contrib/unbound/testdata/serve_expired_reply_ttl.rpl D contrib/unbound/testdata/serve_expired_ttl.rpl D contrib/unbound/testdata/serve_expired_ttl_reset.rpl D contrib/unbound/testdata/serve_expired_val_bogus.rpl D contrib/unbound/testdata/serve_expired_zerottl.rpl D contrib/unbound/testdata/serve_original_ttl.rpl D contrib/unbound/testdata/stat_values.tdir/stat_values.conf D contrib/unbound/testdata/stat_values.tdir/stat_values.pre D contrib/unbound/testdata/stat_values.tdir/stat_values.test D contrib/unbound/testdata/stat_values.tdir/stat_values.testns D contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf D contrib/unbound/testdata/stat_values.tdir/stat_values_discard_wait_limit.conf D contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.conf D contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.dsc D contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.post D contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.pre D contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.test D contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.testns D contrib/unbound/testdata/subnet_cached_servfail.crpl D contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl D contrib/unbound/testdata/subnet_global_prefetch_expired.crpl D contrib/unbound/testdata/subnet_noecs_mult.crpl D contrib/unbound/testdata/subnet_noecs_refused.crpl D contrib/unbound/testdata/subnet_noecs_support.crpl D contrib/unbound/testdata/subnet_scopezero_global.crpl D contrib/unbound/testdata/test_ldnsrr.4 D contrib/unbound/testdata/test_ldnsrr.5 D contrib/unbound/testdata/test_ldnsrr.c3 D contrib/unbound/testdata/test_ldnsrr.c4 D contrib/unbound/testdata/test_ldnsrr.c5 D contrib/unbound/testdata/val_failure_dnskey.rpl D contrib/unbound/testdata/val_scrub_rr_length.rpl M contrib/unbound/util/config_file.c M contrib/unbound/util/config_file.h M contrib/unbound/util/configlexer.c M contrib/unbound/util/configlexer.lex M contrib/unbound/util/configparser.c M contrib/unbound/util/configparser.h M contrib/unbound/util/configparser.y M lib/libunbound/config.h ____________________________________________________________________________________________________________ Commit: fe3e929ffa97a726ad6da49c9f03f8865b84a930 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fe3e929ffa97a726ad6da49c9f03f8865b84a930 Author: Dag-Erling Smørgrav (Wed 8 Oct 2025 17:45:02 BST) Committer: Cy Schubert (Sun 26 Oct 2025 03:15:13 GMT) local-unbound-setup: Set so-sndbuf to 0 Without this setting, Unbound 1.24.0 and newer will attempt to set the socket buffer size to 4 MB to mitigate issues that mostly affect servers with large numbers of clients on local networks, which is not a scenario local-unbound is intended for. This is not only a waste of resources, it can also fail, resulting in a warning message on daemon startup. Fixes: b2efd602aea8 ("unbound: Vendor import 1.24.0") Reviewed by: jlduran, cy Differential Revision: https://reviews.freebsd.org/D52977 (cherry picked from commit de3faa85d8f99d260cbfa6242dd8e4ece693e4f8) M usr.sbin/unbound/setup/local-unbound-setup.sh ____________________________________________________________________________________________________________ Commit: 29b59b8ac433dda45aa297adf95f35dce16a6135 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=29b59b8ac433dda45aa297adf95f35dce16a6135 Author: Cy Schubert (Tue 7 Oct 2025 14:58:59 BST) Committer: Cy Schubert (Sun 26 Oct 2025 03:15:13 GMT) unbound: Vendor import 1.24.0 Release notes at https://nlnetlabs.nl/news/2025/Sep/18/unbound-1.24.0-released/ MFC after: 1 week Merge commit '0064eb9cf1c8d526e87d3149249445d4bc8d0248' (cherry picked from commit b2efd602aea8b3cbc3fb215b9611946d04fceb10) M contrib/unbound/Makefile.in M contrib/unbound/cachedb/redis.c M contrib/unbound/compat/fake-rfc2553.c M contrib/unbound/config.h.in M contrib/unbound/configure M contrib/unbound/configure.ac M contrib/unbound/contrib/aaaa-filter-iterator.patch M contrib/unbound/contrib/unbound.service.in M contrib/unbound/daemon/cachedump.c M contrib/unbound/daemon/remote.c M contrib/unbound/daemon/stats.c M contrib/unbound/daemon/unbound.c M contrib/unbound/daemon/worker.c M contrib/unbound/dns64/dns64.c M contrib/unbound/dnstap/dnstap.c M contrib/unbound/dnstap/dnstap.m4 M contrib/unbound/dnstap/dnstap.proto M contrib/unbound/dnstap/dtstream.c M contrib/unbound/doc/Changelog M contrib/unbound/doc/README A contrib/unbound/doc/README.man M contrib/unbound/doc/example.conf.in M contrib/unbound/doc/libunbound.3.in A contrib/unbound/doc/libunbound.rst M contrib/unbound/doc/unbound-anchor.8.in A contrib/unbound/doc/unbound-anchor.rst M contrib/unbound/doc/unbound-checkconf.8.in A contrib/unbound/doc/unbound-checkconf.rst M contrib/unbound/doc/unbound-control.8.in A contrib/unbound/doc/unbound-control.rst M contrib/unbound/doc/unbound-host.1.in A contrib/unbound/doc/unbound-host.rst M contrib/unbound/doc/unbound.8.in M contrib/unbound/doc/unbound.conf.5.in A contrib/unbound/doc/unbound.conf.rst A contrib/unbound/doc/unbound.rst M contrib/unbound/edns-subnet/addrtree.h M contrib/unbound/edns-subnet/subnetmod.c M contrib/unbound/edns-subnet/subnetmod.h M contrib/unbound/iterator/iter_delegpt.h M contrib/unbound/iterator/iter_fwd.c M contrib/unbound/iterator/iterator.c M contrib/unbound/libunbound/libworker.c M contrib/unbound/libunbound/unbound.h M contrib/unbound/respip/respip.h M contrib/unbound/services/authzone.c M contrib/unbound/services/authzone.h M contrib/unbound/services/cache/rrset.c M contrib/unbound/services/listen_dnsport.c M contrib/unbound/services/listen_dnsport.h M contrib/unbound/services/mesh.c M contrib/unbound/services/mesh.h M contrib/unbound/services/modstack.c M contrib/unbound/services/modstack.h M contrib/unbound/services/outside_network.c M contrib/unbound/services/rpz.c M contrib/unbound/sldns/keyraw.c M contrib/unbound/sldns/str2wire.c M contrib/unbound/sldns/wire2str.h M contrib/unbound/smallapp/unbound-anchor.c M contrib/unbound/smallapp/unbound-checkconf.c M contrib/unbound/smallapp/unbound-control.c M contrib/unbound/testcode/doqclient.c M contrib/unbound/testcode/fake_event.c M contrib/unbound/testcode/testbound.c M contrib/unbound/testcode/unitdname.c M contrib/unbound/testcode/unitinfra.c M contrib/unbound/testcode/unitmain.c M contrib/unbound/testcode/unitverify.c M contrib/unbound/testcode/unitzonemd.c A contrib/unbound/testdata/auth_nsec3_ent_with_out_of_zone_data.rpl A contrib/unbound/testdata/auth_nsec3_wild_with_out_of_zone_data.rpl A contrib/unbound/testdata/iter_fwdfirstequaltcp.rpl A contrib/unbound/testdata/iter_minimise_chain.rpl A contrib/unbound/testdata/redis_reconnect_interval.tdir/after.zone A contrib/unbound/testdata/redis_reconnect_interval.tdir/before.zone A contrib/unbound/testdata/redis_reconnect_interval.tdir/redis.conf A contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.conf A contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.dsc A contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.post A contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.pre A contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.test A contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.key A contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.pem A contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.key A contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.pem A contrib/unbound/testdata/rpz_cname_wild.rpl M contrib/unbound/testdata/stat_values.tdir/stat_values.conf M contrib/unbound/testdata/stat_values.tdir/stat_values.test M contrib/unbound/testdata/stat_values.tdir/stat_values.testns A contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.conf A contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.dsc A contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.post A contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.pre A contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.test A contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.testns M contrib/unbound/testdata/subnet_cached_servfail.crpl A contrib/unbound/testdata/subnet_noecs_mult.crpl A contrib/unbound/testdata/subnet_noecs_refused.crpl A contrib/unbound/testdata/subnet_noecs_support.crpl A contrib/unbound/testdata/subnet_scopezero_global.crpl M contrib/unbound/testdata/val_failure_dnskey.rpl M contrib/unbound/util/config_file.c M contrib/unbound/util/config_file.h M contrib/unbound/util/configparser.c M contrib/unbound/util/configparser.y M contrib/unbound/util/data/dname.c M contrib/unbound/util/data/dname.h M contrib/unbound/util/data/msgencode.c M contrib/unbound/util/data/msgencode.h M contrib/unbound/util/data/msgparse.h M contrib/unbound/util/data/msgreply.c M contrib/unbound/util/data/msgreply.h M contrib/unbound/util/iana_ports.inc M contrib/unbound/util/mini_event.c M contrib/unbound/util/net_help.c M contrib/unbound/util/netevent.c M contrib/unbound/util/netevent.h M contrib/unbound/util/random.c M contrib/unbound/validator/val_sigcrypt.c M contrib/unbound/validator/validator.c M contrib/unbound/winrc/win_svc.c M lib/libunbound/config.h ____________________________________________________________________________________________________________ Commit: 4260de80f05d0e04d4f978f40ae2cfbddf9b47dd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4260de80f05d0e04d4f978f40ae2cfbddf9b47dd Author: Cy Schubert (Wed 22 Oct 2025 16:59:26 BST) Committer: Cy Schubert (Sun 26 Oct 2025 03:15:13 GMT) ipfilter: Plug ip_nat kernel information leak ipf_nat_getent() allocates a variable-sized nat_save_t buffer with KMALLOCS() (which does not zero memory) and then copies only a subset of fields into it before returning the object to userland using ipf_outobjsz(). Because the structure is not fully initialized on all paths, uninitialized kernel heap bytes can be copied back to user space, resulting in an information leak. We fix this by zeroing out the data structure immediately after allocation. Reported by: Ilja Van Sprundel Reviewed by: emaste Differential revision: https://reviews.freebsd.org/D53274 (cherry picked from commit 6535e9308a26e17023831fe68fb71d2febf2a002) M sys/netpfil/ipfilter/netinet/ip_nat.c ____________________________________________________________________________________________________________ Commit: 2ebb4779c40afbaf4a0bf0b6d5364758b4c24bad URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2ebb4779c40afbaf4a0bf0b6d5364758b4c24bad Author: Cy Schubert (Wed 22 Oct 2025 17:29:03 BST) Committer: Cy Schubert (Sun 26 Oct 2025 03:15:13 GMT) ipfilter: Plug ip_htable kernel information leak ipf_htable_stats_get() constructs an iphtstat_t on the stack and only initializes select fields before copying the entire structure to userland. The trailing padding array iphs_pad[16] is never initialized, so ~128 bytes of uninitialized kernel stack memory can be leaked to user space on each call. This is a classic information disclosure vulnerability that can reveal pointers and other sensitive data. We fix this by zeroing out the data structure prior to use. Reported by: Ilja Van Sprundel Reviewed by: emaste Differential revision: https://reviews.freebsd.org/D53275 (cherry picked from commit 0d589ecbc7aa916537fd21c0344919491cfcb293) M sys/netpfil/ipfilter/netinet/ip_htable.c ____________________________________________________________________________________________________________ Commit: 8a4e4d10f91e4f6b7f0019f1bd9198c73f5428d9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8a4e4d10f91e4f6b7f0019f1bd9198c73f5428d9 Author: Gordon Bergling (Wed 22 Oct 2025 12:57:57 BST) Committer: Gordon Bergling (Sat 25 Oct 2025 10:18:24 BST) kdb: Fix a typo in a source code comment - s/th/the/ (cherry picked from commit 0a53e6d8bc0b3a6332e228993d040fbf38f652fb) M sys/kern/subr_kdb.c ____________________________________________________________________________________________________________ Commit: bbc7da83155ebfc099f69f613dfa5c141010b5db URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bbc7da83155ebfc099f69f613dfa5c141010b5db Author: Gordon Bergling (Wed 22 Oct 2025 12:59:13 BST) Committer: Gordon Bergling (Sat 25 Oct 2025 10:18:16 BST) pmcstat(8): Fix a typo in a source code comment - s/th/the/ (cherry picked from commit 2b2a4f02e0872065c63baec8bf0069e3b677def7) M usr.sbin/pmcstat/pmcpl_callgraph.c ____________________________________________________________________________________________________________ Commit: 857897013b01818814c1019a1b47164dfeb7951f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=857897013b01818814c1019a1b47164dfeb7951f Author: Lexi Winter (Sat 25 Oct 2025 05:41:37 BST) Committer: Lexi Winter (Sat 25 Oct 2025 05:41:37 BST) libc: Import OpenBSD's inet_net_{ntop,pton} Our versions of these functions (originally taken from BIND) simply don't work correctly for AF_INET6. These were removed from BIND itself quite a while ago, but OpenBSD has made several fixes in the mean time, so import their code. Add tests for both functions. PR: 289198 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289198 ) Reported by: Nico Sonack MFC after: 1 week Reviewed by: des Obtained from: OpenBSD (lib/libc/net) Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52629 (cherry picked from commit 8f4a0d2f7b96099001dbc51e06114df1a0e6d291) inet_net_test: Compare pointers against nullptr GCC does not like passing NULL (__null) to std::ostringstream::operator<< inside of ATF_REQUIRE_EQ: lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_ntop_invalid::body() const': lib/libc/tests/net/inet_net_test.cc:306:9: error: passing NULL to non-pointer argument 1 of 'std::__1::basic_ostream<_CharT, _Traits>& std::__1::basic_ostream<_CharT, _Traits>::operator<<(long int) [with _CharT = char; _Traits = std::__1::char_traits]' [-Werror=conversion-null] 306 | ATF_REQUIRE_EQ(ret, NULL); | ^~~~~~~~~~~~~~ In file included from /usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/sstream:317, from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++/macros.hpp:29, from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++.hpp:29, from lib/libc/tests/net/inet_net_test.cc:33: /usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/__ostream/basic_ostream.h:338:81: note: declared here 338 | basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long __n) { | ~~~~~^~~ ... Fixes: 8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}") (cherry picked from commit aa358ce3ca8e1fcfb305025fd00beb2a119c7c77) inet_net_test: Use int to hold expected return values from inet_net_pton GCC warns about the sign mismatch in comparisons: lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_inet4::body() const': lib/libc/tests/net/inet_net_test.cc:86:17: error: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Werror=sign-compare] 86 | ATF_REQUIRE_EQ(bits, addr.bits); | ^~~~~~~~~~~~~~ lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_inet6::body() const': lib/libc/tests/net/inet_net_test.cc:205:17: error: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Werror=sign-compare] 205 | ATF_REQUIRE_EQ(bits, addr.bits); | ^~~~~~~~~~~~~~ Fixes: 8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}") (cherry picked from commit e1aeb58cbbc3839db93ec38ce491b7b9383d5649) (cherry picked from commit b4871be3490de56975777079c1767d1fd346ac7a) M lib/libc/inet/inet_net_ntop.c M lib/libc/inet/inet_net_pton.c M lib/libc/tests/net/Makefile A lib/libc/tests/net/inet_net_test.cc ____________________________________________________________________________________________________________ Commit: 2564a21f9774c177abcaf64f89d65954ec78b037 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2564a21f9774c177abcaf64f89d65954ec78b037 Author: Gordon Tetlow (Wed 15 Oct 2025 23:24:06 BST) Committer: Gordon Tetlow (Wed 22 Oct 2025 18:53:28 BST) libc: Add "Z" as TZ designator for strptime. ISO 8601 allows use of "Z" as the time zone designator. Update the strptime parser to allow this usage. While we are at it, update the manpage to reflect that both UTC and Z are now valid options. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D53083 (cherry picked from commit 79e57ea662d92ffcbe7d65854a284aefac6a332d) M lib/libc/stdtime/strptime.3 M lib/libc/stdtime/strptime.c ____________________________________________________________________________________________________________ Commit: 8e999e63c356839fa60cf964e33e0054b63c7c87 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8e999e63c356839fa60cf964e33e0054b63c7c87 Author: Mark Johnston (Wed 22 Oct 2025 16:04:35 BST) Committer: Mark Johnston (Wed 22 Oct 2025 16:49:17 BST) so_reuseport_lb_test: Add a test case for connected UDP sockets Approved by: so (cherry picked from commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5) M tests/sys/netinet/so_reuseport_lb_test.c ____________________________________________________________________________________________________________ Commit: df888c8f41f633be3aacecdd357ebaad62aa11bd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=df888c8f41f633be3aacecdd357ebaad62aa11bd Author: Mark Johnston (Wed 22 Oct 2025 15:49:25 BST) Committer: Mark Johnston (Wed 22 Oct 2025 16:49:11 BST) inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 (cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53) M sys/netinet/in_pcb.c ____________________________________________________________________________________________________________ Commit: 6e4767672a21f89c070d351d62a8d75629fd077d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6e4767672a21f89c070d351d62a8d75629fd077d Author: Mark Johnston (Wed 15 Oct 2025 21:14:36 BST) Committer: Mark Johnston (Wed 22 Oct 2025 13:34:07 BST) imgact_elf: Check note body sizes In parse_notes we validate that the note name fits within the note buffer, but we do not do the same for the note data, so there is some potential for an OOB read in the note handler. Add a bounds check. Reported by: Ilja Van Sprundel Reviewed by: kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53063 (cherry picked from commit c86af2cc4cd12fb0174843b22d737c3b5b5d55d0) M sys/kern/imgact_elf.c ____________________________________________________________________________________________________________ Commit: 43bf0f4cd2c81c2ffc72bf69e895dfcc9f03e32a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=43bf0f4cd2c81c2ffc72bf69e895dfcc9f03e32a Author: Mark Johnston (Wed 15 Oct 2025 21:15:08 BST) Committer: Mark Johnston (Wed 22 Oct 2025 13:33:48 BST) libnv: Fix a length check in nvpair_unpack_string_array() A string array is represented by a set of nul-terminated strings concatenated together. For each string, we check to see if there's a nul terminator at the end, taking care to avoid going past the end of the buffer. However, the code fails to handle the possibility that size == 0 at the end of an iteration, leading to underflow. Fix the length check. Reported by: Ilja van Sprundel Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53069 (cherry picked from commit 937693fc9e4ff4045cc674a14902f0d53e84ec98) M sys/contrib/libnv/bsd_nvpair.c ____________________________________________________________________________________________________________ Commit: c839eecec5e25c7a998a274107ab073444fc5d6a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c839eecec5e25c7a998a274107ab073444fc5d6a Author: Mark Johnston (Tue 14 Oct 2025 14:33:13 BST) Committer: Mark Johnston (Tue 21 Oct 2025 14:13:03 BST) ipfw: Check for errors from sooptcopyin() and sooptcopyout() Note, it looks like this code may be unused since commit 4a77657cbc01 ("ipfw: migrate ipfw to 32-bit size rule numbers"). In particular, it looks like the ipfw_nat_*_ptr pointers are unused now. Reviewed by: ae MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53068 (cherry picked from commit 2df39ce5d4a8836ef5fd3c2666f48041042eff42) M sys/netpfil/ipfw/ip_fw_nat.c ____________________________________________________________________________________________________________ Commit: bbf986d0f140d847b9e0c808bf6006b62e85e78e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bbf986d0f140d847b9e0c808bf6006b62e85e78e Author: Dag-Erling Smørgrav (Fri 17 Oct 2025 12:54:48 BST) Committer: Dag-Erling Smørgrav (Mon 20 Oct 2025 17:11:48 BST) quot: Fix benign buffer overflow If it encounters an inode whose owner does not have a pw entry, quot allocates a 7-byte buffer (8 in practice, since that is the minimum allocation size) and uses it to store the numeric uid preceded by a hash character. This will overflow the allocated buffer if the UID exceeds 6 decimal digits. Avoid this by using asprintf() instead. While here, simplify the common case as well using strdup(). Reported by: Igor Gabriel Sousa e Souza MFC after: 3 days Reviewed by: obiwac, emaste Differential Revision: https://reviews.freebsd.org/D53129 (cherry picked from commit 5854d1cbab1073d78519e7ad9a6eb5726341d587) M usr.sbin/quot/quot.c ____________________________________________________________________________________________________________ Commit: 549cba3c9d1e14fffa9a99ed7b6ee51eb6d20e51 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=549cba3c9d1e14fffa9a99ed7b6ee51eb6d20e51 Author: Jose Luis Duran (Fri 17 Oct 2025 15:34:55 BST) Committer: Jose Luis Duran (Mon 20 Oct 2025 17:05:40 BST) rc: dmesg: Allow umask to be configurable Allow umask to be configurable. Being able to set the umask via an rc variable is useful when setting: security.bsd.unprivileged_read_msgbuf=0 As it allows a user to configure: dmesg_umask="066" Without modifying the rc script, and preventing the contents of the $dmesg_file (/var/run/dmesg.boot) from being publicly readable. PR: 272552 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272552 ) Reviewed by: netchild MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53169 (cherry picked from commit edadbc6ee95570627679f3bc14a1d5476d0ce339) M libexec/rc/rc.conf M libexec/rc/rc.d/dmesg ____________________________________________________________________________________________________________ Commit: 2779d63101219b51acad34ca758e3f7eab67e5c9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2779d63101219b51acad34ca758e3f7eab67e5c9 Author: Jose Luis Duran (Fri 17 Oct 2025 15:15:46 BST) Committer: Jose Luis Duran (Mon 20 Oct 2025 17:04:00 BST) rc.conf: Fix typo interferring -> interfering Reviewed by: emaste MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53168 (cherry picked from commit 982d70ca2e6333b7e8ccf828b004ccf20a9cc550) M libexec/rc/rc.conf ____________________________________________________________________________________________________________ Commit: 25150c4f98c0b128267bd7be0c1b83a228a5688b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=25150c4f98c0b128267bd7be0c1b83a228a5688b Author: Michael Osipov (Fri 17 Oct 2025 10:24:12 BST) Committer: Michael Osipov (Mon 20 Oct 2025 13:34:34 BST) manpages: Use canonical names for Linux filesystems The manpages of linprocfs(5) and linsysfs(5) document incomplete names without "fs" suffix. Make them identical to other filesystems. PR: 283079 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283079 ) MFC after: 3 days Reviewed by: ziaee, markj Differential Revision: https://reviews.freebsd.org/D53155 (cherry picked from commit 88b9ca860ef332d4d32e97e0f8a166f12cffc8e3) M share/man/man5/linprocfs.5 M share/man/man5/linsysfs.5 ____________________________________________________________________________________________________________ Commit: f8c4b9d71a5c241eabbc36737896fae21c10d319 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f8c4b9d71a5c241eabbc36737896fae21c10d319 Author: Paul Armstrong (Fri 6 Sep 2019 22:40:01 BST) Committer: Michael Osipov (Mon 20 Oct 2025 13:33:31 BST) login.conf: Remove never used ignoretime/ignoretime@ PR: 240378 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240378 ) Reviewed by: otis (mentor), glebius (src committer) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52991 (cherry picked from commit 4835fc45efe8b593fa49786ec4bfb6ce5050756c) M usr.bin/login/login.conf ____________________________________________________________________________________________________________ Commit: 07a3c93bc51eab1ca51846a941b90a7161df52d7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=07a3c93bc51eab1ca51846a941b90a7161df52d7 Author: Jose Luis Duran (Thu 16 Oct 2025 18:18:51 BST) Committer: Jose Luis Duran (Thu 16 Oct 2025 19:45:33 BST) tools: Update sysctl to its new name The kern.ipc.somaxconn sysctl has been replaced with kern.ipc.soacceptqueue since FreeBSD 10.0. Reviewed by: emaste MFC after: 1 hour Differential Revision: https://reviews.freebsd.org/D34598 (cherry picked from commit 84333aada464296c1e28126b5c91ae2fb3f79eef) M tools/tools/netrate/tcpp/README M tools/tools/sysdoc/tunables.mdoc ____________________________________________________________________________________________________________ Commit: 14e02220e4159f197c148c60cfd8ccaa62076dce URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=14e02220e4159f197c148c60cfd8ccaa62076dce Author: Jose Luis Duran (Thu 16 Oct 2025 18:13:49 BST) Committer: Jose Luis Duran (Thu 16 Oct 2025 19:45:23 BST) nanobsd: rescue: Update legacy sysctls Reviewed by: emaste MFC after: 1 hour Differential Revision: https://reviews.freebsd.org/D34598 (cherry picked from commit 93ee9bb424619f0189b3454380588c955222b89b) M tools/tools/nanobsd/rescue/Files/root/ZFS_Create.txt ____________________________________________________________________________________________________________ Commit: d06e31d4a7622b535d903a1b84ce59e211ca2b18 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d06e31d4a7622b535d903a1b84ce59e211ca2b18 Author: Ahmad Khalifa (Fri 10 Oct 2025 10:30:52 BST) Committer: Ahmad Khalifa (Tue 14 Oct 2025 15:01:59 BST) libm: remainder: make sure x is zero Make sure the entirety of x is zero before flipping the sign bit. Otherwise the sign would be wrong for small values of x when x is negative and |n*y| > |x| Reported by: alfredo PR: 251091 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=251091 ) Reviewed by: kargl MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53023 (cherry picked from commit 25cca51ed294890d20a3c0290814cd26875db686) M lib/msun/src/e_remainder.c ____________________________________________________________________________________________________________ Commit: 8f13891707b4a7ba7702b6d36ca64c15cf33ff93 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8f13891707b4a7ba7702b6d36ca64c15cf33ff93 Author: Gregory Neil Shapiro (Thu 9 Oct 2025 19:03:43 BST) Committer: Gregory Neil Shapiro (Thu 9 Oct 2025 22:01:40 BST) MFC: Merge commit '1fdae2e33fdc751bc2ec74c81fcde14323e4e965' Be explicit that newaliases for sendmail (Upstream sendmail.org commit 3084151d898) PR: 289259 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289259 ) (cherry picked from commit e9f7c3de111b9dda23e1763e030688d78a71d8ff) M contrib/sendmail/src/newaliases.1 ____________________________________________________________________________________________________________ Commit: cccbbb329980e7fa9d625822be637a5faed136a9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cccbbb329980e7fa9d625822be637a5faed136a9 Author: Cy Schubert (Wed 1 Mar 2023 03:18:07 GMT) Committer: Cy Schubert (Thu 9 Oct 2025 13:36:57 BST) ipfilter/ippool: Dump a copy of ippool dstlist data in "new" format As with 7531c434a593, which dumped ippool table data in the "new" format, print dstlist data in the "new" format. MFC after: 1 week (cherry picked from commit eee36ffa0d874f1c8aca912f7c2a8eba34509927) M sbin/ipf/libipf/printdstl_live.c M sbin/ipf/libipf/printdstlist.c M sbin/ipf/libipf/printdstlistdata.c ____________________________________________________________________________________________________________ Commit: 96870b5accc9260c0f0098d88ea3f56573b1e417 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=96870b5accc9260c0f0098d88ea3f56573b1e417 Author: Cy Schubert (Wed 2 Nov 2022 05:46:41 GMT) Committer: Cy Schubert (Thu 9 Oct 2025 13:36:57 BST) ipfilter/ippool: Dump a copy of ippool hash data in "new" format As with 7531c434a593, which dumped ippool table data in the "new" format, print hash data in the "new" format. (cherry picked from commit 2f30b43fa269bc63086b0428f45c79e982abb02f) M sbin/ipf/libipf/printhash_live.c M sbin/ipf/libipf/printhashdata.c ____________________________________________________________________________________________________________ Commit: 517430d262325c58f31310deb01c1a63ea5ef406 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=517430d262325c58f31310deb01c1a63ea5ef406 Author: Cy Schubert (Wed 2 Nov 2022 05:34:54 GMT) Committer: Cy Schubert (Thu 9 Oct 2025 13:36:57 BST) ipfilter ippool: Prefix deleted entries with "#" To maintain consistency with ippool list functions, prefix deleted entries with "#". (cherry picked from commit f3ff6abb9d816a68e65af5ed55552d152a58b5e4) M sbin/ipf/libipf/printhashdata.c ____________________________________________________________________________________________________________ Commit: c6a31e29ef4dbd7022c15b1ebdf6494879850e05 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c6a31e29ef4dbd7022c15b1ebdf6494879850e05 Author: Cy Schubert (Wed 2 Nov 2022 05:28:19 GMT) Committer: Cy Schubert (Thu 9 Oct 2025 13:36:57 BST) ipfilter ippool: Flag deleted entries with "#" List deleted entries prefixed by "#". This is consistent with other ippool list functions. Fixes: 7531c434a593 (cherry picked from commit 94758e72fdbd6b218e79884e22347eb357a7e51d) M sbin/ipf/libipf/printpooldata.c ____________________________________________________________________________________________________________ Commit: 86d368403e6547c0b293424b983f1e2d85e13875 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=86d368403e6547c0b293424b983f1e2d85e13875 Author: Dag-Erling Smørgrav (Wed 8 Oct 2025 11:07:01 BST) Committer: Dag-Erling Smørgrav (Wed 8 Oct 2025 12:44:40 BST) rcorder: Fix grammar in warning about loops MFC after: 1 week Reviewed by: ae Differential Revision: https://reviews.freebsd.org/D52951 (cherry picked from commit d96f9a4688668ececc09c61dcf6b539a55112cc0) M sbin/rcorder/rcorder.c ____________________________________________________________________________________________________________ Commit: 1c541a20989a56a7a93d6243c081f714a7873152 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1c541a20989a56a7a93d6243c081f714a7873152 Author: Dag-Erling Smørgrav (Tue 7 Oct 2025 17:23:43 BST) Committer: Dag-Erling Smørgrav (Wed 8 Oct 2025 12:44:39 BST) ln: Simplify sameness checks Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52927 (cherry picked from commit 18997fb9eca651a7ef13e6755a4d2cdd3ddede10) M bin/ln/tests/ln_test.sh ____________________________________________________________________________________________________________ Commit: b0c147af08621b476f5b50905ecf13ba1124228f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b0c147af08621b476f5b50905ecf13ba1124228f Author: Dag-Erling Smørgrav (Tue 7 Oct 2025 17:23:39 BST) Committer: Dag-Erling Smørgrav (Wed 8 Oct 2025 12:44:39 BST) cp: Simplify sameness checks Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52926 (cherry picked from commit 95de78614a57733807c28c05125ed0636309d88b) M bin/cp/tests/cp_test.sh ____________________________________________________________________________________________________________ Commit: ce6061658f8492ad3e6d0ced1dd01e9cf5f80c12 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ce6061658f8492ad3e6d0ced1dd01e9cf5f80c12 Author: Dag-Erling Smørgrav (Tue 7 Oct 2025 17:23:18 BST) Committer: Dag-Erling Smørgrav (Wed 8 Oct 2025 12:44:34 BST) tail: Tweak follow_rename test case Add a brief sleep to give tail time to start following the file before we rename it. PR: 289902 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289902 ) MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52887 (cherry picked from commit a9c72543d287afa8dd30bec0f49873e88057c192) M usr.bin/tail/tests/tail_test.sh ____________________________________________________________________________________________________________ Commit: e01971362fe639e079ffc0a828b10aff1cc2a726 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e01971362fe639e079ffc0a828b10aff1cc2a726 Author: Ed Maste (Thu 28 Aug 2025 13:48:17 BST) Committer: Ed Maste (Tue 7 Oct 2025 19:16:44 BST) Merge commit 7a66a26658f4 from llvm git (by Fangrui Song): --discard-locals/--discard-all: allow and keep symbols referenced by relocations In GNU objcopy, symbols referenced by relocations are retained. Our COFF (https://reviews.llvm.org/D56480) and Mach-O (https://reviews.llvm.org/D75104) ports port the behavior, but the ELF port doesn't. This PR implements the behavior for ELF. Close #47468 (tcl has a use case that requires `strip -x tclStubLib.o` to strip local symbols not referenced by relocations.) Pull Request: https://github.com/llvm/llvm-project/pull/130704 PR: 258820 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258820 ) Approved by: dim Differential Revision: https://reviews.freebsd.org/D52198 (cherry picked from commit 959806e0a8448ef5df372468b8deddc20d976702) (cherry picked from commit 4558fc4f91dc1d3909083ea664b384595f66c3ae) M contrib/llvm-project/llvm/lib/ObjCopy/ELF/ELFObjcopy.cpp ____________________________________________________________________________________________________________ Commit: 5c0d60e75b44cb557fcab9473f0051da6cf2d701 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5c0d60e75b44cb557fcab9473f0051da6cf2d701 Author: Ed Maste (Fri 28 Feb 2025 15:40:43 GMT) Committer: Ed Maste (Tue 7 Oct 2025 19:16:44 BST) boot_i386.8: Mention this is legacy Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49704 (cherry picked from commit b8437cbae173308180fbaddc6a74bfb6f8c4410b) (cherry picked from commit 96743bfb95431f396e71d35eb92258122233334f) M sbin/reboot/boot_i386.8 ____________________________________________________________________________________________________________ Commit: 244ecc561601af61c9fca7240a1e5d990b6d3b5f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=244ecc561601af61c9fca7240a1e5d990b6d3b5f Author: Ed Maste (Fri 16 Aug 2024 17:18:15 BST) Committer: Ed Maste (Tue 7 Oct 2025 19:16:44 BST) Makefile.inc1: Avoid including cwd in path Buildworld failed when objcopy tried to overwrite itself, with `objcopy: open objcopy failed: Text file busy`. The PATH ended up with `::`, effectively including the current directory, and we found the wrong objcopy. PR: 261215 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261215 ) Sponsored by: The FreeBSD Foundation (cherry picked from commit ac7ed266dc73a1d55f2bc1e90bfce3c93757e8b4) (cherry picked from commit e425d433c5adaa0f7a513ba836fa378137ed7be4) M Makefile.inc1 ____________________________________________________________________________________________________________ Commit: 8699896713006218278a1ccb74738dff92a7e8b8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8699896713006218278a1ccb74738dff92a7e8b8 Author: Jose Luis Duran (Mon 6 Oct 2025 13:54:05 BST) Committer: Jose Luis Duran (Tue 7 Oct 2025 01:33:32 BST) nss_tacplus: Fix typo MK_INSTALLIB -> MK_INSTALLLIB Reviewed by: des Approved by: emaste (mentor) Fixes: 6c5cdba1bafe ("Add nss_tacplus, a TACACS+ NSS module.") MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D52882 (cherry picked from commit 75f7e003b79d4a1d1cad77cc7bbe2ccb96435cd5) M ObsoleteFiles.inc M lib/nss_tacplus/Makefile ____________________________________________________________________________________________________________ Commit: 8583840cfb925eeafac8eff171029a56f7c9c133 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8583840cfb925eeafac8eff171029a56f7c9c133 Author: Zhenlei Huang (Wed 17 Sep 2025 17:48:54 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:28 BST) witness: Record the first acquired file and line for recursable locks and the last acquired file and line to witness object. For recursable locks, unfortunately current implementation records only the recurse count and the last acquired file and line, but does not restore the previous acquired file and line on unlock. Hence it is possible to report false acquired file and line, and that may mislead developers and make the report by users a little harder to analyse. Since subsequent recurse locks do not affect how witness order check, record the first acquired file and line so that the logic is much clear. Reported by: bz Reviewed by: kib (previous version), markj See also: https://lists.freebsd.org/archives/freebsd-current/2025-June/007944.html MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52496 (cherry picked from commit 2d85bc89294baa04daf509e81ec3880bff79cc10) (cherry picked from commit 3dc9f96a489cd53710af8205a1f3901c11b760a5) (cherry picked from commit 7838ad85fb1a75464e53525b4cdb064ca1e97a47) M sys/kern/subr_witness.c ____________________________________________________________________________________________________________ Commit: b4a079dd78a6de64dcc072a43cea41a1eb96df17 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b4a079dd78a6de64dcc072a43cea41a1eb96df17 Author: Zhenlei Huang (Fri 29 Aug 2025 11:00:57 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:28 BST) witness: White space cleanup and some style(9) tweeks MFC after: 3 days (cherry picked from commit f5377665253b2b107ee8a4690ad2e6682375b304) (cherry picked from commit 91c0ef0f5a2afa17489b603a2f82edaa28e3cce7) M sys/kern/subr_witness.c ____________________________________________________________________________________________________________ Commit: a08e8da2745dd80f944c08a30e37a45471e636ba URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a08e8da2745dd80f944c08a30e37a45471e636ba Author: Zhenlei Huang (Sun 21 Sep 2025 17:47:45 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:27 BST) ifconfig: Display the IFCAP_HWSTATS capability This follows the commit 4cdc1f5421c5, which introduces the IFCAP_HWSTATS capability. This is a direct commit to stable/13. Fixes: 4cdc1f5421c5 There are some high performance NICs that count statistics in hardware M sbin/ifconfig/ifconfig.c ____________________________________________________________________________________________________________ Commit: d334e045a471d2bb0db2f9bb750eb7e67ef0823f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d334e045a471d2bb0db2f9bb750eb7e67ef0823f Author: Zhenlei Huang (Fri 19 Sep 2025 20:18:27 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:27 BST) ifconfig: Fix the display of the IFCAP_MEXTPG capability Historically this capability is IFCAP_NOMAP but it was renamed to IFCAP_MEXTPG. Catch up with the change 3f43ada98c89. This is a direct commit to stable/13. PR: 289545 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289545 ) Fixes: 3f43ada98c89 Catch up with 6edfd179c86: mechanically rename IFCAP_NOMAP to IFCAP_MEXTPG M sbin/ifconfig/ifconfig.c ____________________________________________________________________________________________________________ Commit: 22f26eb3b89798e06aa8941d945bf1059bc5e569 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=22f26eb3b89798e06aa8941d945bf1059bc5e569 Author: Zhenlei Huang (Fri 1 Aug 2025 17:33:09 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:26 BST) ifconfig: Garbage collect unused parameter swabips and the macro EN_SWABIPS. The macro EN_SWABIPS is identical to IFF_LINK0 (also historically IFF_LLC0) and we already have the parameter link0 to toggle IFF_LINK0. These were inherited from 386BSD 0.1 and have never been used since the very first FreeBSD release. Reviewed by: adrian, #network MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51368 (cherry picked from commit 8632e4e73a6934f3f9996a18932e36b04e6a3faf) (cherry picked from commit 878d3bdb59d70b2ce077f4bbdefea0ec875d6e82) M sbin/ifconfig/ifconfig.c ____________________________________________________________________________________________________________ Commit: ce95ba8ae530e47103d765e76cc3547613ee22ce URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ce95ba8ae530e47103d765e76cc3547613ee22ce Author: Zhenlei Huang (Wed 24 Sep 2025 02:16:13 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:26 BST) tcp: Add CTLFLAG_VNET flag to some sysctls The two sysctls net.inet.tcp.hostcache.list and net.inet.tcp.hostcache.histo are readonly and are to operate hostcache of vnet jails. Add CTLFLAG_VNET flag to them since they are per-vnet sysctls. This change does not have any impact on reading the two sysctls, but `sysctl -ANV net.inet.tcp.hostcache` will report them correctly. Reviewed by: tuexen, #transport, #network MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52693 (cherry picked from commit b1f96169cfb50a7b65aee115b2c9ad2f00797bbf) (cherry picked from commit 032918dfd155936a79847f17ac355439e6b59027) (cherry picked from commit ccbc722a19450df2981049777d4930deae94a840) M sys/netinet/tcp_hostcache.c ____________________________________________________________________________________________________________ Commit: 4b92e54c9b5a531c12ac50add5da6eaf39b19380 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4b92e54c9b5a531c12ac50add5da6eaf39b19380 Author: Zhenlei Huang (Wed 24 Sep 2025 02:16:13 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:25 BST) tcp: Fix expiring and purging hostcache entries of vnet jails A jailed process, `sysctl -j foo` or `jexec foo sysctl`, do not have privilege to write to non-vnet sysctls but only to those marked as jail writable, aka sysctls those marked with CTLFLAG_VNET flag. Without this change we will get EPERM when trying to expire and purge hostcache entries of vnet jails via the net.inet.tcp.hostcache.purgenow sysctl. Fix that by adding a CTLFLAG_VNET flag. Reviewed by: tuexen, #transport, #network Fixes: 264563806496 Add a new sysctl net.inet.tcp.hostcache.purgenow=1 to expire ... MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52692 (cherry picked from commit 33ceb31e256e386da5a42cc7ca2ef8d4b81b6eda) (cherry picked from commit fa30199a3dbfe1d4994e7e4e63ad9c582c6f8a1a) (cherry picked from commit 79d114544fabd5a80198e925e4dc34f47a9f9e3a) M sys/netinet/tcp_hostcache.c ____________________________________________________________________________________________________________ Commit: d59a8f27fc07cd52797b7d0974f5958d1fc21819 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d59a8f27fc07cd52797b7d0974f5958d1fc21819 Author: Zhenlei Huang (Wed 10 Sep 2025 15:44:36 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:24 BST) tslog: Move sysinit_tslog_shim() into kern_tslog.c struct sysinit's func pointer requires its address, thus a real function is generated in every translation unit when the source file has SYSINITs declared. That results in plenty of identical sysinit_tslog_shim in the final kernel file, in which only one is used and others are left useless. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52413 (cherry picked from commit 5f9a05e574050c8b3f6b444311a12e8fb293ad1a) (cherry picked from commit bd721f6e8040f0b9d0546c293954290844b6a070) (cherry picked from commit 112d1a5f5df0edb1e530348143413407b2659325) M sys/kern/kern_tslog.c M sys/sys/kernel.h ____________________________________________________________________________________________________________ Commit: 1d101415d7eca95276f88a9ebbedcb50039da2a7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1d101415d7eca95276f88a9ebbedcb50039da2a7 Author: Zhenlei Huang (Tue 9 Sep 2025 11:04:55 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:24 BST) qlnxe: Report speeds in decimal format It is more natural to read the speed in decimal format than hexadecimal one. Spotted this while diagnosing PR 287445, ``` [__ecore_configure_pf_max_bandwidth:6864(qlnx-0)]Configured MAX bandwidth to be 000061a8 Mb/sec [__ecore_configure_pf_min_bandwidth:6922(qlnx-0)]Configured MIN bandwidth to be 750 Mb/sec ``` Reviewed by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52376 (cherry picked from commit e1c5e043961ab3a5429a0c6e727265dfa819cf00) (cherry picked from commit 6fb046515ea6005b3958e0c3220d0e6e630af292) (cherry picked from commit 94d3be2b547c133f42730e6c8692590ea32adab0) M sys/dev/qlnx/qlnxe/ecore_dev.c M sys/dev/qlnx/qlnxe/ecore_mcp.c ____________________________________________________________________________________________________________ Commit: f30da24e9d6ae87c096544b4b68c7c35dbf21c66 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f30da24e9d6ae87c096544b4b68c7c35dbf21c66 Author: Zhenlei Huang (Tue 9 Sep 2025 11:04:54 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:23 BST) qlnxe: Support SIOCGIFXMEDIA ioctl ifconfig(8) will try SIOCGIFXMEDIA first and then retry SIOCGIFMEDIA if that fails. Since the driver reports extended media types, support SIOCGIFXMEDIA ioctl directly rather than doing another round. Reviewed by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52375 (cherry picked from commit 6e3c8c0f709ab0b9d70e2725e58f4a4ba7a4404e) (cherry picked from commit 817bc700927087a52d0dd34c43e45736a867240e) (cherry picked from commit ac4b48b6ad34a83406054c5badd0f835136ffd88) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: 49fbc8dcf77d4ef21b7e93986ff5fcd8f0e53c1d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=49fbc8dcf77d4ef21b7e93986ff5fcd8f0e53c1d Author: Zhenlei Huang (Tue 9 Sep 2025 11:04:54 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:23 BST) qlnxe: Unconditionally enable extended media types Those extended media types are available since about 2015 [1]. All supported branches already have them defined. No functional change intended. [1] eb7e25b22f1c ifmedia changes: Extend the number of available subtypes for Ethernet media ... Reviewed by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52374 (cherry picked from commit 08356a733eb7a7bef1afe20ded2d983b55310de7) (cherry picked from commit 5aa49c98edfc48fbe96f7aba0e0631d4c0f29493) (cherry picked from commit 2cb20b25a5739fb542513571e3f6d7ffd607f346) M sys/dev/qlnx/qlnxe/qlnx_def.h M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: ad08006c7fd504f75ed2f672fc25d86955be8563 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ad08006c7fd504f75ed2f672fc25d86955be8563 Author: Zhenlei Huang (Tue 22 Jul 2025 05:11:02 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:22 BST) qlnxe: Fix advertising the IFCAP_LINKSTATE capability The following up advertising of IFCAP_HWCSUM capability unconditionally overwrite IFCAP_LINKSTATE. Reviewed by: kbowling MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D51450 (cherry picked from commit c18860339d5051dea99cb5cee7e322ffa5dd2a81) (cherry picked from commit cdd97f3aacf1e509858207a0caa085b9c47e5e9e) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: 4dc6c65704de05ed4bf74585d28b106fcb50452c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4dc6c65704de05ed4bf74585d28b106fcb50452c Author: Zhenlei Huang (Wed 3 Sep 2025 11:14:21 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:22 BST) init_main: Fix logging the subsystem of pre-loaded kernel modules The pre-load, aka linker_preload() runs at the order of SI_SUB_KLD, but a pre-loaded module may have SYSINITs that have startup order prior to SI_SUB_KLD, e.g. TUNABLE_INT() / TUNABLE_LONG(), hence it is possible that we run into abnormal orders. Without this change, the subsystem of the pre-loaded kernel modules will be melted into previous one. That is mostly harmless but confusing. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47904 (cherry picked from commit 11f1dd193af57dfa5128eadc62b084502292a784) (cherry picked from commit b2293f7f60c238e7a83551472aed9452cd017769) M sys/kern/init_main.c ____________________________________________________________________________________________________________ Commit: 1a9f9b4e38c370eb505554edba6041542b8ba701 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1a9f9b4e38c370eb505554edba6041542b8ba701 Author: Zhenlei Huang (Tue 16 Sep 2025 16:58:24 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:21 BST) ipfw: Teach ipfw that EtherIP is an upper layer protocol so that we do not discard EtherIP packets ( over IPv6 network ) when net.inet6.ip6.fw.deny_unknown_exthdrs is set to 1 ( which is the default value ). PR: 227450 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227450 ) Reviewed by: ae, #network MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52566 (cherry picked from commit 0418e6690e91aa6c38dd9af9da43c4c5a9dc1cd2) (cherry picked from commit b1c96e54b906d0cdea0b5a9c74cc295803dfe50e) (cherry picked from commit b4c6c3db0379a5b3d34143325805cd7e68cf3d9a) M sys/netpfil/ipfw/ip_fw2.c ____________________________________________________________________________________________________________ Commit: 7cbb184bbfa3ffab031aca864647ddb387094e27 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7cbb184bbfa3ffab031aca864647ddb387094e27 Author: Zhenlei Huang (Wed 27 Aug 2025 16:55:22 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:21 BST) gif.4: Mention that gif(4) can tunnel Ethernet traffic Ideally this manpage shall have examples for the EtherIP setup, but there has been one in if_bridge(4) since the introduction of EtherIP [1], so direct the setup to if_bridge(4) at this moment. While here, add RFC 3378 to the reference section. [1] 73ff045c575b Add RFC 3378 EtherIP support Reviewed by: meta MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51781 (cherry picked from commit bf6027df0955cb79c9c56c47cc96709b2215c82a) (cherry picked from commit 1b42526ce9f4e4587f4179a7e78655ce34b95110) M share/man/man4/gif.4 ____________________________________________________________________________________________________________ Commit: 6e605ed6df40c91120f8d64924652f8565bc05f0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6e605ed6df40c91120f8d64924652f8565bc05f0 Author: Zhenlei Huang (Fri 8 Aug 2025 11:17:51 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:20 BST) EtherIP: Fix passing the address family from if_bridge(4) to gif(4) Given IPPROTO_IPV4, IPPROTO_IPV6 and IPPROTO_ETHERIP have different protocol numbers, then it is perfect valid to tunnel IPv4, IPv6 and Ethernet traffic over IPv[46] by the same interface. Since gif(4) has already utilized the inbound csum_data field to carry address family, also teach if_bridge(4) to do that, rather than checking if a gif(4) interface is member of a if_bridge(4) interface. Without this fix, tunnel IPv[46] over IPv[46] will not work when the gif(4) interface is member of a if_bridge(4) interface, aka the EtherIP setup, as the address family passed from gif_output() will be overwritten with the wrong one AF_LINK by gif_transmit(), and end up with incorrectly encapsulated packets. PR: 227450 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227450 ) Reviewed by: kp Tested by: meta Fixes: 8a0308722372 gif(4): Assert that gif_output() isn't called for EtherIP MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51682 (cherry picked from commit f4744b8acb932fbb3e48b71d31b7cd585566b668) (cherry picked from commit aeb8f341ad20b5f49561fff688e8bee601b0e15a) M sys/net/if_bridge.c M sys/net/if_gif.c ____________________________________________________________________________________________________________ Commit: a3fbecac6879990afd88bbe95aad84abbbe8c2c8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a3fbecac6879990afd88bbe95aad84abbbe8c2c8 Author: Zhenlei Huang (Fri 8 Aug 2025 11:17:51 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:20 BST) tests: gif(4): Add regression tests for setup with EtherIP Tunnel IPv[46] traffic over IPv[46] should still function when the gif(4) interface is member of a if_bridge(4) interface, aka the EtherIP setup. PR: 227450 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227450 ) Reviewed by: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51682 (cherry picked from commit 04d0dc4c0c65592a21225cff43f25e0a0da64eb9) (cherry picked from commit e5f01421ddbfee935546271121e6254472dcc7f5) M tests/sys/net/if_gif.sh ____________________________________________________________________________________________________________ Commit: 767db004475a4b6dacde2cc4fa6ce392e63df59d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=767db004475a4b6dacde2cc4fa6ce392e63df59d Author: Zhenlei Huang (Fri 1 Aug 2025 17:33:10 BST) Committer: Zhenlei Huang (Sat 4 Oct 2025 17:43:19 BST) tests: gif(4): Add tests to cover all IPv[46] in IPv[46] setups While here, rename basic to 4in4 to be consistent with other tests. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51566 (cherry picked from commit 62439516cc9bba32ed2406f340326c4d37e4cc59) (cherry picked from commit c2806cddc64766b69daa42b4fb192f767e4b4705) M tests/sys/net/if_gif.sh ____________________________________________________________________________________________________________ Commit: bc4a85b69deac23c811af9db81fd819213234a6f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bc4a85b69deac23c811af9db81fd819213234a6f Author: Ed Maste (Sat 4 Oct 2025 14:18:40 BST) Committer: Ed Maste (Sat 4 Oct 2025 17:08:51 BST) Cirrus-CI: Bump to FreeBSD 13.5 image It is currently the oldest supported FreeBSD 13 release. Sponsored by: The FreeBSD Foundation M .cirrus.yml ____________________________________________________________________________________________________________ Commit: 40497eda791e513ebfc8a7969f9c3e7246ff47b8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=40497eda791e513ebfc8a7969f9c3e7246ff47b8 Author: Eugene Grosbein (Wed 1 Oct 2025 05:05:54 BST) Committer: Eugene Grosbein (Sat 4 Oct 2025 05:18:17 BST) trim.8: update the manual with references to zpool-trim and fsck_ffs -E (cherry picked from commit 5d8fde850768d31f722de6177204ec7cab199bd1) M usr.sbin/trim/trim.8 ____________________________________________________________________________________________________________ Commit: dc00c4cd1684416c45618f830f96efbf1744908d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dc00c4cd1684416c45618f830f96efbf1744908d Author: Xin LI (Mon 29 Sep 2025 05:28:11 BST) Committer: Xin LI (Thu 2 Oct 2025 17:41:56 BST) MFC: MFV: expat 2.7.3. (cherry picked from commit 8d485a8490fe1cd60e7b6a00d3c8a8cc116a56fb) M contrib/expat/Changes M contrib/expat/README.md M contrib/expat/configure.ac M contrib/expat/doc/reference.html M contrib/expat/doc/xmlwf.1 M contrib/expat/doc/xmlwf.xml M contrib/expat/lib/expat.h M contrib/expat/lib/internal.h M contrib/expat/lib/xmlparse.c M contrib/expat/lib/xmlrole.h M contrib/expat/tests/alloc_tests.c M contrib/expat/tests/misc_tests.c M contrib/expat/xmlwf/xmlfile.c M lib/libexpat/expat_config.h M lib/libexpat/libbsdxml.3 ____________________________________________________________________________________________________________ Commit: 01c9851772d1961053ab8f170c145f9e04abf9ef URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=01c9851772d1961053ab8f170c145f9e04abf9ef Author: Dag-Erling Smørgrav (Thu 2 Oct 2025 08:24:52 BST) Committer: Dag-Erling Smørgrav (Thu 2 Oct 2025 08:28:56 BST) nss_tacplus: Fix typo in Makefile Reported by: ivy@ MFC after: 3 days (cherry picked from commit e98d3416916cdb6285d4d1807582baf6faa3ddcc) M lib/nss_tacplus/Makefile ____________________________________________________________________________________________________________ Commit: 4704cb6d92c024c1204c1d0b62b82843a31c43a6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4704cb6d92c024c1204c1d0b62b82843a31c43a6 Author: Dag-Erling Smørgrav (Wed 1 Oct 2025 10:28:30 BST) Committer: Dag-Erling Smørgrav (Thu 2 Oct 2025 08:28:56 BST) libucl: Fix bugs in C-style comment parser When an asterisk is encountered inside a C-style comment, we first check if there is at least one more character left in the buffer, and if that character is a slash, which would terminate the comment. If that is not the case, the next two characters are consumed without being inspected. If one of those is a double quote, or the initial asterisk of an asterisk-slash pair, we end up misparsing the comment. MFC after: 3 days Reviewed by: kevans, bofh Differential Revision: https://reviews.freebsd.org/D52808 (cherry picked from commit b5e2bd5ef38181ce4a445ec19f1fa5cb6c8ea692) M contrib/libucl/src/ucl_parser.c ____________________________________________________________________________________________________________ Commit: 1d6e02cfc3f091503f441834840cfcba34c29cae URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1d6e02cfc3f091503f441834840cfcba34c29cae Author: Muhammad Moinur Rahman (Wed 27 Aug 2025 19:36:12 BST) Committer: Dag-Erling Smørgrav (Thu 2 Oct 2025 08:28:55 BST) MFV: libucl: Update to 0.9.2 - Add FREEBSD-upgrade instructions - Add FREEBSD-Xlist file - Remove all unnecessary files which are not required for in-tree build Approved by: bapt Differential Revision: https://reviews.freebsd.org/D50472 Event: Oslo Hackathon 202508 Sponsored by: The FreeBSD Foundation (cherry picked from commit 2326db40a1d2dd98631d70aae200ca52575139fb) D contrib/libucl/CMakeLists.txt D contrib/libucl/ChangeLog.md A contrib/libucl/FREEBSD-Xlist A contrib/libucl/FREEBSD-upgrade D contrib/libucl/Makefile.am D contrib/libucl/Makefile.unix D contrib/libucl/Makefile.w32 D contrib/libucl/README.md D contrib/libucl/autogen.sh D contrib/libucl/configure.ac D contrib/libucl/doc/Makefile.am D contrib/libucl/doc/api.md D contrib/libucl/doc/lua_api.md D contrib/libucl/doc/pandoc.template D contrib/libucl/examples/ucl_cpp.cc D contrib/libucl/haskell/hucl.hs M contrib/libucl/include/ucl.h D contrib/libucl/libucl.pc D contrib/libucl/libucl.pc.in D contrib/libucl/lua/Makefile.am D contrib/libucl/lua/libucl.rockspec.in M contrib/libucl/lua/lua_ucl.c D contrib/libucl/m4/ax_lua.m4 D contrib/libucl/m4/gcov.m4 D contrib/libucl/python/MANIFEST.in D contrib/libucl/python/setup.py D contrib/libucl/python/src/uclmodule.c D contrib/libucl/python/tests/__init__.py D contrib/libucl/python/tests/compat.py D contrib/libucl/python/tests/test_dump.py D contrib/libucl/python/tests/test_example.py D contrib/libucl/python/tests/test_load.py D contrib/libucl/python/tests/test_validation.py D contrib/libucl/python/ucl.pyi D contrib/libucl/src/Makefile.am M contrib/libucl/src/mum.h M contrib/libucl/src/ucl_emitter.c M contrib/libucl/src/ucl_emitter_streamline.c M contrib/libucl/src/ucl_hash.c M contrib/libucl/src/ucl_msgpack.c M contrib/libucl/src/ucl_parser.c M contrib/libucl/src/ucl_schema.c M contrib/libucl/src/ucl_util.c D contrib/libucl/stamp-h.in A contrib/libucl/tests/.gitignore D contrib/libucl/tests/Makefile.am D contrib/libucl/tests/schema/definitions.json M contrib/libucl/tests/schema/ref.json D contrib/libucl/tests/schema/refRemote.json M contrib/libucl/tests/test_speed.c M contrib/libucl/tests/test_streamline.c M contrib/libucl/uthash/utlist.h D contrib/libucl/utils/CMakeLists.txt D contrib/libucl/utils/Makefile.am D contrib/libucl/utils/chargen.c D contrib/libucl/utils/objdump.c D contrib/libucl/utils/ucl-tool.c ____________________________________________________________________________________________________________ Commit: 97d4b45ae39cc922981f42fe16e751b0fead5751 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=97d4b45ae39cc922981f42fe16e751b0fead5751 Author: John Baldwin (Mon 4 Aug 2025 20:38:06 BST) Committer: Dag-Erling Smørgrav (Thu 2 Oct 2025 08:28:55 BST) libucl: Add a ucl::Ucl::forced_string_value method This is a wrapper around ucl_object_tostring_forced. Sponsored by: Chelsio Communications Pull Request: https://github.com/freebsd/freebsd-src/pull/1794 (cherry picked from commit 47586ffc8bde236bab65da05ad3c0a660709ba96) M contrib/libucl/include/ucl++.h ____________________________________________________________________________________________________________ Commit: 817170736b8a6ab8340b2f8a193a8795d77239bf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=817170736b8a6ab8340b2f8a193a8795d77239bf Author: Baptiste Daroussin (Thu 29 Feb 2024 12:27:03 GMT) Committer: Dag-Erling Smørgrav (Thu 2 Oct 2025 08:28:55 BST) libucl: import snapshot 2024-02-06 (cherry picked from commit ddca081d382c7275bb6328c730182a007334c939) A contrib/libucl/libucl.pc A contrib/libucl/python/ucl.pyi A contrib/libucl/tests/schema/definitions.json.disabled A contrib/libucl/tests/schema/refRemote.json.disabled ____________________________________________________________________________________________________________ Commit: ae87c1af4419a8c84954a22691712cc8897a85bf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ae87c1af4419a8c84954a22691712cc8897a85bf Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 27 Sep 2025 16:21:13 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Wed 1 Oct 2025 17:31:45 BST) mktemp.1: Document TMPDIR in ENVIRONMENT While here, use Ev for TMPDIR consistently. MFC after: 3 days Event: EuroBSDCon 2025 (cherry picked from commit 6b164f18118d0e8dbf9826d7117e0e757f7eb727) M usr.bin/mktemp/mktemp.1 ____________________________________________________________________________________________________________ Commit: d7d94b0ab8b1a77eca276be5b090171d57f95632 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d7d94b0ab8b1a77eca276be5b090171d57f95632 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Sun 28 Sep 2025 09:05:47 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Wed 1 Oct 2025 16:52:31 BST) sysctl.9: Fix grammar in *TUN descriptions Reported by: bcr Reviewed by: bcr MFC after: 3 days Event: EuroBSDCon 2025 Fixes: 5eb1caa8c845 Updated SYSCTL manual pages Differential Revision: https://reviews.freebsd.org/D52768 (cherry picked from commit f34e1c76adc5efd9b603cf6b2d5827f7db8c2ed8) M share/man/man9/sysctl.9 ____________________________________________________________________________________________________________ Commit: 1488828f451c1793a23afc33e353292f3935b085 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1488828f451c1793a23afc33e353292f3935b085 Author: Ahmad Khalifa (Tue 30 Sep 2025 12:55:34 BST) Committer: Ahmad Khalifa (Wed 1 Oct 2025 09:52:33 BST) gpioc: allocate new fifo size This slipped through after I resolved some merge conflicts. Fixes: d000adfe MFC after: 1 day (cherry picked from commit 2679636b4412927242e46d3806fbb58e2702eddb) M sys/dev/gpio/gpioc.c ____________________________________________________________________________________________________________ Commit: 4472ecb362b068400f26abfce2db2a2b10a88d95 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4472ecb362b068400f26abfce2db2a2b10a88d95 Author: Ahmad Khalifa (Tue 30 Sep 2025 12:09:50 BST) Committer: Ahmad Khalifa (Wed 1 Oct 2025 09:52:21 BST) gpioc: fix race in ioctl(GPIOCONFIGEVENTS) A race can occur in gpioc_ioctl when it is called with GPIOCONFIGEVENTS closely followed by GPIOSETCONFIG. GPIOSETCONFIG can alter the priv->pins list, making it no longer empty and opening the door for access to priv->events while we are reallocating it. Fix this by holding priv->mtx while handling GPIOCONFIGEVENTS. Reported by: Qiu-ji Chen PR: 289120 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289120 ) Reviewed by: mmel MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D52783 (cherry picked from commit d000adfe41e6f2fe8f3dbe92d8fc2d34ae882086) M sys/dev/gpio/gpioc.c ____________________________________________________________________________________________________________ Commit: d8ee81cb8a868d4b066a8a087fa7726b638484d8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d8ee81cb8a868d4b066a8a087fa7726b638484d8 Author: Ahmad Khalifa (Tue 30 Sep 2025 12:09:28 BST) Committer: Ahmad Khalifa (Wed 1 Oct 2025 09:52:08 BST) gpioc: allocate priv->events with the correct size MFC after: 1 day (cherry picked from commit fa26e445544eb88f05779258e2ab9c96384fe74d) M sys/dev/gpio/gpioc.c ____________________________________________________________________________________________________________ Commit: 51cac1f186f549522aad8a0858ea1ff4413cb8fb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=51cac1f186f549522aad8a0858ea1ff4413cb8fb Author: Ahmad Khalifa (Thu 25 Sep 2025 17:54:28 BST) Committer: Ahmad Khalifa (Wed 1 Oct 2025 09:50:57 BST) ng_tty: copy to the correct mbuf memcpy should copy to the current mbuf, otherwise we're copying to the first mbuf in the chain over and over. Reported by: kevans Reviewed by: glebius MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52713 (cherry picked from commit e05521121f05a1b1e0d7c7b5fbe79f83fc303cd0) M sys/netgraph/ng_tty.c ____________________________________________________________________________________________________________ Commit: 2dc10f2a49afc688c103758a41d5fb8cab5fd1c2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2dc10f2a49afc688c103758a41d5fb8cab5fd1c2 Author: Ahmad Khalifa (Wed 24 Sep 2025 16:01:57 BST) Committer: Ahmad Khalifa (Wed 1 Oct 2025 09:50:46 BST) ng_tty: don't increment m_data Stop incrementing m_data so the callee can read the mbuf. MFC after: 3 days Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D52702 (cherry picked from commit 57d5a8feda3fd25a650eaab5998db13633d62d2d) M sys/netgraph/ng_tty.c ____________________________________________________________________________________________________________ Commit: f60ddbd0fb9005aa82985142518a9403a4f30f84 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f60ddbd0fb9005aa82985142518a9403a4f30f84 Author: Jose Luis Duran (Mon 29 Sep 2025 17:27:24 BST) Committer: Jose Luis Duran (Wed 1 Oct 2025 00:21:18 BST) ftpd: blocklist: Add a permission denied probe Reviewed by: emaste Approved by: emaste (mentor) Obtained from: NetBSD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52746 (cherry picked from commit 1060684b04b0ee1e07c6c91f7c52978835ff676a) M libexec/ftpd/ftpd.c ____________________________________________________________________________________________________________ Commit: da2437b62ec1ddda5c25dc872ab0b1a84d6306aa URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=da2437b62ec1ddda5c25dc872ab0b1a84d6306aa Author: Jose Luis Duran (Mon 29 Sep 2025 17:26:54 BST) Committer: Jose Luis Duran (Wed 1 Oct 2025 00:21:06 BST) ftpd: blocklist: Add an extra probe Add a blocklist probe when user access is denied. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52747 (cherry picked from commit 307929b211e07f91260105211b57678e906327af) M libexec/ftpd/ftpd.c ____________________________________________________________________________________________________________ Commit: c0dbaf2b5dbd16c113a6346ee748fd474fe192e5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c0dbaf2b5dbd16c113a6346ee748fd474fe192e5 Author: Gordon Tetlow (Tue 30 Sep 2025 16:28:59 BST) Committer: Gordon Tetlow (Tue 30 Sep 2025 16:28:59 BST) Fix issue from OpenSSL. Out-of-bounds read & write in RFC 3211 KEK Unwrap (CVE-2025-9230) Obtained from: OpenSSL Approved by: so Security: FreeBSD-SA-25:08.openssl Security: CVE-2025-9230 M crypto/openssl/crypto/cms/cms_pwri.c ____________________________________________________________________________________________________________ Commit: db8b10d728da9a798253cf4eb70d60a1f1075cad URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=db8b10d728da9a798253cf4eb70d60a1f1075cad Author: Krzysztof Galazka (Tue 19 Aug 2025 13:50:33 BST) Committer: Krzysztof Galazka (Mon 29 Sep 2025 14:45:33 BST) ixl(4): Fix queue MSI and legacy IRQ rearming When MSI or legacy interrupt is used driver controls wheter queues can trigger an interrupt with the Interrupt Linked List. While processing traffic first index of the list is set to EOL value to stop queues from triggering interrupts. This index was not reset to the correct value when driver attempted to re-enable interrupts from queues, what prevented driver from processing any traffic. Fix that by setting correct first index in the ixl_if_enable_intr function. While at that fix the comments style and make ixl_if_enable_intr and ixl_if_disable_intr more consistent. Signed-off-by: Krzysztof Galazka PR: 288077 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288077 ) Suggested by: Mike Belanger Approved by: kbowling (mentor), erj (mentor) Tested by: gowtham.kumar.ks_intel.com, Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D51331 (cherry picked from commit 6f41c1fc39d9fa9db989a7b4f325c3ab85b8fb45) M sys/dev/ixl/if_ixl.c ____________________________________________________________________________________________________________ Commit: 7a5bdaf1d7dd024c34c53e4eb2baeb2f427df2fa URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7a5bdaf1d7dd024c34c53e4eb2baeb2f427df2fa Author: Jose Luis Duran (Sat 13 Sep 2025 01:38:48 BST) Committer: Jose Luis Duran (Sat 27 Sep 2025 12:01:12 BST) cron: Fix comment from "root's" to "system" crontab It is referred to in the documentation as the system crontab, not root's crontab. PR: 289099 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289099 ) Reviewed by: emaste Approved by: emaste (mentor) Fixes: d33daab9348a ("Call /etc/crontab the "system crontab", not "root's crontab". While here, fix some other wording issues") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52503 (cherry picked from commit c806defe8fee62c4738f46e555d69b085e8d1259) M usr.sbin/cron/cron/crontab ____________________________________________________________________________________________________________ Commit: 87eb52f1b061989a948d3eb08953c81a4e1281f0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=87eb52f1b061989a948d3eb08953c81a4e1281f0 Author: Colin Percival (Tue 23 Sep 2025 07:55:08 BST) Committer: Colin Percival (Thu 25 Sep 2025 20:27:28 BST) freebsd-update: Library ordering Upgrading from 14.x to 15.x with freebsd-update broke because libc depends on the new libsys library; freebsd-update installed the new libc before creating libsys, and every step after that failed because all the tools (including gunzip and install) are dynamically linked and need a working libc. Enforce ordering when installing shared objects: First libsys, then libc, then libthr, and then all the rest of the shared object files. This is a candidate for an Errata Notice since the issue this fixes breaks upgrades. PR: 289769 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289769 ) Reported by: Graham Perrin Reviewed by: kib MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52688 (cherry picked from commit 7ece602e00e85195fc426a2401c49921cd39735e) M usr.sbin/freebsd-update/freebsd-update.sh ____________________________________________________________________________________________________________ Commit: 7e42cedae894c8910d95cefa2490235628243b2c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7e42cedae894c8910d95cefa2490235628243b2c Author: Siva Mahadevan (Tue 15 Jul 2025 17:45:24 BST) Committer: Ed Maste (Thu 25 Sep 2025 15:41:33 BST) bsdinstall: fix vfs.zfs.vdev.min_auto_ashift oid Signed-off-by: Siva Mahadevan PR: 266374 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266374 ) Pull request: https://github.com/freebsd/freebsd-src/pull/1851 Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit 87a7b35f04b60956e9aa192680ae80773ec38f14) (cherry picked from commit 093f3f26e95198bf1db082763e915d7a53c6ba82) (cherry picked from commit 8f7dded412516d35e538ed05524d2a14870e62b0) M usr.sbin/bsdinstall/scripts/zfsboot ____________________________________________________________________________________________________________ Commit: 08be83a3cb6802e27aa1f8aaf5f614b434f39737 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=08be83a3cb6802e27aa1f8aaf5f614b434f39737 Author: Enji Cooper (Sun 28 May 2023 03:16:39 BST) Committer: Enji Cooper (Wed 24 Sep 2025 06:36:59 BST) Fix the build post-dcf5d5603b3af8 I didn't compile test the prior code before committing. MFC after: 1 week MFC with: dcf5d5603b3af831002caa7b2f64aec8bda14071 (cherry picked from commit 27234ad6999b760041fc53326268ac86e9fd2e80) M usr.bin/factor/factor.c ____________________________________________________________________________________________________________ Commit: 8782ceb94273915fd726cd1a62d7cc080837d397 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8782ceb94273915fd726cd1a62d7cc080837d397 Author: Enji Cooper (Sat 27 May 2023 22:07:45 BST) Committer: Enji Cooper (Wed 24 Sep 2025 06:36:59 BST) Reduce ifdef soup by adding pre-3.0 compat support This change creates a static inline function, BN_check_prime, for pre-3.0 use which is implemented with the previous (1.1) compatible call under the covers, `BN_is_prime_ex`. The `nchecks` parameter value is maintained, even though it has no noticable behavior change, given that the documentation clearly states that at least 64 or 128 rounds are executed on the backend, depending on how many bits there are in the given number being factored out. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40305 (cherry picked from commit dcf5d5603b3af831002caa7b2f64aec8bda14071) M usr.bin/factor/factor.c ____________________________________________________________________________________________________________ Commit: a694dad26ba59b815ce22e0d1b82c94e0467126d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a694dad26ba59b815ce22e0d1b82c94e0467126d Author: Enji Cooper (Sat 27 May 2023 05:55:12 BST) Committer: Enji Cooper (Wed 24 Sep 2025 06:36:59 BST) factor: support OpenSSL 3 This change ports the BN APIs to an OpenSSL 3 compatible set of APIs. This removes the need for requesting OpenSSL 1.1 compatible APIs. MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40298 (cherry picked from commit 537cd766435c80e61e72bb9369f77aa9630a1537) M usr.bin/factor/factor.c ____________________________________________________________________________________________________________ Commit: ebb9f371b4a3b1218cd11b247e8d641eda923b2e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ebb9f371b4a3b1218cd11b247e8d641eda923b2e Author: Enji Cooper (Sat 27 May 2023 05:51:24 BST) Committer: Enji Cooper (Wed 24 Sep 2025 06:33:18 BST) Add simple factor/primes regression tests This will help ensure that the change following this one to support OpenSSL 3 is sane. MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40297 (cherry picked from commit c60be9ea6b1ecef6e77096601660f9573ec59a26) M etc/mtree/BSD.tests.dist M usr.bin/factor/Makefile A usr.bin/factor/tests/Makefile A usr.bin/factor/tests/factor_tests.sh A usr.bin/factor/tests/primes_tests.sh ____________________________________________________________________________________________________________ Commit: 6ff0347e8f0f64a3dade6e522d565b5f73edfbef URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6ff0347e8f0f64a3dade6e522d565b5f73edfbef Author: Enji Cooper (Fri 11 Aug 2023 04:36:48 BST) Committer: Enji Cooper (Wed 24 Sep 2025 05:49:26 BST) Unbreak usr.bin/dc with OpenSSL 3 OpenSSL's BN_zero API has had a void return value since 1.1.x: chase the change to unbreak the build on OpenSSL 3.x with MK_GH_BC == no. MFC after: 2 weeks Reviewed by: emaste, kevans Differential Revision: https://reviews.freebsd.org/D41410 (cherry picked from commit c45e66dca3e4f3073132b6f3e94623c2314f679c) M usr.bin/dc/bcode.c M usr.bin/dc/inout.c ____________________________________________________________________________________________________________ Commit: 7fcf7175e7cdcf94dd8b35d7e701f713a22bdcd4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7fcf7175e7cdcf94dd8b35d7e701f713a22bdcd4 Author: Enji Cooper (Tue 19 Aug 2025 02:06:41 BST) Committer: Enji Cooper (Wed 24 Sep 2025 05:41:11 BST) Makefile.inc1: garbage collect unused variable: install-info The variable's definition was removed with texinfo in 2d2813618c3818d7d41a7ced1fca4a1a01d3591d, but the reference to the variable was left behind. This is effectively a no-op cleanup. MFC after: 3 days (cherry picked from commit de3e5dbea171f576e9e6d89ea5238ea3c9c8b26a) M Makefile.inc1 ____________________________________________________________________________________________________________ Commit: 0416dd2d0330a451d2d558785deb84f0b5c36b40 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0416dd2d0330a451d2d558785deb84f0b5c36b40 Author: Dag-Erling Smørgrav (Mon 8 Sep 2025 14:26:43 BST) Committer: Dag-Erling Smørgrav (Tue 23 Sep 2025 14:06:14 BST) man: Fix usage message PR: 289245 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289245 ) Fixes: 14b61b2e9317 ("man: Add -l option") (cherry picked from commit dc38cf116c820df0be341ec5e359de0012b2d58a) M usr.bin/man/man.sh ____________________________________________________________________________________________________________ Commit: bbdd55f00d9b2c8830a5f35a0b7e0412b7a85e15 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bbdd55f00d9b2c8830a5f35a0b7e0412b7a85e15 Author: Xin LI (Fri 19 Sep 2025 03:43:17 BST) Committer: Xin LI (Mon 22 Sep 2025 06:56:32 BST) MFC: MFV: libexpat 2.7.2 (cherry picked from commit 627b778d9e6b603a44a010d22d823ca7c392b363) M contrib/expat/Changes M contrib/expat/Makefile.am M contrib/expat/Makefile.in M contrib/expat/README.md M contrib/expat/configure.ac M contrib/expat/doc/Makefile.in M contrib/expat/doc/reference.html M contrib/expat/doc/xmlwf.1 M contrib/expat/doc/xmlwf.xml M contrib/expat/examples/Makefile.in M contrib/expat/expat_config.h.in M contrib/expat/fuzz/xml_lpm_fuzzer.cpp M contrib/expat/fuzz/xml_parse_fuzzer.c M contrib/expat/fuzz/xml_parsebuffer_fuzzer.c M contrib/expat/lib/Makefile.in M contrib/expat/lib/expat.h M contrib/expat/lib/expat_external.h M contrib/expat/lib/internal.h M contrib/expat/lib/xmlparse.c M contrib/expat/lib/xmlrole.h M contrib/expat/lib/xmltok.c M contrib/expat/lib/xmltok.h M contrib/expat/tests/Makefile.in M contrib/expat/tests/alloc_tests.c M contrib/expat/tests/basic_tests.c M contrib/expat/tests/benchmark/Makefile.in M contrib/expat/tests/common.c M contrib/expat/tests/handlers.c M contrib/expat/tests/minicheck.h M contrib/expat/tests/misc_tests.c M contrib/expat/tests/nsalloc_tests.c M contrib/expat/xmlwf/Makefile.in M contrib/expat/xmlwf/unixfilemap.c M contrib/expat/xmlwf/xmlfile.c M contrib/expat/xmlwf/xmlwf.c M contrib/expat/xmlwf/xmlwf_helpgen.py M lib/libexpat/expat_config.h M lib/libexpat/libbsdxml.3 ____________________________________________________________________________________________________________ Commit: 3ac71c45ffa920d4d79d54813581f92442602cf7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3ac71c45ffa920d4d79d54813581f92442602cf7 Author: Dag-Erling Smørgrav (Thu 11 Sep 2025 21:51:48 BST) Committer: Dag-Erling Smørgrav (Tue 16 Sep 2025 14:55:23 BST) uptime: Mention libxo support in manual page MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52489 (cherry picked from commit 55bd607b9930e5f61219007ad0a81801c8cfdbf3) M usr.bin/w/uptime.1 M usr.bin/w/w.1 ____________________________________________________________________________________________________________ Commit: eafc54027d2ee6feac2114277d3c0f5131c9325f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eafc54027d2ee6feac2114277d3c0f5131c9325f Author: Dag-Erling Smørgrav (Wed 10 Sep 2025 17:57:26 BST) Committer: Dag-Erling Smørgrav (Tue 16 Sep 2025 14:55:22 BST) src.sys.mk: Support src.conf in SRCTOP If SRCCONF is not defined and src.conf exists at the top level of the source tree, use that instead of /etc/src.conf. MFC after: 3 days Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D52470 (cherry picked from commit dd8c666d8b78f6b9ddb691f0505837fa885ff3b4) UPDATING: mention the src.conf change Fixes: dd8c666d8b78 ("src.sys.mk: Support src.conf in SRCTOP") (cherry picked from commit ab2fea3f9a5a58f0ba90499ad3a8614e3dca0c5f) M .gitignore M UPDATING M share/man/man5/src.conf.5 M share/mk/src.sys.mk M sys/conf/kern.pre.mk M tools/build/options/makeman ____________________________________________________________________________________________________________ Commit: e5c5d8f78eade3a78825caf395c86fb9e7dccc82 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e5c5d8f78eade3a78825caf395c86fb9e7dccc82 Author: Ingo Schwarze (Sun 7 Sep 2025 21:52:09 BST) Committer: Dag-Erling Smørgrav (Tue 16 Sep 2025 14:55:22 BST) man: Add -l option Add a -l option which causes man to interpret all arguments as paths to open directly rather than man pages to search for in MANPATH. See the PR for a detailed rationale. PR: 289245 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289245 ) MFC after: 1 week Reviewed by: ziaee, emaste Differential Revision: https://reviews.freebsd.org/D52385 (cherry picked from commit 14b61b2e931741281d0bfef426e9809f16006504) M usr.bin/man/man.1 M usr.bin/man/man.sh ____________________________________________________________________________________________________________ Commit: c34e79820b3852c24180cc5f9dcc15ff7dca3b90 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c34e79820b3852c24180cc5f9dcc15ff7dca3b90 Author: Dag-Erling Smørgrav (Sun 7 Sep 2025 19:59:20 BST) Committer: Dag-Erling Smørgrav (Tue 16 Sep 2025 14:55:22 BST) unbound: Update to 1.23.1 Release notes at https://nlnetlabs.nl/news/2025/Jul/16/unbound-1.23.1-released/ Since we don't enable ECS, this is mostly a nop for us. Merge commit 'c8864f6ba46ff3271d97b4ae1c3cc6ce01eaf18a' MFC after: 3 days (cherry picked from commit 5a0119491adbea0876d9d6dc0ef3e71f3d64a20b) M contrib/unbound/config.guess M contrib/unbound/config.h.in M contrib/unbound/config.sub M contrib/unbound/configure M contrib/unbound/configure.ac M contrib/unbound/doc/README M contrib/unbound/doc/example.conf M contrib/unbound/doc/example.conf.in M contrib/unbound/doc/libunbound.3 M contrib/unbound/doc/libunbound.3.in M contrib/unbound/doc/unbound-anchor.8 M contrib/unbound/doc/unbound-anchor.8.in M contrib/unbound/doc/unbound-checkconf.8 M contrib/unbound/doc/unbound-checkconf.8.in M contrib/unbound/doc/unbound-control.8 M contrib/unbound/doc/unbound-control.8.in M contrib/unbound/doc/unbound-host.1 M contrib/unbound/doc/unbound-host.1.in M contrib/unbound/doc/unbound.8 M contrib/unbound/doc/unbound.8.in M contrib/unbound/doc/unbound.conf.5 M contrib/unbound/doc/unbound.conf.5.in M contrib/unbound/edns-subnet/subnetmod.c M contrib/unbound/edns-subnet/subnetmod.h M contrib/unbound/ltmain.sh M contrib/unbound/smallapp/unbound-control-setup.sh M lib/libunbound/Makefile M lib/libunbound/config.h ____________________________________________________________________________________________________________ Commit: d703ae86bfa1283ffbbaac37c884c61e8c1ead1c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d703ae86bfa1283ffbbaac37c884c61e8c1ead1c Author: Marius Halden (Fri 29 Aug 2025 15:36:32 BST) Committer: Dag-Erling Smørgrav (Tue 16 Sep 2025 14:03:57 BST) w: Fix idle time in json output, add login/idle times to json output Currently the idle time will show as `true` part of the time in the json output and quoting depends on what is being printed. Make sure it's always printed correctly and for consistency treated as a string in the json output. Login time delta and since times are currently exposed in the xml output, expose these times in the json output as well. In the json and xml outputs expose the number of seconds idle as a new field or attribute respectively. MFC after: 1 week Sponsored by: Modirum MDPay Event: Oslo Hackathon 202508 Differential Revision: https://reviews.freebsd.org/D52237 (cherry picked from commit 6e6febb54da91bf5e13007c3d8f4a54495273969) M usr.bin/w/pr_time.c ____________________________________________________________________________________________________________ Commit: 8302f09d844cdf2c942af57ee7babea127675990 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8302f09d844cdf2c942af57ee7babea127675990 Author: Ruslan Bukin (Wed 26 Mar 2025 08:09:50 GMT) Committer: Mitchell Horne (Mon 15 Sep 2025 20:32:17 BST) riscv timer: fix interrupt handling. Based on the spec the STIP bit of SIP register is read-only. To clear STIP bit from supervisor we have to do an SBI call to firmware. Upon reception of SBI request, the machine-mode firmware clears the STIP bit in the MIP register. This fixes operation on Codasip A730. Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D49487 (cherry picked from commit 6d58c670060a17817fa0c8ebf4e7543c3d2b4523) M sys/riscv/riscv/timer.c ____________________________________________________________________________________________________________ Commit: 850182848dada6f8524e9df2a75a01aa50b09b69 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=850182848dada6f8524e9df2a75a01aa50b09b69 Author: Ruslan Bukin (Wed 22 May 2024 15:51:45 BST) Committer: Mitchell Horne (Mon 15 Sep 2025 20:32:14 BST) riscv: Fix SSTC extension support From the SSTC spec: "If the stimecmp (supervisor-mode timer compare) register is implemented, then STIP is read-only in mip and reflects the supervisor-level timer interrupt signal resulting from stimecmp. This timer interrupt signal is cleared by writing stimecmp with a value greater than the current time value." This fixes operation in Spike with sstc extension enabled. Example: spike --isa RV64IMAFDCH_zicntr_zihpm_sstc Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D45226 (cherry picked from commit ddd0d4f4cd65341a07bb3bb833dee7982018fd60) M sys/riscv/riscv/timer.c ____________________________________________________________________________________________________________ Commit: aacf2678b67b9c57282fcf8690b0c91791b2d2a1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=aacf2678b67b9c57282fcf8690b0c91791b2d2a1 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Wed 10 Sep 2025 09:52:15 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 13 Sep 2025 12:31:38 BST) ports.7: Fix example of passing variables on the command line make(1)'s -D flag does not allow for setting the value of the variable. It just defines the variable and sets its value to 1. In fact, make(1) treats "=" as just another character in the variable name: ``` $ make -DA=2 -V A # Output is just an empty line. $ make -DA=2 -V A=2 # Variable "A=2" is defined and set to "1". 1 ``` Fixes: d25f7d324a9d ports.7: Document DEBUG_FLAGS and the process of debugging ports MFC after: 3 days (cherry picked from commit 9365a328596c9f156deaa15fa018b76b3a6e6b18) M share/man/man7/ports.7 ____________________________________________________________________________________________________________ Commit: 7f14cf603e9b312917e149386a8654bf105b04d8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7f14cf603e9b312917e149386a8654bf105b04d8 Author: Michael Osipov (Sun 31 Aug 2025 11:10:48 BST) Committer: Michael Osipov (Fri 12 Sep 2025 16:22:52 BST) bsdinstall: Drop outdated comments about ZFS dataset compression All datasets on zroot pool are compressed by default since FreeBSD 11.0 [1], no need to mention that on some specific datasets these days. [1] 47206692f2cca020891d1eec5028e02c3e6f56c5 Reviewed by: jrm (mentor), ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52304 (cherry picked from commit f304c5bb8be65df83b86f8a50e1c7982b266262d) M usr.sbin/bsdinstall/bsdinstall.8 M usr.sbin/bsdinstall/scripts/zfsboot ____________________________________________________________________________________________________________ Commit: b62a72cd8a93232cc9afa6d073c3966dd3fa5737 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b62a72cd8a93232cc9afa6d073c3966dd3fa5737 Author: Kevin Bowling (Wed 10 Sep 2025 17:45:35 BST) Committer: Kevin Bowling (Fri 12 Sep 2025 01:39:25 BST) ixgbe: Correct ixgbe_link_speed_to_str comment PR: 288960 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288960 ) Reported by: michaelo (cherry picked from commit c1532f74e4684f4b4227e873bae05b16ccc0a17c) M sys/dev/ixgbe/if_ix.c ____________________________________________________________________________________________________________ Commit: 5a85a5ed44d2fffb155f812be28f2dea3c09e83c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5a85a5ed44d2fffb155f812be28f2dea3c09e83c Author: Yogesh Bhosale (Tue 9 Sep 2025 18:01:04 BST) Committer: Kevin Bowling (Fri 12 Sep 2025 01:39:17 BST) ixgbe: Fix incomplete speed coverage in link status logging Originally ixgbe_if_update_admin_status() only handled 1G and 10G speeds, causing any other speeds to display as "1 Gbps" in link status logs. This issue is fixed by adding link speed to string conversion logic through the introduction of a helper function, ixgbe_link_speed_to_str(), which corrects the misleading logs to reflect accurate link speeds. Signed-off-by: Yogesh Bhosale yogesh.bhosale@intel.com PR: 288960 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288960 ) Reported by: Mike Belanger - QNX Differential Revision: https://reviews.freebsd.org/D52442 (cherry picked from commit 46347b3619757e3d683a87ca03efaf2ae242335f) M sys/dev/ixgbe/if_ix.c ____________________________________________________________________________________________________________ Commit: 00038a02040b308aea9674963e086d5408f7ebcf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=00038a02040b308aea9674963e086d5408f7ebcf Author: Yasuhiro Kimura (Sun 7 Sep 2025 12:38:46 BST) Committer: Cy Schubert (Thu 11 Sep 2025 06:39:55 BST) leap-seconds: Update to leap-seconds.3960835200 from IERS Current leap-seconds file has already expired on 28 June 2025 PR: 289352 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289352 ) Obtained from: https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.3960835200 MFC after: 3 days (cherry picked from commit 4729d5e2e2e3013fe1aaf92d5d932a3414f22ab3) M usr.sbin/ntp/ntpd/leap-seconds ____________________________________________________________________________________________________________ Commit: bda48373633c4870f2963d62395fbb7a7ffa524a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bda48373633c4870f2963d62395fbb7a7ffa524a Author: Rick Macklem (Tue 26 Aug 2025 02:38:54 BST) Committer: Rick Macklem (Tue 9 Sep 2025 01:59:06 BST) exports.5: Add a paragraph clarifying the use of "V4:" The exports.5 man page is a bit of a monster. One place of common confusion is the use of the "V4:" line(s) for defining the location of the root of the NFSv4 export subtree. This patch adds a paragraph in an attempt to clarify this. This is a content change. (cherry picked from commit 200730f29dbc8da2aa9392b35518bf77b8899f89) M usr.sbin/mountd/exports.5 ____________________________________________________________________________________________________________ Commit: bb5b0c1624fb6a7032367d3d0c460d407756cba3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bb5b0c1624fb6a7032367d3d0c460d407756cba3 Author: Seyed Pouria Mousavizadeh Tehrani (Thu 21 Aug 2025 18:40:29 BST) Committer: Dag-Erling Smørgrav (Thu 4 Sep 2025 19:15:15 BST) ipfw: Fix segfault in NPTv6 rule parser If the user specified a prefix length with either the internal or external prefix, we'd jump to check_prefix where we'd dereference p which was most likely uninitialized. Instead, store the various prefix lengths separately and check them all after the loop. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50597 (cherry picked from commit 64bc9ac8cd9a42259aeb1715d4e14902aa83fcac) M sbin/ipfw/nptv6.c ____________________________________________________________________________________________________________ Commit: 2e25db21976b04a6c62ba927ed0a8bea583bc07f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2e25db21976b04a6c62ba927ed0a8bea583bc07f Author: Michael Osipov (Sun 31 Aug 2025 21:06:00 BST) Committer: Michael Osipov (Thu 4 Sep 2025 15:55:50 BST) date(1): Improve manpage around '-I' * ISO 8601 defines two formats: basic and extended, clarify that we output the extended format only. * Clarify that ISO 8601 is only aware of timezone /offsets/, not timezones, it has no relation to the Olson timezone database (TZ environment variable). Reviewed by: otis (mentor), des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52314 (cherry picked from commit 21628c79d541b55b5e60231cefec73ca31719b6d) M bin/date/date.1 ____________________________________________________________________________________________________________ Commit: e3af3a23c155d85275c6e32f2fe943468f252ba3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e3af3a23c155d85275c6e32f2fe943468f252ba3 Author: Ed Maste (Mon 25 Aug 2025 15:25:13 BST) Committer: Ed Maste (Thu 4 Sep 2025 14:05:30 BST) ng_parse: Add upper bound to avoid possible overflow Also move num initialization for clarity. We still need to check num in ng_unparse_composite (reported by des@ in D52151) but this is another incremental improvement in netgraph input validation. Reviewed by: des PR: 267334 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267334 ) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52151 (cherry picked from commit 375527545c85362f14070d35575f9bcd7092f4b9) (cherry picked from commit 4407e10fdc8b969775233d47c05559c2601b60f4) M sys/netgraph/ng_parse.c ____________________________________________________________________________________________________________ Commit: bc77917cd053f5ce3d8b5e9ad6b64bad69a7bd06 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bc77917cd053f5ce3d8b5e9ad6b64bad69a7bd06 Author: Ed Maste (Tue 1 Nov 2022 14:01:29 GMT) Committer: Ed Maste (Thu 4 Sep 2025 14:05:30 BST) ng_parse: disallow negative length for malloc This is an interim robustness improvement; further improvements as described in the PR and/or Phabricator review are still needed. PR: 267334 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267334 ) Reported by: Robert Morris Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37229 (cherry picked from commit ae4f39464c61182c2bdfd3cc61594f8707b3daf0) (cherry picked from commit 0e0329c6dbabc12f5ab08bb63929a2ba6d506084) M sys/netgraph/ng_parse.c ____________________________________________________________________________________________________________ Commit: 17c0ecb14df1672ddedfab6ce0c8d95b8bdfaf31 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=17c0ecb14df1672ddedfab6ce0c8d95b8bdfaf31 Author: Dimitry Andric (Wed 27 Aug 2025 19:51:58 BST) Committer: Dimitry Andric (Sat 30 Aug 2025 10:58:12 BST) Merge commit cf721e29c6a3 from llvm git (by Amy Kwan): [PowerPC] Do not merge TLS constants within PPCMergeStringPool.cpp (#94059) This patch prevents thread-local constants to be merged within PPCMergeStringPool.cpp. The PPCMergeStringPool pass primarily merges non-thread-local constants together, and thread-local constants should not be mixed together with other (non-thread-local) constants. In the event that thread-local and other non-thread-local constants are pooled together, the llvm.threadlocal.address intrinsic can fail as it expects its argument to be a thread-local global value, but the merged string structure created by the PPCMergeStringPool pass is not thread-local as a whole. This fixes an error "llvm.threadlocal.address first argument must be a GlobalValue" when building the math/nauty port on PowerPC architectures. PR: 289122 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=289122 ) Reported by: pkubaj MFC after: 3 days (cherry picked from commit cb2887746f8b9dd4ad6b1e757cdc053a08b25a2e) M contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp ____________________________________________________________________________________________________________ Commit: 2e6697c8d90dd812a288031dca253f863602da3f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2e6697c8d90dd812a288031dca253f863602da3f Author: Ed Maste (Fri 25 Jul 2025 13:13:39 BST) Committer: Ed Maste (Fri 29 Aug 2025 16:11:18 BST) pom: Cache tzdata before entering capability mode Pom uses localtime() so needs tzdata available. PR: 278574 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278574 ) Reported by: Tatsuki Makino Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51521 (cherry picked from commit 0fde36fe04b2b656a2215f7dad07a52884e8dcfd) (cherry picked from commit 05459c1b860c086ada0cacb398fa5d61a240e0ca) M usr.bin/pom/pom.c ____________________________________________________________________________________________________________ Commit: 7cad1e5478d7c4f8116235dc7550e4309561cc78 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7cad1e5478d7c4f8116235dc7550e4309561cc78 Author: Gordon Bergling (Mon 25 Aug 2025 09:44:41 BST) Committer: Gordon Bergling (Thu 28 Aug 2025 10:15:51 BST) mwl(4): Fix a typo in a source code comment - s/firwmare/firmware/ (cherry picked from commit 4f768b8acdf818f08f4f0124c1df418127720266) M sys/dev/mwl/if_mwl.c ____________________________________________________________________________________________________________ Commit: 59088fa3915920371ce21360217d3415ae0c1331 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=59088fa3915920371ce21360217d3415ae0c1331 Author: Gordon Bergling (Mon 25 Aug 2025 09:45:32 BST) Committer: Gordon Bergling (Thu 28 Aug 2025 10:15:37 BST) bce(4): Fix a typo in a source code comment - s/firwmare/firmware/ (cherry picked from commit a848c85d27c8f8d6b8394a372417703a2969314c) M sys/dev/bce/if_bce.c ____________________________________________________________________________________________________________ Commit: f9fab6aa832ea4972548d82b1640c87ae4867c1a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f9fab6aa832ea4972548d82b1640c87ae4867c1a Author: Gordon Bergling (Mon 25 Aug 2025 09:35:01 BST) Committer: Gordon Bergling (Thu 28 Aug 2025 10:15:25 BST) cam(3): Fix a common typo in source code comments - s/tranferred/transferred/ (cherry picked from commit 90d7186379b08e5fb0f3d146a2e82a4fa8d9c9b8) M sys/cam/ata/ata_all.c M sys/cam/scsi/scsi_da.c ____________________________________________________________________________________________________________ Commit: ee72210b7c3c0dab73fd1c435dc7cb262ba6c2ac URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ee72210b7c3c0dab73fd1c435dc7cb262ba6c2ac Author: Gordon Bergling (Mon 25 Aug 2025 09:46:20 BST) Committer: Gordon Bergling (Thu 28 Aug 2025 10:15:14 BST) ice(4): Fix a typo in a source code comment - s/firwmare/firmware/ (cherry picked from commit 62db40b5644726ca61e84aa56fff2fbaf30b05ca) M sys/dev/ice/ice_fw_logging.c ____________________________________________________________________________________________________________ Commit: 6062ccb1fb7fd4b5de6ab43846ce16738612960a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6062ccb1fb7fd4b5de6ab43846ce16738612960a Author: Gordon Bergling (Mon 25 Aug 2025 09:37:27 BST) Committer: Gordon Bergling (Thu 28 Aug 2025 10:15:01 BST) ffs(3): Fix a typo in a source code comment - s/fist/first/ (cherry picked from commit cc5623d8bda6ac24faf1c18ba9712e7f78dc127b) M sys/ufs/ffs/ffs_rawread.c ____________________________________________________________________________________________________________ Commit: d0fc19ab9f0f982721c8026709e831fe9bf2db43 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d0fc19ab9f0f982721c8026709e831fe9bf2db43 Author: Gordon Bergling (Mon 25 Aug 2025 09:48:25 BST) Committer: Gordon Bergling (Thu 28 Aug 2025 10:14:50 BST) hpt27xx(4): Fix a couple of typos in source code comments - s/tranform/transform/ (cherry picked from commit 49ae0c259205e45267ed5d8dcc99132595cf1cec) M sys/dev/hpt27xx/hptintf.h ____________________________________________________________________________________________________________ Commit: 87e0274be95993dd3652d5eec9f6b45c7ecd41a4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=87e0274be95993dd3652d5eec9f6b45c7ecd41a4 Author: Gordon Bergling (Mon 25 Aug 2025 09:42:23 BST) Committer: Gordon Bergling (Thu 28 Aug 2025 10:14:33 BST) msdofs(5): Fix a typo in a source code comment - s/fist/first/ (cherry picked from commit ac4005219166fc94da4ebb7adce3da159072f6d3) M sys/fs/msdosfs/bootsect.h ____________________________________________________________________________________________________________ Commit: 0d9522888c0d37f11b3b9af0595d6dc7e0982ef2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0d9522888c0d37f11b3b9af0595d6dc7e0982ef2 Author: Dag-Erling Smørgrav (Sun 17 Aug 2025 18:07:55 BST) Committer: Dag-Erling Smørgrav (Wed 27 Aug 2025 19:50:58 BST) stat(2): Document the st_rdev field MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D51946 (cherry picked from commit 4eaa7f66620c33957ff9a929820cb791f7fe5578) M lib/libc/sys/stat.2 ____________________________________________________________________________________________________________ Commit: 59fb30e78554a587a0954351cc7a682b4e24ecdb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=59fb30e78554a587a0954351cc7a682b4e24ecdb Author: Dag-Erling Smørgrav (Sun 17 Aug 2025 18:07:45 BST) Committer: Dag-Erling Smørgrav (Wed 27 Aug 2025 19:50:57 BST) getmntpoint: Don't compare st_rdev for non-devices If the mntfromname of a mountpoint is not a device (e.g. nullfs, tarfs, procfs) we shouldn't compare st_rdev, as any match will be spurious. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D51945 (cherry picked from commit 8073a5137f223bb481606b15edaa5ecb93ceffcb) M sbin/mount/getmntopts.c ____________________________________________________________________________________________________________ Commit: 4e3f44692f6d319bc4f6f61e8abfb3736a89e128 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4e3f44692f6d319bc4f6f61e8abfb3736a89e128 Author: Dag-Erling Smørgrav (Fri 15 Aug 2025 19:04:15 BST) Committer: Dag-Erling Smørgrav (Wed 27 Aug 2025 19:50:57 BST) freebsd-update: Do not fsync Fsyncing each file we install slows us down significantly and adds little to no safety. MFC after: 1 week PR: 287897 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287897 ) (cherry picked from commit 20f0996700a8e60780931e7fde65899040465f4e) M usr.sbin/freebsd-update/freebsd-update.sh ____________________________________________________________________________________________________________ Commit: af321075b4d26f78aa29a207987551086379e592 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=af321075b4d26f78aa29a207987551086379e592 Author: Dag-Erling Smørgrav (Fri 15 Aug 2025 19:01:02 BST) Committer: Dag-Erling Smørgrav (Wed 27 Aug 2025 19:50:57 BST) libkern: Drop incorrect qsort optimization See 5205b32de3fb for details. PR: 287089 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287089 ) MFC after: 1 week Reviewed by: jlduran Differential Revision: https://reviews.freebsd.org/D51919 (cherry picked from commit ef8f3e913156aa268e07ae1daa68e3bc3f1c4d29) M sys/libkern/qsort.c ____________________________________________________________________________________________________________ Commit: c9c1ecb811d99d329b2250ee7bd7c044d759ea33 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c9c1ecb811d99d329b2250ee7bd7c044d759ea33 Author: Dag-Erling Smørgrav (Fri 15 Aug 2025 08:22:33 BST) Committer: Dag-Erling Smørgrav (Wed 27 Aug 2025 19:50:57 BST) libc: Drop incorrect qsort optimization As pointed out in the PR and the article linked below, the switch to insertion sort in the BSD qsort code is based on a misunderstanding of Knuth's TAOCP and is actually a pessimization. As demonstrated by the added test, it is trivially easy to construct pathological input which results in quadratic runtime. Without that misguided optimization, the same input runs in nearly linearithmic time. https://www.raygard.net/2022/02/26/Re-engineering-a-qsort-part-3 PR: 287089 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287089 ) MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51907 (cherry picked from commit 5205b32de3fb7702e96b3991f5b1a61eee406d8b) M lib/libc/stdlib/qsort.c M lib/libc/tests/stdlib/Makefile A lib/libc/tests/stdlib/qsort_bench.c ____________________________________________________________________________________________________________ Commit: 98ac13c4baf5deb84010d632cb3b96dacd8c4eb6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=98ac13c4baf5deb84010d632cb3b96dacd8c4eb6 Author: John-Mark Gurney (Mon 18 Aug 2025 21:25:37 BST) Committer: Mark Johnston (Mon 25 Aug 2025 16:23:12 BST) arm64: prevent panic when using syscall mux + large arg call (mmap) if the syscall muxes are used, up to two additional arguments may be required. This means that the 8 required for mmap increases up to 10 (for __syscall). Sponsored by: Juniper Networks, Inc. (cherry picked from commit 740b879c6ade531adebeba7cd2f261bbe650797f) M sys/arm64/arm64/elf32_machdep.c ____________________________________________________________________________________________________________ Commit: 9418999e0afe924167eeda63451051bb7485fe0c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9418999e0afe924167eeda63451051bb7485fe0c Author: Gordon Bergling (Sun 17 Aug 2025 08:01:13 BST) Committer: Gordon Bergling (Fri 22 Aug 2025 06:28:04 BST) arm: Fix two typos in kernel messages of pmu_fdt.c - s/interupt/interrupt/ (cherry picked from commit 9c7a9b3ff1eebbc15ef26bbdaae4f9448450523f) M sys/arm/arm/pmu_fdt.c ____________________________________________________________________________________________________________ Commit: 8d2c0354e138c49e2d5f6e0160fd3c710052a0ef URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8d2c0354e138c49e2d5f6e0160fd3c710052a0ef Author: Steve Kargl (Thu 14 Aug 2025 19:38:41 BST) Committer: Dimitry Andric (Thu 21 Aug 2025 11:41:43 BST) [libm] Avoid left shift of signed integer entities Follow-up commit d180086e6eae by fixing the left shift of signed integer entities through the use of a helper function. Specific per file changes are: * lib/msun/src/e_fmodf.c: * lib/msun/src/s_remquof.c: . Eliminate now unused variable 'i'. . Sort declaration statement. . Use subnormal_ilogbf() to avoid left shift of signed integer. * lib/msun/src/math_private.h b/lib/msun/src/math_private.h: . Implement subnormal_ilogbf() to extract an exponent of a subnormal float. This avoids left shifts of signed integers. . Update nearby comment. * lib/msun/src/s_ilogbf.c . Fix declaration of the function statement in accordance with style(9). . Use subnormal_ilogbf() to avoid left shift of signed integer. PR: 288850 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288850 ) MFC after: 1 week (cherry picked from commit c58c77246f88da87f309e8c449e98195d43e2c76) M lib/msun/src/e_fmodf.c M lib/msun/src/math_private.h M lib/msun/src/s_ilogbf.c M lib/msun/src/s_remquof.c ____________________________________________________________________________________________________________ Commit: 94b09b2f3440b16b58dd744fcaa73229f6503c10 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=94b09b2f3440b16b58dd744fcaa73229f6503c10 Author: Steve Kargl (Tue 12 Aug 2025 05:26:29 BST) Committer: Dimitry Andric (Thu 21 Aug 2025 11:41:41 BST) [libm] Fix undefined behavior of a left shifted of a signed integer The patch fixes a few instances of left shifts on signed integer entities. A 'static inline' helper function 'subnormal_ilogb()' has been added to math_private.h. This function is then used e_fmod.c, s_ilogb(), and s_remquo.c. The change in s_remquo.c has only been compile tested. The change to e_fmod.c has been test on over 3 billion pairs of subnormal numbers where testing included x > y and x < y pairs. The test compared the output from fmod() with the output from mpfr_fmod() from MPFR. There were no difference. The change to s_ilogb() has had limited testing where its output was compared against frexp(). In this testing, no differences in output were detected. PR: 288778 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288778 ) MFC after: 1 week (cherry picked from commit d180086e6eae2e152e803ed6cf13775a7c006dc7) M lib/msun/src/e_fmod.c M lib/msun/src/math_private.h M lib/msun/src/s_ilogb.c M lib/msun/src/s_remquo.c ____________________________________________________________________________________________________________ Commit: e84d5425bf533c61d00aaa8e52f505d328f4b02d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e84d5425bf533c61d00aaa8e52f505d328f4b02d Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Fri 1 Aug 2025 16:23:20 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Wed 20 Aug 2025 11:49:10 BST) dtrace.1: Document security.bsd.allow_destructive_dtrace PR: 288284 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288284 ) Reviewed by: bcr, markj MFC after: 3 days Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51633 (cherry picked from commit 1acfb873cf2e59f9ddf53602cbc67fa810c878a6) M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ____________________________________________________________________________________________________________ Commit: 1a6f2bf37241d57168cdecc75f3f432e44e9cc8f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1a6f2bf37241d57168cdecc75f3f432e44e9cc8f Author: Christos Margiolis (Tue 23 May 2023 15:29:19 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Wed 20 Aug 2025 11:49:07 BST) dtrace.1: fix mandoc -Tlint Reviewed by: markj Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D40230 (cherry picked from commit ed35c7cf7762c26246cb032b7ed30dcfbcee7a3b) M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ____________________________________________________________________________________________________________ Commit: e7fa662183546cb28cf54b15e3c543b1ffe31440 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e7fa662183546cb28cf54b15e3c543b1ffe31440 Author: Steve Kargl (Sat 9 Aug 2025 18:28:07 BST) Committer: Dimitry Andric (Sun 17 Aug 2025 19:32:35 BST) Updates for ccosh[f] and csinh[f] * lib/msun/src/s_ccosh.c: . Update Copyright years. . sin() and cos() are needed at the same time, so use sincos() to compute values. This does argument reduction once instead of twice. . Replace '* 0.5' with '/ 2'. This reduces diff with s_ccoshf.c. . For (LDBL_MANT_DIG == 53), add weak references for ccoshl and ccosl. * lib/msun/src/s_ccoshf.c: . Update Copyright years. . sin() and cos() are needed at the same time, so use sincos() to compute values. This does argument reduction once instead of twice. . Replace '* 0.5F' with '/ 2'. This reduces diff with s_ccoshf.c. * lib/msun/src/s_csinh.c: . Update Copyright years. . sin() and cos() are needed at the same time, so use sincos() to compute values. This does argument reduction once instead of twice. . Replace '* 0.5' with '/ 2'. This reduces diff with s_csinhf.c. . For (LDBL_MANT_DIG == 53), add weak references for csinhl and csinl. * lib/msun/src/s_csinhf.c: . Update Copyright years. . sin() and cos() are needed at the same time, so use sincos() to compute values. This does argument reduction once instead of twice. . Replace '* 0.5F' with '/ 2'. This reduces diff with s_ccoshf.c. PR: 288740 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288740 ) MFC after: 1 week (cherry picked from commit a1d051bc878decc761b37cf8771ead100cc05768) M lib/msun/src/s_ccosh.c M lib/msun/src/s_ccoshf.c M lib/msun/src/s_csinh.c M lib/msun/src/s_csinhf.c ____________________________________________________________________________________________________________ Commit: 1eea81c39a176ecbfe2f4ef33274c5fcc4816edb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1eea81c39a176ecbfe2f4ef33274c5fcc4816edb Author: Ryan Libby (Tue 25 Jun 2024 18:40:14 BST) Committer: Dimitry Andric (Sun 17 Aug 2025 19:32:35 BST) libmsun: remove duplicates after cdefs.h added inline to __always_inline Reviewed by: kib, olce Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45712 (cherry picked from commit 07cc7ea7386c5428cef9e8f06d4ebd8144dec311) M lib/msun/ld128/e_rem_pio2l.h M lib/msun/ld128/s_logl.c M lib/msun/ld80/e_rem_pio2l.h M lib/msun/ld80/s_logl.c M lib/msun/src/e_rem_pio2.c M lib/msun/src/e_rem_pio2f.c ____________________________________________________________________________________________________________ Commit: c96e754ea6884f5b8969861e6df66f4a33dad638 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c96e754ea6884f5b8969861e6df66f4a33dad638 Author: Kyle Evans (Sat 26 Jul 2025 07:11:58 BST) Committer: Kyle Evans (Fri 15 Aug 2025 06:03:24 BST) chroot: don't clobber the egid with the first supplemental group There are two problems here, really: 1.) If -G is specified, the egid of the runner will get clobbered by the first supplemental group 2.) If both -G and -g are specified, the first supplemental group will get clobbered by the -g group Ideally our users shouldn't have to understand the quirks of our setgroups(2) and the manpage doesn't describe the group list as needing to contain the egid, so populate the egid slot as necessary. I note that this code seems to have already been marginally aware of the historical behavior because it was allocating NGROUPS_MAX + 1, but this is an artifact of a later conversion to doing dynamic allocations instead of pushing NGROUPS_MAX arrays on the stack -- the original code did in-fact only have an NGROUPS_MAX-sized array, and the layout was still incorrect. Reviewed by: olce (cherry picked from commit 48fd05999b0f8e822fbf7069779378d103a35f5c) (cherry picked from commit babab49eee9472f628d774996de13d13d296c8c0) M usr.sbin/chroot/chroot.c ____________________________________________________________________________________________________________ Commit: 5c567849927f759c36be9b880a61d9f18e1705d6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5c567849927f759c36be9b880a61d9f18e1705d6 Author: Mark Johnston (Wed 13 Aug 2025 14:12:36 BST) Committer: Mark Johnston (Thu 14 Aug 2025 22:14:03 BST) sys/conf: Re-add -Wno-unused to ipfilter build flags This is still required on stable/13 because of the RCS tags defined at the top of each source file. This is a direct commit to stable/13. Fixes: 0947920999dc ("files: add new IPFILTER_C rule for netpfil/ipfilter sources") M sys/conf/kern.pre.mk ____________________________________________________________________________________________________________ Commit: 1e58eb141b9b391fe3953032a4c225f3f15eac4a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1e58eb141b9b391fe3953032a4c225f3f15eac4a Author: Mark Johnston (Fri 18 Apr 2025 18:31:27 BST) Committer: Mark Johnston (Thu 14 Aug 2025 22:11:11 BST) vm_pageout: Disallow invalid values for act_scan_laundry_weight PR: 234167 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234167 ) MFC after: 2 weeks (cherry picked from commit d8b03c5904faff84656d3a84a25c2b37bcbf8075) M sys/vm/vm_pageout.c ____________________________________________________________________________________________________________ Commit: 22a5c54e8a905cb47a5ff263f0a6c0d8980b1347 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=22a5c54e8a905cb47a5ff263f0a6c0d8980b1347 Author: Steve Kargl (Sat 9 Aug 2025 18:24:08 BST) Committer: Dimitry Andric (Thu 14 Aug 2025 19:32:25 BST) Remove unused variables in msun/bsdsrc/b_tgamma.c PR: 288736 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288736 ) MFC after: 3 days (cherry picked from commit 53b77089e5cacb1ae863c3f70b3e6f286ca71df5) M lib/msun/bsdsrc/b_tgamma.c ____________________________________________________________________________________________________________ Commit: 4b89029fef2a67867966a859276ecd4489bc4087 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4b89029fef2a67867966a859276ecd4489bc4087 Author: Dag-Erling Smørgrav (Tue 12 Aug 2025 13:54:08 BST) Committer: Dag-Erling Smørgrav (Thu 14 Aug 2025 15:00:06 BST) bsd.man.mk: Add checkmanlinks target This target checks that every page mentioned in MLINKS exists and that every link corresponds to a (possibly commented-out) name entry in the page it links to. MFC after: 1 week Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D51862 (cherry picked from commit 18a9f83630a7d4612066bb690bcec0437c0e2e72) M share/mk/bsd.man.mk ____________________________________________________________________________________________________________ Commit: 65cbf5862eaddd0dfccc6c43e9054252d0ca788b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=65cbf5862eaddd0dfccc6c43e9054252d0ca788b Author: Dag-Erling Smørgrav (Mon 11 Aug 2025 14:54:51 BST) Committer: Dag-Erling Smørgrav (Thu 14 Aug 2025 15:00:06 BST) kern.post.mk: Support flavors in PORTS_MODULES MFC after: 1 week PR: 288596 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288596 ) Reviewed by: pkubaj Differential Revision: https://reviews.freebsd.org/D51833 (cherry picked from commit 988426e815c12a899c8c6853090b8c8fca7ed5cd) M share/man/man7/build.7 M sys/conf/kern.post.mk ____________________________________________________________________________________________________________ Commit: 1229e3a06de93a16b46185f41e4f64db6de63896 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1229e3a06de93a16b46185f41e4f64db6de63896 Author: Dag-Erling Smørgrav (Fri 8 Aug 2025 00:34:07 BST) Committer: Dag-Erling Smørgrav (Thu 14 Aug 2025 15:00:06 BST) indent: Fix buffer overflow The function used to create a backup of the input before starting work used a static buffer and did not check that the file name it constructed did not overflow. Switch to using asprintf(), clean up the rest of the function, and update some comments that still referred to an earlier version of the code. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D51796 (cherry picked from commit eb41613d22977798f41dd979e4e4ec0965711916) M usr.bin/indent/indent.c M usr.bin/indent/tests/functional_test.sh ____________________________________________________________________________________________________________ Commit: 831799f6d3a981ee44fabf1c4a89eb78706c1bd4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=831799f6d3a981ee44fabf1c4a89eb78706c1bd4 Author: Dag-Erling Smørgrav (Fri 8 Aug 2025 00:33:56 BST) Committer: Dag-Erling Smørgrav (Thu 14 Aug 2025 15:00:06 BST) indent: Simplify test script Much of the test script was concerned with working around RCS tags and dealing with cases which don't apply to indent. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51795 (cherry picked from commit 0ecc679fd3da0720d6ba331ebcceca8e0760fa22) M usr.bin/indent/tests/functional_test.sh ____________________________________________________________________________________________________________ Commit: ebd7ad28151b4e97f469aac94388a7ffbf4f3ab0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ebd7ad28151b4e97f469aac94388a7ffbf4f3ab0 Author: Dag-Erling Smørgrav (Wed 6 Aug 2025 14:49:37 BST) Committer: Dag-Erling Smørgrav (Thu 14 Aug 2025 15:00:06 BST) hastd: Fix nv data size check The data size check, as currently written, can be defeated by providing a very large number that rounds up to 0, which will pass the check (because zero plus the size of the header and name is smaller than the size of the message) but cause a segfault later when used to index the data array. Rewrite the data size check to take rounding into account, and add a cast to ensure the name size can't round up to zero. MFC after: 1 week PR: 266827 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266827 ) Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51615 (cherry picked from commit 3caee2a93f235ebcfe3a8ec99eb2c3f3e5b0438f) M sbin/hastd/nv.c ____________________________________________________________________________________________________________ Commit: a64e034831903dae5811b8e4227b824be5b33525 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a64e034831903dae5811b8e4227b824be5b33525 Author: Dag-Erling Smørgrav (Sun 3 Aug 2025 18:31:28 BST) Committer: Dag-Erling Smørgrav (Thu 14 Aug 2025 15:00:05 BST) libutil: Add missing MLINKs MFC after: 1 week Reviewed by: olce, imp, emaste Differential Revision: https://reviews.freebsd.org/D51706 (cherry picked from commit 22afc767869a23f4e0ec5436ce843728fded950c) libutil: Remove manual link for nonexistent function I believe quota_statfs() was the original name of the function now called quota_check_path(). I must have forgotten to update the MLINK when I renamed it. MFC after: 1 week Fixes: 5666aadb3ddf ("Further extend the quotafile API.") Fixes: 22afc767869a ("libutil: Add missing MLINKs") Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D51863 (cherry picked from commit 7400d04407c033341ddc0b323b5ae7cd1cca358f) libutil: Fix manlint failures MFC after: 1 week Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D51864 (cherry picked from commit d0cc09fcdb4a3192fb76c95b1bd3c7f31a4cf486) ObsoleteFiles: Remove bogus manlink Fixes: 7400d04407c0 ("libutil: Remove manual link for nonexistent function") (cherry picked from commit 46f9056367596daad0b4f0065e5a8fa0bcbb907d) M ObsoleteFiles.inc M lib/libutil/Makefile M lib/libutil/login.conf.5 M lib/libutil/login_auth.3 M lib/libutil/login_cap.3 M lib/libutil/pw_util.3 M lib/libutil/uucplock.3 ____________________________________________________________________________________________________________ Commit: f580383f1e3e773608dcd7136ba9ebf3914b0548 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f580383f1e3e773608dcd7136ba9ebf3914b0548 Author: Dag-Erling Smørgrav (Sun 3 Aug 2025 18:31:20 BST) Committer: Dag-Erling Smørgrav (Thu 14 Aug 2025 15:00:05 BST) libutil: Document pidfile_signal() Fixes: 287451fd0192 MFC after: 1 week Reviewed by: pauamma_gundo.com, emaste Differential Revision: https://reviews.freebsd.org/D51705 (cherry picked from commit 4e6a3e7e3240a95cda1d490831aa16ed3b9bd59b) M lib/libutil/pidfile.3 ____________________________________________________________________________________________________________ Commit: 01bb889cc1b1863798ae65f95769c227bae297c3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=01bb889cc1b1863798ae65f95769c227bae297c3 Author: Kenny Levinsen (Mon 21 Apr 2025 13:13:43 BST) Committer: Jilles Tjoelker (Tue 12 Aug 2025 22:20:24 BST) wordexp(3): Handle ECHILD from waitpid If the calling process has used SIG_IGN as handler or set the SA_NOCLDWAIT flag for SIGCHLD, processes will be automatically reaped on exit and calls to waitpid(3) will therefore fail with ECHILD. We waitpid primarily to reap our child so that the caller does not have to worry about it. ECHILD indicates that there is no child to reap, so we can just treat that as a success and move on. Signed-off-by: Kenny Levinsen Tested by: Jan Beich Pull Request: https://github.com/freebsd/freebsd-src/pull/1675 (cherry picked from commit da9e73e5d483c47e67b3094356dd4b640749849e) M lib/libc/gen/wordexp.c M lib/libc/tests/gen/wordexp_test.c ____________________________________________________________________________________________________________ Commit: 77a0173ca956f9f765920fe8195b951c525671c4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=77a0173ca956f9f765920fe8195b951c525671c4 Author: Romain Tartière (Sun 3 Aug 2025 06:42:23 BST) Committer: Romain Tartière (Mon 11 Aug 2025 05:51:35 BST) vm_page: Fix handling of empty bad memory addresses file If a file with bad memory addresses is configured but that file is empty (0 lines, 0 bytes), when loading it we end up returning an end pointer that is just _before_ the start of the (empty) file content. Adjust the code to make it clear what pre-condition are required to set the *list / *end pointers correctly, and explicitly set them to NULL when they are not matched. Reported by: marklmi@yahoo.com Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51717 (cherry picked from commit f90940ce6eb71df40538c35a65d77ad3093c679a) M sys/vm/vm_page.c ____________________________________________________________________________________________________________ Commit: 8bbb1f4ce7a28236bcdce072c2113c43a2a7acd0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8bbb1f4ce7a28236bcdce072c2113c43a2a7acd0 Author: Siva Mahadevan (Thu 24 Apr 2025 13:08:47 BST) Committer: Cy Schubert (Sun 10 Aug 2025 06:55:15 BST) ip_htable: fix -Wtautological-pointer-compare warnings This also fixes a few other trivial -Wunused-but-set-variable warnings. Pull Request: https://github.com/freebsd/freebsd-src/pull/1677 MFC after: 1 month (cherry picked from commit e4c864e5550544e5ff7e395309c5098d84058403) M sys/netpfil/ipfilter/netinet/ip_htable.c ____________________________________________________________________________________________________________ Commit: 3b6536d03006240e938abbf0e6fa1d926647225e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3b6536d03006240e938abbf0e6fa1d926647225e Author: Siva Mahadevan (Thu 24 Apr 2025 13:08:47 BST) Committer: Cy Schubert (Sun 10 Aug 2025 06:55:15 BST) ip_nat.c: fix non-trivial unused variable warnings Pull Request: https://github.com/freebsd/freebsd-src/pull/1677 MFC after: 1 month (cherry picked from commit 2bae5cad793bd67c071ade7c7a8ae9d4b34e6b6c) M sys/netpfil/ipfilter/netinet/ip_nat.c ____________________________________________________________________________________________________________ Commit: 4134e9a11ca370b1f5133fbfc41275079c2a3344 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4134e9a11ca370b1f5133fbfc41275079c2a3344 Author: Siva Mahadevan (Thu 24 Apr 2025 13:08:47 BST) Committer: Cy Schubert (Sun 10 Aug 2025 06:55:15 BST) files: add new IPFILTER_C rule for netpfil/ipfilter sources This re-enables all compiler warnings for these sources. Pull Request: https://github.com/freebsd/freebsd-src/pull/1677 MFC after: 1 month (cherry picked from commit 45730dd3ed334d265fc77cf6df1f82013fd5bf69) M sys/conf/files M sys/conf/kern.pre.mk ____________________________________________________________________________________________________________ Commit: 8777d3a9b857f71f37b0cdb872f4a9597efb1e5a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8777d3a9b857f71f37b0cdb872f4a9597efb1e5a Author: Siva Mahadevan (Thu 24 Apr 2025 13:08:47 BST) Committer: Cy Schubert (Sun 10 Aug 2025 06:55:15 BST) netpfil/ipfilter: fix remaining trivial unused variable warnings Pull Request: https://github.com/freebsd/freebsd-src/pull/1677 MFC after: 1 month (cherry picked from commit 79d23845179a534f533185763cb92032202729a7) M sys/netpfil/ipfilter/netinet/fil.c M sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c M sys/netpfil/ipfilter/netinet/ip_ipsec_pxy.c M sys/netpfil/ipfilter/netinet/ip_irc_pxy.c M sys/netpfil/ipfilter/netinet/ip_lookup.c M sys/netpfil/ipfilter/netinet/ip_netbios_pxy.c M sys/netpfil/ipfilter/netinet/ip_pptp_pxy.c M sys/netpfil/ipfilter/netinet/ip_proxy.c M sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c M sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c M sys/netpfil/ipfilter/netinet/ip_rpcb_pxy.c M sys/netpfil/ipfilter/netinet/ip_state.c M sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c M sys/netpfil/ipfilter/netinet/ipf_rb.h ____________________________________________________________________________________________________________ Commit: 5a248f1b90d30442c635fd55c6584fb6d9d5a86e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5a248f1b90d30442c635fd55c6584fb6d9d5a86e Author: Siva Mahadevan (Thu 24 Apr 2025 13:08:47 BST) Committer: Cy Schubert (Sun 10 Aug 2025 06:55:14 BST) ip_nat6.c: fix non-trivial unused variable warnings Pull Request: https://github.com/freebsd/freebsd-src/pull/1677 MFC after: 1 month (cherry picked from commit 2bbaeb717b690f796e751be63a656fb097ef786d) M sys/netpfil/ipfilter/netinet/ip_nat6.c ____________________________________________________________________________________________________________ Commit: 9a34cc3bd99dae7d7c3d6004c022c46937a5c114 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9a34cc3bd99dae7d7c3d6004c022c46937a5c114 Author: Cy Schubert (Tue 8 Jul 2025 00:49:17 BST) Committer: Cy Schubert (Sun 10 Aug 2025 06:55:14 BST) sqlite3: Vendor import of sqlite3 3.50.2 Release notes at https://www.sqlite.org/releaselog/3_50_2.html. Obtained from: https://www.sqlite.org/2025/sqlite-autoconf-3500200.tar.gz MFC after: 1 month Merge commit '89922daaa168292633b1a7a523bcd0559487c6ad' (cherry picked from commit 17f0f75308f287efea825457364e2a4de2e107d4) D contrib/sqlite3/INSTALL D contrib/sqlite3/Makefile.am M contrib/sqlite3/Makefile.in M contrib/sqlite3/Makefile.msc M contrib/sqlite3/README.txt A contrib/sqlite3/VERSION D contrib/sqlite3/aclocal.m4 A contrib/sqlite3/auto.def A contrib/sqlite3/autosetup/LICENSE A contrib/sqlite3/autosetup/README.autosetup A contrib/sqlite3/autosetup/README.md A contrib/sqlite3/autosetup/autosetup R095 contrib/sqlite3/config.guess contrib/sqlite3/autosetup/autosetup-config.guess R069 contrib/sqlite3/config.sub contrib/sqlite3/autosetup/autosetup-config.sub A contrib/sqlite3/autosetup/autosetup-find-tclsh A contrib/sqlite3/autosetup/autosetup-test-tclsh A contrib/sqlite3/autosetup/cc-db.tcl A contrib/sqlite3/autosetup/cc-lib.tcl A contrib/sqlite3/autosetup/cc-shared.tcl A contrib/sqlite3/autosetup/cc.tcl A contrib/sqlite3/autosetup/find_tclconfig.tcl A contrib/sqlite3/autosetup/jimsh0.c A contrib/sqlite3/autosetup/pkg-config.tcl A contrib/sqlite3/autosetup/proj.tcl A contrib/sqlite3/autosetup/sqlite-config.tcl A contrib/sqlite3/autosetup/system.tcl A contrib/sqlite3/autosetup/teaish/README.txt A contrib/sqlite3/autosetup/teaish/core.tcl A contrib/sqlite3/autosetup/teaish/feature.tcl A contrib/sqlite3/autosetup/teaish/tester.tcl D contrib/sqlite3/compile M contrib/sqlite3/configure D contrib/sqlite3/configure.ac D contrib/sqlite3/depcomp D contrib/sqlite3/install-sh D contrib/sqlite3/ltmain.sh D contrib/sqlite3/missing M contrib/sqlite3/shell.c M contrib/sqlite3/sqlite3.c M contrib/sqlite3/sqlite3.h M contrib/sqlite3/sqlite3.pc.in M contrib/sqlite3/sqlite3.rc M contrib/sqlite3/sqlite3ext.h M contrib/sqlite3/sqlite3rc.h M contrib/sqlite3/tea/Makefile.in D contrib/sqlite3/tea/README A contrib/sqlite3/tea/README.txt A contrib/sqlite3/tea/_teaish.tester.tcl.in D contrib/sqlite3/tea/aclocal.m4 A contrib/sqlite3/tea/auto.def M contrib/sqlite3/tea/configure D contrib/sqlite3/tea/configure.ac M contrib/sqlite3/tea/doc/sqlite3.n M contrib/sqlite3/tea/generic/tclsqlite3.c M contrib/sqlite3/tea/pkgIndex.tcl.in D contrib/sqlite3/tea/tclconfig/install-sh D contrib/sqlite3/tea/tclconfig/tcl.m4 A contrib/sqlite3/tea/teaish.tcl A contrib/sqlite3/tea/teaish.test.tcl D contrib/sqlite3/tea/win/makefile.vc D contrib/sqlite3/tea/win/nmakehlp.c D contrib/sqlite3/tea/win/rules.vc ____________________________________________________________________________________________________________ Commit: 597601a23d5de22dc6d25dad0f7d7ee054e60b08 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=597601a23d5de22dc6d25dad0f7d7ee054e60b08 Author: Cy Schubert (Tue 8 Jul 2025 00:37:07 BST) Committer: Cy Schubert (Sun 10 Aug 2025 06:55:14 BST) ipfilter: End (cleanup) the iterative search key This results in not finding nodes in subsequent hash table listings. MFC after: 3 days (cherry picked from commit ac2e39b5ddf5d5c6bc3848e392670a00e5834450) M sbin/ipf/libipf/printhash_live.c ____________________________________________________________________________________________________________ Commit: 9c1615a1a141c36c2486b0b5d3ea75bf182aea5f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9c1615a1a141c36c2486b0b5d3ea75bf182aea5f Author: Cy Schubert (Mon 7 Jul 2025 17:50:27 BST) Committer: Cy Schubert (Sun 10 Aug 2025 06:55:13 BST) Revert "ipfilter: Avoid allocating a new ipf token when not needed" malloc() outside of a write lock will reduce potential contention. MFC after: 3 days This reverts commit 7f5e3b9fa3d159b7f061b4d01a767cbe5d0527f3. (cherry picked from commit cf9b6857545371ab5becc6a785c62bc844cb2f94) M sys/netpfil/ipfilter/netinet/fil.c ____________________________________________________________________________________________________________ Commit: 6b5813daf388d04e66bbf178f84ea19f45dcc182 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6b5813daf388d04e66bbf178f84ea19f45dcc182 Author: Andriy Gapon (Sat 26 Jul 2025 16:13:20 BST) Committer: Andriy Gapon (Sat 9 Aug 2025 12:31:29 BST) sys/geom: use proper style for sizeof operator No functional change is intended. Missing parentheses around sizeof operands have been added with a coccinnele patch: @disable paren@ expression E; @@ ( sizeof(E) | sizeof +( E +) ) Spaces between sizeof and a parenthesis have been removed with sed. Discussed with: imp (cherry picked from commit 150834f8fa57c1ee42e4dd5a42e7faf08ec5b2e5) M sys/geom/geom.h M sys/geom/geom_ccd.c M sys/geom/geom_event.c M sys/geom/geom_io.c M sys/geom/geom_slice.c M sys/geom/geom_subr.c M sys/geom/multipath/g_multipath.c M sys/geom/virstor/g_virstor.c ____________________________________________________________________________________________________________ Commit: 805f6029286e2045326877e8d06ae1adc2e41862 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=805f6029286e2045326877e8d06ae1adc2e41862 Author: Dag-Erling Smørgrav (Sat 2 Aug 2025 00:11:26 BST) Committer: Dag-Erling Smørgrav (Fri 8 Aug 2025 20:46:33 BST) kyua: Stop using readdir_r() It cannot be used safely, and Kyua doesn't even pretend to try. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: igoro Differential Revision: https://reviews.freebsd.org/D51680 (cherry picked from commit 65bae451c23b8d61b2433259d8e707250660eeff) M contrib/kyua/utils/fs/directory.cpp ____________________________________________________________________________________________________________ Commit: 83e2f9e1c0cf31ee8750051d8f6ef661ddafba66 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=83e2f9e1c0cf31ee8750051d8f6ef661ddafba66 Author: Dag-Erling Smørgrav (Sat 2 Aug 2025 00:11:18 BST) Committer: Dag-Erling Smørgrav (Fri 8 Aug 2025 20:46:32 BST) libarchive: Stop using readdir_r() It cannot be used safely, though libarchive goes to ridiculous lengths to attempt to do so. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51679 (cherry picked from commit 01e42ce81f751ccbeeddc4bc2716e6bd634cf5f8) M lib/libarchive/config_freebsd.h ____________________________________________________________________________________________________________ Commit: 6d2bc21c67310479747d7d05eac9cd13821b50c7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6d2bc21c67310479747d7d05eac9cd13821b50c7 Author: Dag-Erling Smørgrav (Sat 2 Aug 2025 00:11:12 BST) Committer: Dag-Erling Smørgrav (Fri 8 Aug 2025 20:46:32 BST) bsnmpd: Fix an error message MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51678 (cherry picked from commit bf304a40cde836435a55e938865fc12ce81cf0fe) M usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c ____________________________________________________________________________________________________________ Commit: f318186deb3ef3b90104e8372563e80c9358183e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f318186deb3ef3b90104e8372563e80c9358183e Author: Dag-Erling Smørgrav (Thu 31 Jul 2025 11:06:47 BST) Committer: Dag-Erling Smørgrav (Wed 6 Aug 2025 14:52:14 BST) netlink: Fully clear parser state between messages Failing to reset the cookie between messages can lead to an attempt to interpret a zeroed buffer as a struct nlattr, causing a length calculation to underflow, resulting in a memcpy() call where the length exceeds the actual size of the buffer. MFC after: 1 week PR: 283797 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283797 ) Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D51634 (cherry picked from commit a8d90e32133b77a49c2551f22e59f72d65293b64) M sys/netlink/netlink_io.c ____________________________________________________________________________________________________________ Commit: aadc10e7ce1a8bb47cd628a2111b71fac3684915 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=aadc10e7ce1a8bb47cd628a2111b71fac3684915 Author: Andriy Gapon (Mon 23 Jun 2025 22:30:23 BST) Committer: Andriy Gapon (Wed 6 Aug 2025 07:04:36 BST) cam_fill_mmcio: initialize cmd.error sub-field For me, this fixes a problem with using eMMC storage in MMCCAM configuration with dwmmc driver (on Rock64). The problem appeared after commit 07da3bb5d56c85 "mmc: support for SPI bus type". The problem was caused by the said commit changing the layout of struct mmc_ios which is embedded into struct ccb_trans_settings_mmc with the latter being embedded into struct ccb_trans_settings, a member of union ccb. The layout mattered for two reasons: 1. dwmmc sets cmd.error only in case of an error; 2. mmc_da's sdda_start_init uses the same ccb for different transaction types without explicitly clearing the object between transactions. As a result, cmd.error could start out with a non-zero value and dwmmc would keep that value which would then be interpreted as a failure. Such a failure happened in mmc_set_timing resulting in incorrect timing settings and subsequent complete failure to communicate with the eMMC module. Reviewed by: pkelsey (cherry picked from commit 10db2ad8614adc544292856c693503ca8e9c9fd9) M sys/cam/cam_ccb.h ____________________________________________________________________________________________________________ Commit: 706291eddb45a9afd8e690dc8d7e2c8d6bad6084 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=706291eddb45a9afd8e690dc8d7e2c8d6bad6084 Author: Andriy Gapon (Fri 4 Jul 2025 08:53:11 BST) Committer: Andriy Gapon (Wed 6 Aug 2025 07:04:32 BST) mmc_da: garbage-collect sdda_get_max_data The function is unused since 5aedb8b1d4a6. For information, in MMC CAM both XPT_GET_TRAN_SETTINGS and XPT_PATH_INQ obtain data using MMC_SIM_GET_TRAN_SETTINGS. So, "overlapping" information like ccb_trans_settings_mmc::host_max_data and ccb_pathinq::maxio is derived from the same source. That's why sdda_get_max_data was redundant. Reported by: bz (cherry picked from commit ad0c3859a9184036484c0cd63d7260a4a3d1ad2d) M sys/cam/mmc/mmc_da.c ____________________________________________________________________________________________________________ Commit: 7293d821041206d0c520e798d3faa2a0639dea29 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7293d821041206d0c520e798d3faa2a0639dea29 Author: Andriy Gapon (Mon 23 Jun 2025 22:43:35 BST) Committer: Andriy Gapon (Wed 6 Aug 2025 07:04:27 BST) mmc_da: fix garbage in disk->d_attachment The garbage resulted from reading the value from a ccb which was originally populated by XPT_PATH_INQ operation but then overwritten by XPT_GET_TRAN_SETTINGS operation. The problem could probably be fixed by re-ordering the XPT_GET_TRAN_SETTINGS operation, but it seems like the operation was redundant. Besides, the ccb is declared not as union ccb but as struct ccb_pathinq, so using it for XPT_GET_TRAN_SETTINGS was questionable. I opted for replacing a call to sdda_get_max_data (which uses XPT_GET_TRAN_SETTINGS internally) with using maxio provided by the XPT_PATH_INQ operation. This also required fixing mmc_cam_sim_default_action as controllers return maximum I/O size in sectors, but maxio value should be in bytes. (cherry picked from commit 5aedb8b1d4a6c099eaa0a65f8fcbdcc4aba8f75b) M sys/cam/mmc/mmc_da.c M sys/cam/mmc/mmc_sim.c ____________________________________________________________________________________________________________ Commit: be941fa4830fc7f9da6a34af70ac52780048037b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=be941fa4830fc7f9da6a34af70ac52780048037b Author: Andriy Gapon (Mon 23 Jun 2025 22:31:04 BST) Committer: Andriy Gapon (Wed 6 Aug 2025 07:04:23 BST) mmc_xpt: use strlcpy instead of strncpy A better practice in general. (cherry picked from commit ad8d33679999c0e7f6fd2b77d2e414102bd365ec) M sys/cam/mmc/mmc_xpt.c ____________________________________________________________________________________________________________ Commit: f8f0cae5e06bc3598cc97a618aad62e8c5671bfd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f8f0cae5e06bc3598cc97a618aad62e8c5671bfd Author: Andriy Gapon (Thu 27 Jun 2024 08:48:30 BST) Committer: Andriy Gapon (Wed 6 Aug 2025 06:55:34 BST) rk_i2c: use the register read mode even if the read ends with IIC_M_NOSTOP Tested with max44009(4). (cherry picked from commit a743e280ea0541163afa7d1c320504925a02f80b) M sys/arm64/rockchip/rk_i2c.c ____________________________________________________________________________________________________________ Commit: e71f019b82f4d4e623fa75aca647cf7103d89b54 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e71f019b82f4d4e623fa75aca647cf7103d89b54 Author: Andriy Gapon (Thu 27 Jun 2024 08:40:22 BST) Committer: Andriy Gapon (Wed 6 Aug 2025 06:55:24 BST) rk_i2c: emulate repeated start rk_i2c_send_stop is modified so that it sends a stop condition, like it always did, if there is no IIC_M_NOSTOP flag. But if the flag is set then the function completely resets the control register and sets the driver state to transfer completed. Something like this was previously done for a write with IIC_M_NOSTOP. Now it is done for a read with IIC_M_NOSTOP as well. Linux code says that the hardware does not support the repeated start condition and the documentation, indeed, does not mention it. But according to the Linux driver clearing the control register and then sending a start condition acts as if it were a repeated start. While here, add braces around a single-line 'if' branch to balance it with a multi-line 'else' branch. Tested with max44009(4). (cherry picked from commit 0deaf4be346f7f343bd2cf771bbf5d172d1c0d2a) M sys/arm64/rockchip/rk_i2c.c ____________________________________________________________________________________________________________ Commit: 6ca3734e928cc82f2f91b991be28c9900b2b4a07 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6ca3734e928cc82f2f91b991be28c9900b2b4a07 Author: Dag-Erling Smørgrav (Mon 28 Jul 2025 16:28:26 BST) Committer: Dag-Erling Smørgrav (Tue 5 Aug 2025 12:52:28 BST) comsat: Don't read arbitrary files When processing a notification, instead of accepting any file name that doesn't begin with a slash, accept only file names that don't contain any slashes at all. This makes it possible to notify a user about a mailbox that doesn't bear their name, as long as they are permitted to read it, but prevents comsat from reading files outside the mail spool. PR: 270404 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270404 ) MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D51580 (cherry picked from commit 4a4338d94401f0012380d4f1a4d332bd6d44fa8e) comsat: Don't return from the child Fixes: 91629228e3df MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D51581 (cherry picked from commit e40a2c4927a8068d7b6adee69c90ae3be8efc4df) M libexec/comsat/comsat.c ____________________________________________________________________________________________________________ Commit: 1501ecebf5af7b47fde0020b888cfb4e4df1074e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1501ecebf5af7b47fde0020b888cfb4e4df1074e Author: Ed Maste (Wed 27 Nov 2024 20:36:46 GMT) Committer: Dag-Erling Smørgrav (Tue 5 Aug 2025 12:52:26 BST) comsat: Improve use of setuid() Just return from jkfprintf if either (a) user lookup fails (that is, getpwnam fails) or (b) setuid() to the user's uid fails. If comsat is invoked from inetd using the default of tty:tty we will now return due to setuid() failing rather than fopen() failing. PR: 270404 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270404 ) Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47823 (cherry picked from commit 062b69ba045dc0fef3d9b8d73365d2798c05a480) comsat: Use initgroups and setgid not just setuid PR: 270404 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270404 ) Reviewed by: jlduran Obtained from: NetBSD Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47828 (cherry picked from commit d4dd9e22c13896e6b5e2a6fc78dad4f8496cc14d) comsat: move uid/gid setting earlier It's good to reduce privilege as early as possible. Suggested by: jlduran Reviewed by: jlduran Obtained from: NetBSD Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47869 (cherry picked from commit 91629228e3df14997df12ffc6e7be6b9964e5463) M libexec/comsat/comsat.c ____________________________________________________________________________________________________________ Commit: 39bc7081b8a9c2f013d90a3d054bff7c1c6fe303 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=39bc7081b8a9c2f013d90a3d054bff7c1c6fe303 Author: Dag-Erling Smørgrav (Sat 26 Jul 2025 17:44:35 BST) Committer: Dag-Erling Smørgrav (Tue 5 Aug 2025 10:33:12 BST) xargs: Limit -n to {ARG_MAX} Since it's not possible to pass more than {ARG_MAX} bytes on the command line, it's also not possible to pass more than {ARG_MAX} individual arguments. Therefore, {ARG_MAX} is a reasonable upper bound for the -n option. This resolves both the arithmetic overflow issue and the CI OOM issue, so we can safely re-enable the test. Fixes: eab91d008165 Fixes: 2682a1552724 MFC after: 1 week Reviewed by: jlduran, emaste Differential Revision: https://reviews.freebsd.org/D51536 (cherry picked from commit a7fa987abe1fb0b25a7dd83dc81f14f64a82efc9) M ObsoleteFiles.inc M usr.bin/xargs/tests/Makefile R100 usr.bin/xargs/tests/regress.n2147483647.out usr.bin/xargs/tests/regress.nargmax.out M usr.bin/xargs/tests/regress.sh M usr.bin/xargs/xargs.c ____________________________________________________________________________________________________________ Commit: a42bf0da8d584063d610e1b233e7404d1892ba35 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a42bf0da8d584063d610e1b233e7404d1892ba35 Author: Dag-Erling Smørgrav (Thu 24 Jul 2025 14:00:37 BST) Committer: Dag-Erling Smørgrav (Tue 5 Aug 2025 10:32:41 BST) rc.d: Fix mountd service script. This script references variables beloning to the nfsd and zfs services, therefore it needs to load their configurations. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51473 (cherry picked from commit aa183bc7f96fdd51c4a6ead5586a1cb1ecec6bb2) M libexec/rc/rc.d/mountd ____________________________________________________________________________________________________________ Commit: d91839d3e3664681e9dbed83c751bb16b1500764 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d91839d3e3664681e9dbed83c751bb16b1500764 Author: Dmitry Morozovsky (Tue 22 Jul 2025 13:32:34 BST) Committer: Dmitry Morozovsky (Tue 5 Aug 2025 06:53:06 BST) extend description of net.inet.ip.fw.one_pass Description of net.inet.ip.fw.one_pass tunable refers only to dummynet(4), while in reality is applicable on any divert-like packet action like in-kernel nat, netgraph, reass, or similar. Reviewed by: ae MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51436 M sys/netpfil/ipfw/ip_fw2.c ____________________________________________________________________________________________________________ Commit: 4266bc4fcf9b46565f20e46f12ccd2afec9c0734 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4266bc4fcf9b46565f20e46f12ccd2afec9c0734 Author: Xin LI (Sun 20 Jul 2025 18:33:52 BST) Committer: Xin LI (Sun 3 Aug 2025 02:00:44 BST) MFC: MFV: less v679. (cherry picked from commit 76bafc90692608c1db8df3276e966212201c270c) M contrib/less/NEWS M contrib/less/decode.c M contrib/less/help.c M contrib/less/less.h M contrib/less/less.nro M contrib/less/lessecho.nro M contrib/less/lesskey.nro M contrib/less/os.c M contrib/less/version.c ____________________________________________________________________________________________________________ Commit: e4624465c16adb0e60a6b0edeb570dc103b40831 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e4624465c16adb0e60a6b0edeb570dc103b40831 Author: Romain Tartière (Fri 25 Jul 2025 19:31:57 BST) Committer: Romain Tartière (Sat 2 Aug 2025 06:31:38 BST) vm_page: Fix loading bad memory addresses from file When loading bad memory addresses from a file, we are passed an end pointer that points on the first byte after the buffer. We want the buffer to be null-terminated (by changing the last byte to \0 if it is reasonable to do so), so adjust the end pointer to be on that byte. Approved by: kib, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51433 (cherry picked from commit 202f8bde836dc86627be2b5b98174d9a0fb2eaba) M sys/vm/vm_page.c ____________________________________________________________________________________________________________ Commit: aee028cb4e96541150c528767c1aeb0ca3869d37 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=aee028cb4e96541150c528767c1aeb0ca3869d37 Author: Zhenlei Huang (Sat 19 Jul 2025 18:07:54 BST) Committer: Zhenlei Huang (Thu 31 Jul 2025 11:11:52 BST) if_genet: Plug memory leaks The rx_buf_tag should be checked when destroying rx dma mappings. PR: 288309 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288309 ) Reviewed by: zlei Submitted by: Mike Belanger MFC after: 3 days (cherry picked from commit f46e95ae3addc9f7b975c187f71125825a38ffb1) (cherry picked from commit 337c3e9859e7b5d971e84bf546a51c2cf9a9e44f) M sys/arm64/broadcom/genet/if_genet.c ____________________________________________________________________________________________________________ Commit: 8c49d0a9f825a1915a3ff8eb5ef8ee8223b5d5f1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8c49d0a9f825a1915a3ff8eb5ef8ee8223b5d5f1 Author: Zhenlei Huang (Sat 19 Jul 2025 18:07:54 BST) Committer: Zhenlei Huang (Thu 31 Jul 2025 11:11:51 BST) if_genet: Consistently use the boolean form The variable eaddr_found is declared as bool. This change improves readability a little. No functional change intended. MFC after: 3 days (cherry picked from commit 2fc051d090933203e1af6a8452cdd87a4c76ad5b) (cherry picked from commit 97d5f16c6966e2ae261ddabe1f16a9675dedf43a) M sys/arm64/broadcom/genet/if_genet.c ____________________________________________________________________________________________________________ Commit: de19b9d6e967a91565605b04c9f4b61b2099f096 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=de19b9d6e967a91565605b04c9f4b61b2099f096 Author: Lexi Winter (Sun 27 Jul 2025 11:53:19 BST) Committer: Lexi Winter (Thu 31 Jul 2025 10:57:54 BST) clang-scan-deps: Pass ${TDFILE} to tblgen, not ${.ALLSRC} ${.ALLSRC} can include the dependency OptParser.td, which causes llvm-tblgen to fail since it only accepts a single input argument. Use ${TDFILE} directly instead, which matches the other invocations of tblgen in the LLVM Makefiles. Fixes: d3c06bed2c16 ("clang: install clang-scan-deps") MFC after: 3 days Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D51569 (cherry picked from commit ad023bc26e106e28e1b4845f991b52b533bd0802) M usr.bin/clang/clang-scan-deps/Makefile ____________________________________________________________________________________________________________ Commit: 4eee2c9e9625f32fe822092f4fdbd87b30ec10a8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4eee2c9e9625f32fe822092f4fdbd87b30ec10a8 Author: Lexi Winter (Fri 25 Jul 2025 14:59:58 BST) Committer: Lexi Winter (Thu 31 Jul 2025 10:56:56 BST) crash.8: update a little Replace "cannot mount root" (which is no longer a panic) with a brief description of the mountroot> prompt, and recommend using "system install media" rather than the fixit floppy. Remove "timeout table full" entirely since this panic no longer exists. MFC after: 3 days Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D51512 (cherry picked from commit c9868af774ec24bcf6914fc971378e9723eb44ab) M share/man/man8/crash.8 ____________________________________________________________________________________________________________ Commit: 0a2335471314ea026042944d5971558e301cc779 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0a2335471314ea026042944d5971558e301cc779 Author: Lexi Winter (Thu 24 Jul 2025 22:12:50 BST) Committer: Lexi Winter (Thu 31 Jul 2025 10:56:30 BST) pom.6: add a more complete bibliography Source: Wikipedia (cherry picked from commit bf0ee5f2175a3c6eb52f9fc74b93b445d37a6086) M usr.bin/pom/pom.6 ____________________________________________________________________________________________________________ Commit: fd05ce71c736143f0b3f569765f5374956ce8c10 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fd05ce71c736143f0b3f569765f5374956ce8c10 Author: Ed Maste (Wed 30 Jul 2025 19:05:29 BST) Committer: Ed Maste (Thu 31 Jul 2025 01:06:49 BST) dtrace.1: Resolve merge conflict PR: 288556 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288556 ) Fixes: 0c91fa982437 ("dtrace_fbt.4: Document the DTrace fbt provider") (cherry picked from commit 185bd9cf219999a38093e853bfda8ed1ca21fc5b) M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ____________________________________________________________________________________________________________ Commit: 7ee04c7b17d15e2296b796e1657b0b152eba9d4c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7ee04c7b17d15e2296b796e1657b0b152eba9d4c Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 12 Jul 2025 17:20:32 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Wed 30 Jul 2025 10:55:30 BST) rc: Use check_jail to check values of security.jail MIBs PR: 282404 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282404 ) Reviewed by: markj, netchild Approved by: markj (mentor) MFC after: 2 weeks Event: Berlin Hackathon 202507 Differential Revision: https://reviews.freebsd.org/D47329 (cherry picked from commit 46f18ecf8d3cdda1cd433841c44a4c1268ab9721) M libexec/rc/rc M libexec/rc/rc.d/hostname M libexec/rc/rc.d/routing M libexec/rc/rc.d/zfs M libexec/rc/rc.d/zfsbe M libexec/rc/rc.shutdown M libexec/rc/rc.subr ____________________________________________________________________________________________________________ Commit: 2dded8fb5b25cb70629d49fecc540ef175a4fff6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2dded8fb5b25cb70629d49fecc540ef175a4fff6 Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 14 Jun 2025 20:26:48 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Wed 30 Jul 2025 10:41:09 BST) dtrace_fbt.4: Document the DTrace fbt provider Reported by: markj Reviewed by: christos, markj (earlier version), ziaee Obtained from: Mark Johnston, DTrace, FreeBSD Journal, May 2014 Obtained from: https://wiki.freebsd.org/DTrace/One-Liners MFC after: 2 weeks Relnotes: yes (cherry picked from commit 9388c2887817d7162ebb356b39aa9b4ab67a8c00) Do not mention dtrace_kinst(4) as it is not available on FreeBSD 13. M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 M share/man/man4/Makefile A share/man/man4/dtrace_fbt.4 ____________________________________________________________________________________________________________ Commit: 683f161bd5bee181308a86cec6b1a1d4f3ad0f1e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=683f161bd5bee181308a86cec6b1a1d4f3ad0f1e Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 14 Jun 2025 18:24:03 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Wed 30 Jul 2025 10:39:16 BST) dtrace.1: Mention providers in SEE ALSO Reviewed by: bnovkov, christos, markj Approved by: bnovkov (mentor), christos (mentor), markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50852 (cherry picked from commit 177471148a6111537e84912fb9a033b6ac5ecb17) M cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ____________________________________________________________________________________________________________ Commit: 0bb490bdbff4bb39e7a3429ee2176bd123b627ca URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0bb490bdbff4bb39e7a3429ee2176bd123b627ca Author: Michael Proto (Sun 13 Jul 2025 22:30:28 BST) Committer: Kristof Provost (Tue 29 Jul 2025 08:48:51 BST) /etc/rc.d/pf: Fix for multi-line pf_fallback_rules Setting multiple pf_fallback_rules in /etc/rc.conf as per the documentation produces invalid pf syntax due to the lack of echo quoting $pf_fallback_rules in /etc/rc.d/pf. Adding quotes around the $pf_fallback_rules echo maintains newlines needed for valid pfctl syntax. Provided patch resolves the issue Also updating rc.conf(5) to reflect that multi-line pf_fallback_rules should not include a trailing backslash (\) as line breaks are needed when passing rules to pfctl via stdin. PR: 288197 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288197 ) Reviewed by: kp MFC after: 2 weeks (cherry picked from commit 9e8c1f9576e75fcd34007c6e8a4a6da0b1b2f1e2) M libexec/rc/rc.d/pf M share/man/man5/rc.conf.5 ____________________________________________________________________________________________________________ Commit: 4f8cb9f1daf80f7e23d581a86bb47cd47717f095 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4f8cb9f1daf80f7e23d581a86bb47cd47717f095 Author: Eric Joyner (Fri 30 Aug 2024 01:28:59 BST) Committer: Eugene Grosbein (Sat 26 Jul 2025 12:11:17 BST) MFC: ice: unbreak build with update to 1.42.5-k - Removes duplicate E825C printout - Fixes a package download issue with E830 - Updates mentions of E830-XXV to E830-L - Fix FW logging on load issue by limiting the setting of FW log masks and other global configuration to just the first PF of the controller - Update ice_hw_autogen.h with timesync registers (unused in this driver) - Fix possible overflow condition in NVM access function - Blocks RDMA load on E830 devices Signed-off-by: Eric Joyner Tested by: Jeffrey Pieper Relnotes: yes Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D46950 (cherry picked from commit 440addc642496f8d04fe17af9eb905ac4a5bdbd8) (cherry picked from commit 5f92347a9bc8f372eef46555e2ba3de65259f97d) M sys/dev/ice/ice_ddp_common.c M sys/dev/ice/ice_ddp_common.h M sys/dev/ice/ice_devids.h M sys/dev/ice/ice_drv_info.h M sys/dev/ice/ice_fw_logging.c M sys/dev/ice/ice_hw_autogen.h M sys/dev/ice/ice_lib.c M sys/dev/ice/ice_lib.h M sys/dev/ice/ice_nvm.c M sys/dev/ice/if_ice_iflib.c ____________________________________________________________________________________________________________ Commit: f12f5d1d6629ed17af1d096e5a906dc773df2064 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f12f5d1d6629ed17af1d096e5a906dc773df2064 Author: Eugene Grosbein (Tue 22 Jul 2025 10:55:08 BST) Committer: Eugene Grosbein (Sat 26 Jul 2025 08:16:47 BST) devd(8): correct error logging Fix a mistake in a log message that leaked from my preliminary patch. PR: 287873 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287873 ) MFC after: 3 days X-MFC-with: bd4a4e46ceacd8dfc5a5469ec6edd8c92c53605a (cherry picked from commit 044febb24a26d92066b2849eb583f57e37acdbfd) M sbin/devd/devd.cc ____________________________________________________________________________________________________________ Commit: 0111be0a409294763a1bfda21f4bff2b26545cb8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0111be0a409294763a1bfda21f4bff2b26545cb8 Author: Warner Losh (Sat 19 Jul 2025 06:31:50 BST) Committer: Eugene Grosbein (Sat 26 Jul 2025 08:16:09 BST) devd: Add vm_guest variable Fetch vm_guest on startup in case we're running under a hypervisor. Co-authored-by: eugen@ PR: 287873 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287873 ) Sponsored by: Netflix (cherry picked from commit bd4a4e46ceacd8dfc5a5469ec6edd8c92c53605a) M sbin/devd/devd.cc ____________________________________________________________________________________________________________ Commit: 8812941de64d964ea0b169c8cca4fceccb4315c7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8812941de64d964ea0b169c8cca4fceccb4315c7 Author: Eugene Grosbein (Tue 22 Jul 2025 11:06:24 BST) Committer: Eugene Grosbein (Sat 26 Jul 2025 08:15:56 BST) devd.conf(5): call hyperv_vfattach in a Hyper-V guest only Limit calls to /usr/libexec/hyperv/hyperv_vfattach to Hyper-V guests. PR: 287873 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287873 ) MFC after: 3 days (cherry picked from commit d4a0e749cc66cd5d019d8fb8f43427109aef4c9f) M sbin/devd/hyperv.conf ____________________________________________________________________________________________________________ Commit: 00daa1b56a8b069dbf335d383b29a845bc616bd3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=00daa1b56a8b069dbf335d383b29a845bc616bd3 Author: Eric Joyner (Thu 29 Aug 2024 23:41:20 BST) Committer: Krzysztof Galazka (Thu 24 Jul 2025 15:17:53 BST) ice: Update to 1.42.1-k Summary: - Adds E830 device support - Adds pre-release E825C support (for the Ethernet device included in an upcoming Xeon D platform) - Add sysctl for E810 devices to print out PHY debug statistics (mostly for FEC debugging) - Adds per-TX-queue tso counter sysctl to count how many times a TSO offload was requested for a packet, matching other Intel drivers - Various bug fixes Signed-off-by: Eric Joyner Tested by: Jeffrey Pieper Relnotes: yes Sponsored by: Intel Corporation Differential Revisison: https://reviews.freebsd.org/D46949 (cherry picked from commit f2635e844dd138ac9dfba676f27d41750049af26) M sys/dev/ice/ice_adminq_cmd.h M sys/dev/ice/ice_bitops.h M sys/dev/ice/ice_common.c M sys/dev/ice/ice_common.h M sys/dev/ice/ice_common_txrx.h M sys/dev/ice/ice_controlq.c M sys/dev/ice/ice_controlq.h M sys/dev/ice/ice_dcb.c M sys/dev/ice/ice_dcb.h M sys/dev/ice/ice_ddp_common.c M sys/dev/ice/ice_ddp_common.h M sys/dev/ice/ice_devids.h M sys/dev/ice/ice_drv_info.h M sys/dev/ice/ice_features.h M sys/dev/ice/ice_flex_pipe.c M sys/dev/ice/ice_flex_pipe.h M sys/dev/ice/ice_flow.c M sys/dev/ice/ice_flow.h M sys/dev/ice/ice_fw_logging.c M sys/dev/ice/ice_fwlog.c M sys/dev/ice/ice_fwlog.h M sys/dev/ice/ice_hw_autogen.h M sys/dev/ice/ice_iflib.h M sys/dev/ice/ice_lan_tx_rx.h M sys/dev/ice/ice_lib.c M sys/dev/ice/ice_lib.h M sys/dev/ice/ice_nvm.c M sys/dev/ice/ice_nvm.h M sys/dev/ice/ice_rdma.c A sys/dev/ice/ice_sbq_cmd.h M sys/dev/ice/ice_sched.c M sys/dev/ice/ice_sched.h M sys/dev/ice/ice_strings.c M sys/dev/ice/ice_switch.c M sys/dev/ice/ice_switch.h M sys/dev/ice/ice_type.h M sys/dev/ice/ice_vlan_mode.c M sys/dev/ice/ice_vlan_mode.h M sys/dev/ice/if_ice_iflib.c M sys/dev/ice/virtchnl.h ____________________________________________________________________________________________________________ Commit: 66b1d696db1284ac9f9bb4037ffc288091f5ba84 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=66b1d696db1284ac9f9bb4037ffc288091f5ba84 Author: Eric Joyner (Mon 28 Oct 2024 22:48:47 GMT) Committer: Krzysztof Galazka (Thu 24 Jul 2025 15:17:45 BST) ice_ddp: Update to 1.3.41.0 Primarily adds support for E830 devices, unlocking all of their functionality. As well, update the README and remove the non-FreeBSD sections from it. Signed-off-by: Eric Joyner Sponsored by: Intel Corporation (cherry picked from commit f68513e7a446b4b0598b7f3d1b3e13f592b85d92) M sys/conf/files.amd64 M sys/conf/files.arm64 M sys/conf/files.powerpc M sys/contrib/dev/ice/README R050 sys/contrib/dev/ice/ice-1.3.36.0.pkg sys/contrib/dev/ice/ice-1.3.41.0.pkg M sys/modules/ice_ddp/Makefile ____________________________________________________________________________________________________________ Commit: b86c6997047e6caee085b05dcc864f7878db3b69 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b86c6997047e6caee085b05dcc864f7878db3b69 Author: Dag-Erling Smørgrav (Fri 18 Jul 2025 18:48:59 BST) Committer: Dag-Erling Smørgrav (Thu 24 Jul 2025 14:02:13 BST) tzcode: Fix time zone change detection. Prior to the 2022g import, tzloadbody() returned -1 on error. Now it returns an errno code. When I updated the time zone change detection logic to match, I improperly returned errno in all cases, which means that if the time zone file has not changed since we last loaded it, tzloadbody() returns a random errno value instead of 0. Fixes: bc42155199b5 MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51405 (cherry picked from commit d63ffdd1ef6368407b35d415237b95cc739d8073) tzcode: Add an explicit "the timezone file has changed" case This is required for the WITHOUT_DETECT_TZ_CHANGES case, since there the value being tested is a numeric literal. Fixes: d63ffdd1ef63 ("tzcode: Fix time zone change detection.") (cherry picked from commit 0bf113e9041fe20e8c671fe6b2cca8612dc77b77) M contrib/tzcode/localtime.c ____________________________________________________________________________________________________________ Commit: 4cafd1021a5b6002812f4446794541eab8c08534 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4cafd1021a5b6002812f4446794541eab8c08534 Author: Dag-Erling Smørgrav (Wed 16 Jul 2025 20:33:24 BST) Committer: Dag-Erling Smørgrav (Thu 24 Jul 2025 14:02:12 BST) udf: Improve input validation. The existing code frequently assigns unsigned 64-bit values to variables that are signed and / or shorter without checking for overflow. Try to deal with these cases. While here, fix two structs that used single-element arrays in place of flexible array members. PR: 287896 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287896 ) MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51339 (cherry picked from commit 55f80afa17e8926f69660f19631194bcf7fa66f4) M sys/fs/udf/ecma167-udf.h M sys/fs/udf/udf_vfsops.c M sys/fs/udf/udf_vnops.c ____________________________________________________________________________________________________________ Commit: a7b4e2e9d0caddf72c1cbe9e8e36b2edcbbbbff3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a7b4e2e9d0caddf72c1cbe9e8e36b2edcbbbbff3 Author: Dag-Erling Smørgrav (Wed 9 Jul 2025 21:28:47 BST) Committer: Dag-Erling Smørgrav (Thu 24 Jul 2025 14:02:12 BST) kyua: Try harder to delete directories. When recursing into a directory to delete it, start by chmod'ing it to 0700. This fixes an issue where kyua is able to run, but not debug, a test case that creates unwriteable directories, because when debugging it tries (and fails) to delete the directory after the test completes. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: igoro Differential Revision: https://reviews.freebsd.org/D51229 (cherry picked from commit 9bf14f2a475e221c48488984dc5a02a4608bb877) M contrib/kyua/utils/fs/operations.cpp M contrib/kyua/utils/fs/operations_test.cpp ____________________________________________________________________________________________________________ Commit: e5fcb8c32fbdf7208ab5e2b250bec6686141dfc7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e5fcb8c32fbdf7208ab5e2b250bec6686141dfc7 Author: Dimitry Andric (Mon 21 Jul 2025 17:55:23 BST) Committer: Dimitry Andric (Thu 24 Jul 2025 08:44:49 BST) Merge commit 8ac140f39084 from llvm git (by Younan Zhang): [Clang][NFCI] Cleanup the fix for default function argument substitution (#104911) (This is one step towards tweaking `getTemplateInstantiationArgs()` as discussed in https://github.com/llvm/llvm-project/pull/102922) We don't always substitute into default arguments while transforming a function parameter. In that case, we would preserve the uninstantiated expression until after, e.g. building up a CXXDefaultArgExpr and instantiate the expression there. For member function instantiation, this algorithm used to cause a problem in that the default argument of an out-of-line member function specialization couldn't get properly instantiated. This is because, in `getTemplateInstantiationArgs()`, we would give up visiting a function's declaration context if the function is a specialization of a member template. For example, ```cpp template struct S { template void f(T = sizeof(T)); }; template <> template void S::f(int) {} ``` The default argument `sizeof(U)` that lexically appears inside the declaration would be copied to the function declaration in the class template specialization `S`, as well as to the function's out-of-line definition. We use template arguments collected from the out-of-line function definition when substituting into the default arguments. We would therefore give up the traversal after the function, resulting in a single-level template argument of the `f` itself. However the default argument here could still reference the template parameters of the primary template, hence the error. In fact, this is similar to constraint checking in some respects: we actually want the "whole" template arguments relative to the primary template, not those relative to the function definition. So this patch adds another flag to indicate `getTemplateInstantiationArgs()` for that. This patch also consolidates the tests for default arguments and removes some unnecessary tests. This fixes a crash or assertion failure while building tests for the devel/hpx port. PR: 288352 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=288352 ) MFC after: 3 days (cherry picked from commit ffc5ee0f57d56459df93f4107b9835ae78a546b5) M contrib/llvm-project/clang/include/clang/Sema/Sema.h M contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp M contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp ____________________________________________________________________________________________________________ Commit: d9a1e54cb037706f53f12b488d8288b9f951b859 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d9a1e54cb037706f53f12b488d8288b9f951b859 Author: Zhenlei Huang (Thu 17 Jul 2025 05:01:16 BST) Committer: Zhenlei Huang (Sun 20 Jul 2025 15:16:36 BST) qlnxe: Fix error handling of SIOCGI2C ioctl The error -1 is actually ERESTART in the context of syscall. It is for kernel mode only and will not be passed to user mode. When the kernel sees this error it will restart the syscall. When the the SFP module data is not available, e.g. the SFP module is not present, the ioctl handler returns ERESTART and kernel will retry infinitely, hence the userland `ifconfig -v ql0` will hang forever until get interrupted. That is apparently wrong. Fix that by returning error ENODEV to indicate the SFP module data is not available. As for the case that ecore_ptt_acquire() fails, it appears to be quite safe to restart, so keep returning ERESTART. Reported by: Steve Wheeler See also: https://redmine.pfsense.org/issues/16248 Reviewed by: kbowling MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D51351 (cherry picked from commit 12fea464070a9061fda874038614ed55011ad59d) (cherry picked from commit f40f6374f3d2cfc1a99781acd5c3252e1edfe612) M sys/dev/qlnx/qlnxe/qlnx_os.c ____________________________________________________________________________________________________________ Commit: da5827a63ce5065e485ffd3f11a194e516fd9ee2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=da5827a63ce5065e485ffd3f11a194e516fd9ee2 Author: Dirk Engling (Sun 13 Jul 2025 10:25:24 BST) Committer: Lars Engels (Sun 20 Jul 2025 10:12:16 BST) bluetooth-config: Fix command line parsing This addresses the problems encountered when parsing options in bluetooth-config. - the optional parameters were not properly shifted after consumption - the command line parameter count was checked before getopts and not after Reported by: sjg Approved by: kp MFC after: 7 days Event: Berlin Hackathon 202507 Differential Revision: (cherry picked from commit 5031da20599bb1163f0e8d1c4b415ab3bbebce00) M usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh ____________________________________________________________________________________________________________ Commit: 42dd8f4add1f2b485f2f9b44685af34a1ef235a5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=42dd8f4add1f2b485f2f9b44685af34a1ef235a5 Author: Lexi Winter (Tue 15 Jul 2025 05:44:38 BST) Committer: Lexi Winter (Sat 19 Jul 2025 02:13:21 BST) inetd.conf: remove -[46] from the ssh entry sshd doesn't require these flags, and including them makes outgoing connections (e.g., port forwarding) restricted to the family of the inbound connection, which is not usually desirable and also not how standalone sshd works. MFC after: 3 days Reviewed by: kevans Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D51296 (cherry picked from commit 6738882248a755aad859784150969085e006cf89) M usr.sbin/inetd/inetd.conf ____________________________________________________________________________________________________________ Commit: 2c8c8fe02a8789f9716212c45ced15f75173b50b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2c8c8fe02a8789f9716212c45ced15f75173b50b Author: Lexi Winter (Thu 10 Jul 2025 22:02:21 BST) Committer: Lexi Winter (Sat 19 Jul 2025 02:12:29 BST) nlmsg_report_err_msg: add __printflike annotation Reviewed by: kevans, kp Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D51234 (cherry picked from commit db55cc8110ceea084c6f52a1ecfd6ab87e0aac2b) M sys/netlink/netlink_message_parser.h ____________________________________________________________________________________________________________ Commit: ae3b38b834c6342e2e0514867688361c3e93ede5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ae3b38b834c6342e2e0514867688361c3e93ede5 Author: Lexi Winter (Mon 7 Jul 2025 00:22:42 BST) Committer: Lexi Winter (Sat 19 Jul 2025 02:12:27 BST) deprecate RIP Per https://wiki.freebsd.org/DeprecationPlan, deprecate RIP in 15.0R, with the intention of removing it in 16.0R. Add a note to the manpages of routed(8), rdisc(8), rtquery(8), route6d(8) and rip6query(8) noting that they will be removed in a future release. RIP has been obsolete for over 20 years and no one is running it on modern networks. If someone really needs RIP, there are alternatives such as 'bird' or 'quagga' available from ports; there is no need to ship it in base. Relnotes: yes Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50292 (cherry picked from commit 4b7cdb5a420f518fbe1968a6916b6d017f54025d) M sbin/routed/routed.8 M sbin/routed/rtquery/rtquery.8 M usr.sbin/rip6query/rip6query.8 M usr.sbin/route6d/route6d.8 ____________________________________________________________________________________________________________ Commit: 16879ba615952712df4a23e12fa2ff64a6b2d100 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=16879ba615952712df4a23e12fa2ff64a6b2d100 Author: Koichiro Iwao (Fri 11 Jul 2025 13:06:34 BST) Committer: Koichiro Iwao (Wed 16 Jul 2025 03:19:47 BST) ifconfig.8: remove accept_rev_ethip_ver and send_rev_ethip_ver It is removed long ago [1] and unavailable on FreeBSD 11 and later, but the corresponding entries in the man page were not removed accordingly. [1] https://cgit.freebsd.org/src/commit/?id=b1c250ff3ff6af36e95f5cf910973133c3445704 MFH after: 3 days Reviewed by: mhorne Approved by: mhorne Differential Revision: https://reviews.freebsd.org/D51261 (cherry picked from commit cca6a72d7f7131685a082c123aff17208aa1693f) M sbin/ifconfig/ifconfig.8 ____________________________________________________________________________________________________________ Commit: cdd5fece162ba9ec5f8165adce397b1879a9c68e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cdd5fece162ba9ec5f8165adce397b1879a9c68e Author: Mateusz Piotrowski <0mp@FreeBSD.org> (Sat 12 Jul 2025 17:23:03 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Tue 15 Jul 2025 01:24:27 BST) rc.subr: Fix a typo in check_jail()'s description MFC after: 3 days Event: Berlin Hackathon 202507 (cherry picked from commit 5d5258653ba4b37c38e48443f265ee4dcedf9a50) M libexec/rc/rc.subr ____________________________________________________________________________________________________________ Commit: 5d15e09a26c6b08fc0d5cd7deca082ba5b9cabd4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5d15e09a26c6b08fc0d5cd7deca082ba5b9cabd4 Author: Eugene Grosbein (Tue 1 Jul 2025 15:13:10 BST) Committer: Eugene Grosbein (Sun 13 Jul 2025 16:48:37 BST) libexec/rc: MFC: improve performance of pccard_ether script Replace "ifconfig -ul" with "ifconfig -n" because netlink-enabled /sbin/ifconfig utility has sub-optimal performance for listing. Combined with the commit b1b17432aa1be670564161232d110461a5dde4ce, these changes mostly eliminate performance regression of the command "service devd start" for a system having hundreds of network interfaces created before devd starts, after FreeBSD 14+ switched /sbin/ifconfig to netlink(4) PR: 287872 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287872 ) (cherry picked from commit 6d3bc576abbd84f736d917f5bfec4e3fe7e6c125) (cherry picked from commit 24e8ed535ff673b9ea751c3d3b2a68ef0a29b0e2) M libexec/rc/network.subr M libexec/rc/pccard_ether ____________________________________________________________________________________________________________ Commit: 57c652dfa1c08a361e29b7edb7fe05b63ffae235 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=57c652dfa1c08a361e29b7edb7fe05b63ffae235 Author: Damir Bikmuhametov (Thu 26 Jun 2025 18:26:14 BST) Committer: Kristof Provost (Sat 12 Jul 2025 08:50:55 BST) pf: fix ICMP ECHO handling of ID conflicts After applying FreeBSD-SA-24:05.pf, a problem with ICMP ECHO passing through PF NAT was raised: two or more Windows workstations cannot ping the same destination address at the same time. More precisely, only one workstation pings normally, while the pings of the others are rejected by the packet filter. The thing is that Windows always uses the same ICMP ID (1). Therefore, the state is created only for the workstation that started pinging earlier. In the pf_get_sport() function, we compare *nport with the ICMP_ECHO constant, while icmptype (virtual_type actually) is passed in the pd->ndport parameter. MFC after: 2 weeks Reviewed by: kp (cherry picked from commit e7abf8829d8d496a8753946f67fb2016851b4f7c) M sys/netpfil/pf/pf_lb.c ____________________________________________________________________________________________________________ Commit: 778f5aaa890fdc16b8d6d708af1b94d9af467f76 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=778f5aaa890fdc16b8d6d708af1b94d9af467f76 Author: Lexi Winter (Sun 6 Jul 2025 21:42:58 BST) Committer: Lexi Winter (Wed 9 Jul 2025 17:55:51 BST) clang: install clang-scan-deps clang-scan-deps is used to generate dependency information from C++20 modules according to proposed standard ISO/IEC WG21 P1689R5[0]. It is required by common build tools (e.g., CMake) to build C++ sources that use modules. Since this is a core build tool, install it by default, not gated behind MK_CLANG_EXTRAS. [0] https://www.open-std.org/JTC1/SC22/WG21/docs/papers/2022/p1689r5.html MFC after: 3 days Reviewed by: kevans, dim Approved by: kevans (mentor) Requested by: jbo Differential Revision: https://reviews.freebsd.org/D51044 (cherry picked from commit d3c06bed2c16b434dd49958dee5de8c55ad00b85) M lib/clang/libclang/Makefile M usr.bin/clang/Makefile A usr.bin/clang/clang-scan-deps/Makefile A usr.bin/clang/clang-scan-deps/clang-scan-deps-driver.cpp ____________________________________________________________________________________________________________ Commit: 0a5e8108bf20d9d40d473f3a7f04cff7abb1ffa8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0a5e8108bf20d9d40d473f3a7f04cff7abb1ffa8 Author: Zhenlei Huang (Sat 28 Jun 2025 16:46:51 BST) Committer: Zhenlei Huang (Tue 8 Jul 2025 11:03:29 BST) pfsync: Allocate and initialize buckets before attaching the interface This prevents a potential race that the ioctl threads see NULL or uninitialized buckets. Reviewed by: kp Fixes: 4fc65bcbe3fb pfsync: Performance improvement MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51064 (cherry picked from commit edc307eca9a9a9b0ce7445cff513b48f6489e5c6) (cherry picked from commit 8cc376735c65a18c53a70c30957a5f56dd066b79) M sys/netpfil/pf/if_pfsync.c ____________________________________________________________________________________________________________ Commit: 9d53e7eaab9e2e75491941dc035a345bc0f39c99 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9d53e7eaab9e2e75491941dc035a345bc0f39c99 Author: Zhenlei Huang (Sat 28 Jun 2025 16:46:51 BST) Committer: Zhenlei Huang (Tue 8 Jul 2025 11:03:29 BST) pfsync: Destroy buckets mutexes on clone destroying interface So that the associated data with them will be freed. Reviewed by: kp Fixes: 4fc65bcbe3fb pfsync: Performance improvement MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51063 (cherry picked from commit 8213c07c20586a67bc7f7152bd7ff76c02cbc007) (cherry picked from commit efbaf14c5b681c8f1a04a47c7bf8740134fff098) M sys/netpfil/pf/if_pfsync.c ____________________________________________________________________________________________________________ Commit: 2db01aea744fcbae5d11bec6e42410e9acb58508 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2db01aea744fcbae5d11bec6e42410e9acb58508 Author: Zhenlei Huang (Mon 16 Jun 2025 15:12:03 BST) Committer: Zhenlei Huang (Tue 8 Jul 2025 11:03:28 BST) pfsync: Remove a redundant assignment of if_type On initializing the interface, if_alloc(IFT_PFSYNC) has set if_type already. No functional change intended. MFC after: 1 week (cherry picked from commit 48af70e7c82150942fd095a38131e454e47ad162) (cherry picked from commit 082a6da890f3487f1465c0757784798ebe38ef84) M sys/netpfil/pf/if_pfsync.c ____________________________________________________________________________________________________________ Commit: 12a1baa42bd0b2ed7b5c6a8b0807fd50929a8799 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=12a1baa42bd0b2ed7b5c6a8b0807fd50929a8799 Author: Zhenlei Huang (Mon 16 Jun 2025 15:35:40 BST) Committer: Zhenlei Huang (Tue 8 Jul 2025 11:03:28 BST) bridge: Remove a redundant assignment of if_type ether_ifattach() no longer sets if_type to IFT_ETHER and keeps it as is since the change [1]. [1] fc74a9f93a5f Stop embedding struct ifnet at the top of driver softcs No functional change intended. MFC after: 1 week (cherry picked from commit a07604e6264b88222941fa61c6f989bad5490765) (cherry picked from commit 193f0bde3b048559d36c3e6db5d6b2be7daeaf6f) M sys/net/if_bridge.c ____________________________________________________________________________________________________________ Commit: 56a81f37332a6b22562a4e810b1b99d058fa6c5b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=56a81f37332a6b22562a4e810b1b99d058fa6c5b Author: Zhenlei Huang (Fri 13 Jun 2025 11:07:18 BST) Committer: Zhenlei Huang (Tue 8 Jul 2025 11:03:28 BST) ng_iface(4): Remove a redundant assignment of if_type That is unnecessary since change [1], as if_alloc(IFT_PROPVIRTUAL) has set if_type already. [1] fc74a9f93a5f Stop embedding struct ifnet at the top of driver softcs No functional change intended. MFC after: 1 week (cherry picked from commit c43d6dadf7e34a94f4d119ff6d7113ad9a9b4d38) (cherry picked from commit 3da0853d71197610375262b8bb06cadda6c8f4dc) M sys/netgraph/ng_iface.c ____________________________________________________________________________________________________________ Commit: e59f60d3c08c263f14bbd3cf7dde499e80d7335c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e59f60d3c08c263f14bbd3cf7dde499e80d7335c Author: Zhenlei Huang (Thu 26 Jun 2025 17:37:13 BST) Committer: Zhenlei Huang (Tue 8 Jul 2025 11:03:28 BST) if_vlan: Fix up if_type before attaching the interface ether_ifattach() does not touch if_type, so it is not mandatory to fix the if_type after ether_ifattach(). Without this change, the event listeners, e.g. netlink, will see wrong interface type IFT_ETHER rather than the correct one IFT_L2VLAN. There is also a potential race that other threads see inconsistent interface type, i.e. initially IFT_ETHER and eventually IFT_L2VLAN. As a nice effect, this change eliminates the memory allocation for if_hw_addr, as vlan(4) interfaces do not support setting or retrieving the hardware MAC address yet [1]. [1] ddae57504b79 Persistently store NIC's hardware MAC address, and add a way to retrive it MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50914 (cherry picked from commit a19b353d354d4ef808965c53253103cb6e7e6708) (cherry picked from commit ff54b680383bb0f212e813b74e7a3f76423d2238) M sys/net/if_vlan.c ____________________________________________________________________________________________________________ Commit: afaa32661b482323c3cce149fb74aa7b3b14ffa5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=afaa32661b482323c3cce149fb74aa7b3b14ffa5 Author: Zhenlei Huang (Sat 12 Oct 2024 14:56:56 BST) Committer: Zhenlei Huang (Tue 8 Jul 2025 11:03:28 BST) axgbe: Fix setting promisc mode Ethernet drivers should respect IFF_PROMISC rather than IFF_PPROMISC. The latter is for user-requested promisc mode, it implies the former but not vice versa. Some in-kernel components such as if_bridge(4) and bpf(4) will set promisc mode for interfaces on-demand. While here, update the debugging message to be not confusing. This was spotted while reviewing markj@ 's work D46524. Test from Franco shows that the interface seems to be unconditionally initialized to promisc mode regardless of this fix. That needs further investigation. Reviewed by: markj, Franco Fichtner Tested by: Franco Fichtner MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46794 (cherry picked from commit c7a2636889a649985e323de23fe495608b6fe483) M sys/dev/axgbe/if_axgbe_pci.c M sys/dev/axgbe/xgbe-dev.c ____________________________________________________________________________________________________________ Commit: f82159545a3c38e507542002290036a0cf4920ac URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f82159545a3c38e507542002290036a0cf4920ac Author: Dimitry Andric (Wed 25 Jun 2025 18:19:51 BST) Committer: Dimitry Andric (Wed 2 Jul 2025 19:08:51 BST) contrib/llvm-project: re-add clang/tools/clang-scan-deps This is in preparation for adding it as an optional tool in base. MFC after: 1 week (cherry picked from commit 7ed1628066eaf55b86f35af86efe804508201cc8) M contrib/llvm-project/FREEBSD-Xlist A contrib/llvm-project/clang/tools/clang-scan-deps/ClangScanDeps.cpp A contrib/llvm-project/clang/tools/clang-scan-deps/Opts.td ____________________________________________________________________________________________________________ Commit: fbaab13732809e02dc30e9aef15fac230aed4464 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fbaab13732809e02dc30e9aef15fac230aed4464 Author: Lexi Winter (Wed 25 Jun 2025 18:12:02 BST) Committer: Lexi Winter (Mon 30 Jun 2025 23:27:40 BST) contrib/llvm-project: fix clang crash compiling modules clang++ may crash when compiling certain C++20 modules. Backport the fix from LLVM upstream. This fixes LLVM bug 102684: https://github.com/llvm/llvm-project/issues/102684. PR: 287803 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287803 ) MFC after: 3 days Obtained from: https://github.com/llvm/llvm-project/pull/102855 Reviewed by: kevans, dim Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D51041 (cherry picked from commit 55dfaeae8e9aa95f0b724d90ad2423ca1b623142) M contrib/llvm-project/clang/include/clang/Frontend/MultiplexConsumer.h M contrib/llvm-project/clang/include/clang/Serialization/ASTDeserializationListener.h M contrib/llvm-project/clang/include/clang/Serialization/ASTReader.h M contrib/llvm-project/clang/include/clang/Serialization/ASTWriter.h M contrib/llvm-project/clang/lib/Frontend/MultiplexConsumer.cpp M contrib/llvm-project/clang/lib/Serialization/ASTReader.cpp M contrib/llvm-project/clang/lib/Serialization/ASTWriter.cpp ____________________________________________________________________________________________________________ Commit: eae830109571fcf069545b6a2fabf68c5d8e67c0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eae830109571fcf069545b6a2fabf68c5d8e67c0 Author: George Amanakis (Mon 19 May 2025 17:55:00 BST) Committer: Allan Jude (Fri 27 Jun 2025 21:07:48 BST) Fix 2 bugs in non-raw send with encryption Bisecting identified the redacted send/receive as the source of the bug for issue #12014. Specifically the call to dsl_dataset_hold_obj(&fromds) has been replaced by dsl_dataset_hold_obj_flags() which passes a DECRYPT flag and creates a key mapping. A subsequent dsl_dataset_rele_flag(&fromds) is missing and the key mapping is not cleared. This may be inadvertedly used, which results in arc_untransform failing with ECKSUM in: arc_untransform+0x96/0xb0 [zfs] dbuf_read_verify_dnode_crypt+0x196/0x350 [zfs] dbuf_read+0x56/0x770 [zfs] dmu_buf_hold_by_dnode+0x4a/0x80 [zfs] zap_lockdir+0x87/0xf0 [zfs] zap_lookup_norm+0x5c/0xd0 [zfs] zap_lookup+0x16/0x20 [zfs] zfs_get_zplprop+0x8d/0x1d0 [zfs] setup_featureflags+0x267/0x2e0 [zfs] dmu_send_impl+0xe7/0xcb0 [zfs] dmu_send_obj+0x265/0x360 [zfs] zfs_ioc_send+0x10c/0x280 [zfs] Fix this by restoring the call to dsl_dataset_hold_obj(). The same applies for to_ds: here replace dsl_dataset_rele(&to_ds) with dsl_dataset_rele_flags(). Both leaked key mappings will cause a panic when exporting the sending pool or unloading the zfs module after a non-raw send from an encrypted filesystem. Contributions-by: Hank Barta Contributions-by: Paul Dagnelie Reviewed-by: Alexander Motin Reviewed-by: Richard Yao Reviewed-by: Rob Norris Reviewed-by: Brian Behlendorf Signed-off-by: George Amanakis Closes #12014 Closes #17340 (cherry picked from commit ea74cdedda8b9575d7e94198d38f12943ac41343) M sys/contrib/openzfs/module/zfs/dmu_send.c ____________________________________________________________________________________________________________ Commit: 264aeb32e9ee72614d6132660c8cc993fc24ef0d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=264aeb32e9ee72614d6132660c8cc993fc24ef0d Author: Andriy Gapon (Sun 30 Mar 2025 20:47:50 BST) Committer: Andriy Gapon (Fri 27 Jun 2025 08:40:02 BST) ads111x: initialize the lock earlier, before it's used The first use can be in ads111x_add_channels. (cherry picked from commit eda3a7ac755c5e02f92ff971db63d0a702963d66) M sys/dev/iicbus/ads111x.c ____________________________________________________________________________________________________________ Commit: 4d1ff6d22ba7eb33ebcae15a8c645cae8eea7f56 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4d1ff6d22ba7eb33ebcae15a8c645cae8eea7f56 Author: Andriy Gapon (Mon 19 May 2025 10:06:55 BST) Committer: Andriy Gapon (Fri 27 Jun 2025 08:39:55 BST) dwc_otg_fdt: do not create and leak extra usbus child dwc_otg_init() already takes care of creating the bus and setting up sc to point to it. Fixes: 518da7ace813e (cherry picked from commit 97c799661a76b78963fd9f92a7e6bb452ebba999) M sys/dev/usb/controller/dwc_otg_fdt.c ____________________________________________________________________________________________________________ Commit: 0bcd8425f055584630ffaa6b932ac22440e61986 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0bcd8425f055584630ffaa6b932ac22440e61986 Author: Andriy Gapon (Mon 19 May 2025 10:23:29 BST) Committer: Andriy Gapon (Fri 27 Jun 2025 08:38:38 BST) OptionalObsoleteFiles: etc/rc.d/powerd is used/useful without ACPI/APM Just like powerd daemon does not depend on ACPI/APM, its rc script does not either. Fixes: 20eb6bd8c598f (cherry picked from commit 28d74f18f1c222022ee4e9a2cdc63b1c21037392) M tools/build/mk/OptionalObsoleteFiles.inc ____________________________________________________________________________________________________________ Commit: 0106e5d725331d5a0acaa9790f6d7a4c0c4c16b5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0106e5d725331d5a0acaa9790f6d7a4c0c4c16b5 Author: Kyle Evans (Tue 17 Jun 2025 15:17:59 BST) Committer: Martin Matuska (Fri 20 Jun 2025 21:15:19 BST) libarchive/test: fix build when memcpy() is a macro After importing the latest libarchive into FreeBSD, Shawn Webb @ HardenedBSD noted that the test build is broken when FORTIFY_SOURCE=2 while building the base system. Braced initializer lists are a special case that need some extra fun parentheses when we're dealing with the preprocessor. While it's not a particularly common setup, the extra parentheses don't really hurt readability all that much so it's worth fixing for wider compatibility. This corresponds to libarchive PR #2660 Reported by: Shawn Webb (HardenedBSD) (cherry picked from commit e2a605e7ab7ff83d15b1a0b994223768169b0f1e) M contrib/libarchive/libarchive/test/test_write_format_mtree_preset_digests.c ____________________________________________________________________________________________________________ Commit: a46bed99375000446702b46e3bce8f6313d7581b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a46bed99375000446702b46e3bce8f6313d7581b Author: Martin Matuska (Mon 2 Jun 2025 13:55:00 BST) Committer: Martin Matuska (Fri 20 Jun 2025 21:15:12 BST) libarchive: fix duplicate entry in tests Makefile Reported by: des MFC after: 2 weeks (together with 2e113ef82) (cherry picked from commit 331f2c1c46584510fa9104c86f31f44ece3838c5) M lib/libarchive/tests/Makefile ____________________________________________________________________________________________________________ Commit: f47afeb2ce1eb04a787a4b8c1a6d7752940268da URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f47afeb2ce1eb04a787a4b8c1a6d7752940268da Author: Martin Matuska (Sun 1 Jun 2025 21:16:26 BST) Committer: Martin Matuska (Fri 20 Jun 2025 21:14:01 BST) libarchive: merge from vendor branch libarchive 3.8.1 New features: #2088 7-zip reader: improve self-extracting archive detection #2137 zip writer: added XZ, LZMA, ZSTD and BZIP2 support #2403 zip writer: added LZMA + RISCV BCJ filter #2601 bsdtar: support --mtime and --clamp-mtime #2602 libarchive: mbedtls 3.x compatibility Security fixes: #2422 tar reader: Handle truncation in the middle of a GNU long linkname (CVE-2024-57970) #2532 tar reader: fix unchecked return value in list_item_verbose() (CVE-2025-25724) #2532 unzip: fix null pointer dereference (CVE-2025-1632) #2568 warc: prevent signed integer overflow (CVE-2025-5916) #2584 rar: do not skip past EOF while reading (CVE-2025-5918) #2588 tar: fix overflow in build_ustar_entry (CVE-2025-5917) #2598 rar: fix double free with over 4 billion nodes (CVE-2025-5914) #2599 rar: fix heap-buffer-overflow (CVE-2025-5915) Important bugfixes: #2399 7-zip reader: add SPARC filter support for non-LZMA compressors #2405 tar reader: ignore ustar size when pax size is present #2435 tar writer: fix bug when -s/a/b/ used more than once with b flag #2459 7-zip reader: add POWERPC filter support for non-LZMA compressors #2519 libarchive: handle ARCHIVE_FILTER_LZOP in archive_read_append_filter #2539 libarchive: add missing seeker function to archive_read_open_FILE() #2544 gzip: allow setting the original filename for gzip compressed files #2564 libarchive: improve lseek handling #2582 rar: support large headers on 32 bit systems #2587 bsdtar: don't hardlink negative inode files together #2596 rar: support large headers on 32 bit systems #2606 libarchive: support @-prefixed Unix epoch timestamps as date strings #2634 tar: Support negative time values with pax #2637 tar: Keep block alignment after pax error #2642 libarchive: fix FILE_skip regression #2643 tar: Handle extra bytes after sparse entries #2649 compress: Prevent call stack overflow #2651 iso9660: always check archive_string_ensure return value CVE: CVE-2024-57970, CVE-2025-1632, CVE-2025-25724, CVE-2025-5914, CVE-2025-5915, CVE-2025-5916, CVE-2025-5917, CVE-2025-5918 PR: 286944 (exp-run on main, libarchive 3.8.0) (cherry picked from commit 2e113ef82465598b8c26e0ca415fbe90677fbd47) M contrib/libarchive/COPYING M contrib/libarchive/NEWS M contrib/libarchive/README.md A contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh M contrib/libarchive/cpio/cpio.c M contrib/libarchive/cpio/test/test_format_newc.c M contrib/libarchive/cpio/test/test_option_a.c M contrib/libarchive/cpio/test/test_option_c.c M contrib/libarchive/libarchive/archive.h M contrib/libarchive/libarchive/archive_acl.c M contrib/libarchive/libarchive/archive_acl_private.h M contrib/libarchive/libarchive/archive_cmdline.c M contrib/libarchive/libarchive/archive_cryptor_private.h M contrib/libarchive/libarchive/archive_digest.c M contrib/libarchive/libarchive/archive_digest_private.h M contrib/libarchive/libarchive/archive_disk_acl_freebsd.c M contrib/libarchive/libarchive/archive_entry.c M contrib/libarchive/libarchive/archive_entry.h M contrib/libarchive/libarchive/archive_entry_link_resolver.c M contrib/libarchive/libarchive/archive_entry_locale.h M contrib/libarchive/libarchive/archive_entry_private.h M contrib/libarchive/libarchive/archive_hmac_private.h M contrib/libarchive/libarchive/archive_match.c M contrib/libarchive/libarchive/archive_options.c M contrib/libarchive/libarchive/archive_options_private.h M contrib/libarchive/libarchive/archive_pack_dev.h R096 contrib/libarchive/libarchive/archive_getdate.c contrib/libarchive/libarchive/archive_parse_date.c M contrib/libarchive/libarchive/archive_platform.h M contrib/libarchive/libarchive/archive_platform_acl.h M contrib/libarchive/libarchive/archive_platform_xattr.h M contrib/libarchive/libarchive/archive_ppmd7.c M contrib/libarchive/libarchive/archive_ppmd8.c M contrib/libarchive/libarchive/archive_ppmd_private.h M contrib/libarchive/libarchive/archive_random_private.h M contrib/libarchive/libarchive/archive_rb.h M contrib/libarchive/libarchive/archive_read.c M contrib/libarchive/libarchive/archive_read_append_filter.c M contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c M contrib/libarchive/libarchive/archive_read_disk_posix.c M contrib/libarchive/libarchive/archive_read_disk_private.h M contrib/libarchive/libarchive/archive_read_format.3 M contrib/libarchive/libarchive/archive_read_open_fd.c M contrib/libarchive/libarchive/archive_read_open_file.c M contrib/libarchive/libarchive/archive_read_open_filename.c M contrib/libarchive/libarchive/archive_read_support_filter_by_code.c M contrib/libarchive/libarchive/archive_read_support_filter_compress.c M contrib/libarchive/libarchive/archive_read_support_filter_lz4.c M contrib/libarchive/libarchive/archive_read_support_format_7zip.c M contrib/libarchive/libarchive/archive_read_support_format_by_code.c M contrib/libarchive/libarchive/archive_read_support_format_cab.c M contrib/libarchive/libarchive/archive_read_support_format_cpio.c M contrib/libarchive/libarchive/archive_read_support_format_iso9660.c M contrib/libarchive/libarchive/archive_read_support_format_lha.c M contrib/libarchive/libarchive/archive_read_support_format_rar.c M contrib/libarchive/libarchive/archive_read_support_format_rar5.c M contrib/libarchive/libarchive/archive_read_support_format_tar.c M contrib/libarchive/libarchive/archive_read_support_format_warc.c M contrib/libarchive/libarchive/archive_read_support_format_xar.c M contrib/libarchive/libarchive/archive_read_support_format_zip.c M contrib/libarchive/libarchive/archive_string.c M contrib/libarchive/libarchive/archive_string_composition.h M contrib/libarchive/libarchive/archive_string_sprintf.c A contrib/libarchive/libarchive/archive_time.c R067 contrib/libarchive/libarchive/archive_getdate.h contrib/libarchive/libarchive/archive_time_private.h M contrib/libarchive/libarchive/archive_util.c M contrib/libarchive/libarchive/archive_version_details.c M contrib/libarchive/libarchive/archive_write.c M contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c M contrib/libarchive/libarchive/archive_write_add_filter_gzip.c M contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c M contrib/libarchive/libarchive/archive_write_disk_posix.c M contrib/libarchive/libarchive/archive_write_open_filename.c M contrib/libarchive/libarchive/archive_write_set_format_7zip.c M contrib/libarchive/libarchive/archive_write_set_format_gnutar.c M contrib/libarchive/libarchive/archive_write_set_format_iso9660.c M contrib/libarchive/libarchive/archive_write_set_format_mtree.c M contrib/libarchive/libarchive/archive_write_set_format_pax.c M contrib/libarchive/libarchive/archive_write_set_format_xar.c M contrib/libarchive/libarchive/archive_write_set_format_zip.c M contrib/libarchive/libarchive/archive_write_set_options.3 M contrib/libarchive/libarchive/libarchive-formats.5 M contrib/libarchive/libarchive/test/read_open_memory.c M contrib/libarchive/libarchive/test/test_7zip_filename_encoding.c M contrib/libarchive/libarchive/test/test_acl_pax.c M contrib/libarchive/libarchive/test/test_acl_platform_nfs4.c M contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c M contrib/libarchive/libarchive/test/test_acl_posix1e.c M contrib/libarchive/libarchive/test/test_acl_text.c M contrib/libarchive/libarchive/test/test_archive_match_time.c R087 contrib/libarchive/libarchive/test/test_archive_getdate.c contrib/libarchive/libarchive/test/test_archive_parse_date.c M contrib/libarchive/libarchive/test/test_archive_string_conversion.c A contrib/libarchive/libarchive/test/test_compat_gtar_large.c M contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c M contrib/libarchive/libarchive/test/test_compat_star_acl.c M contrib/libarchive/libarchive/test/test_entry.c M contrib/libarchive/libarchive/test/test_open_file.c M contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c M contrib/libarchive/libarchive/test/test_read_format_7zip.c A contrib/libarchive/libarchive/test/test_read_format_7zip_deflate_powerpc.7z.uu M contrib/libarchive/libarchive/test/test_read_format_7zip_extract_second.7z.uu A contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_powerpc.7z.uu A contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_riscv.7z.uu A contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_sparc.7z.uu A contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_elf.elf.uu A contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_modified_pe.exe.uu A contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_pe.exe.uu A contrib/libarchive/libarchive/test/test_read_format_7zip_zstd_sparc.7z.uu A contrib/libarchive/libarchive/test/test_read_format_gtar_redundant_L.c A contrib/libarchive/libarchive/test/test_read_format_gtar_redundant_L.tar.Z.uu M contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c A contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_length.c A contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_length.tar.Z.uu M contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu M contrib/libarchive/libarchive/test/test_read_format_rar.c M contrib/libarchive/libarchive/test/test_read_format_rar5.c M contrib/libarchive/libarchive/test/test_read_format_rar5_unicode.rar.uu M contrib/libarchive/libarchive/test/test_read_format_rar_encryption.c A contrib/libarchive/libarchive/test/test_read_format_rar_endarc_huge.rar.uu A contrib/libarchive/libarchive/test/test_read_format_rar_newsub_huge.rar.uu A contrib/libarchive/libarchive/test/test_read_format_rar_overflow.c A contrib/libarchive/libarchive/test/test_read_format_rar_overflow.rar.uu A contrib/libarchive/libarchive/test/test_read_format_rar_symlink_huge.rar.uu M contrib/libarchive/libarchive/test/test_read_format_tar_empty_with_gnulabel.c A contrib/libarchive/libarchive/test/test_read_format_tar_mac_metadata.c A contrib/libarchive/libarchive/test/test_read_format_tar_mac_metadata_1.tar.uu A contrib/libarchive/libarchive/test/test_read_format_tar_pax_g_large.c A contrib/libarchive/libarchive/test/test_read_format_tar_pax_g_large.tar.uu A contrib/libarchive/libarchive/test/test_read_format_tar_pax_negative_time.c A contrib/libarchive/libarchive/test/test_read_format_tar_pax_negative_time.tar.uu M contrib/libarchive/libarchive/test/test_read_format_warc.c A contrib/libarchive/libarchive/test/test_read_format_warc_incomplete.warc.uu M contrib/libarchive/libarchive/test/test_read_format_zip.c A contrib/libarchive/libarchive/test/test_read_pax_empty_val_no_nl.c A contrib/libarchive/libarchive/test/test_read_pax_empty_val_no_nl.tar.uu M contrib/libarchive/libarchive/test/test_read_position.c M contrib/libarchive/libarchive/test/test_sparse_basic.c M contrib/libarchive/libarchive/test/test_tar_large.c M contrib/libarchive/libarchive/test/test_write_disk_perms.c M contrib/libarchive/libarchive/test/test_write_disk_secure_noabsolutepaths.c M contrib/libarchive/libarchive/test/test_write_filter_gzip.c M contrib/libarchive/libarchive/test/test_write_format_7zip.c M contrib/libarchive/libarchive/test/test_write_format_7zip_large.c M contrib/libarchive/libarchive/test/test_write_format_gnutar.c A contrib/libarchive/libarchive/test/test_write_format_mtree_preset_digests.c M contrib/libarchive/libarchive/test/test_write_format_tar_sparse.c M contrib/libarchive/libarchive/test/test_write_format_xar.c M contrib/libarchive/libarchive/test/test_write_format_zip64_stream.c A contrib/libarchive/libarchive/test/test_write_format_zip_compression_bzip2.c A contrib/libarchive/libarchive/test/test_write_format_zip_compression_lzmaxz.c M contrib/libarchive/libarchive/test/test_write_format_zip_compression_store.c A contrib/libarchive/libarchive/test/test_write_format_zip_compression_zstd.c M contrib/libarchive/libarchive/test/test_write_format_zip_entry_size_unset.c M contrib/libarchive/libarchive/test/test_write_format_zip_file.c M contrib/libarchive/libarchive/test/test_write_format_zip_file_zip64.c M contrib/libarchive/libarchive/test/test_write_format_zip_large.c M contrib/libarchive/libarchive/test/test_write_format_zip_stream.c M contrib/libarchive/libarchive_fe/passphrase.c M contrib/libarchive/tar/bsdtar.1 M contrib/libarchive/tar/bsdtar.c M contrib/libarchive/tar/bsdtar.h M contrib/libarchive/tar/cmdline.c M contrib/libarchive/tar/subst.c A contrib/libarchive/tar/test/test_list_item.c A contrib/libarchive/tar/test/test_list_item.tar.uu M contrib/libarchive/tar/test/test_option_C_mtree.c R100 contrib/libarchive/tar/test/test_option_P.c contrib/libarchive/tar/test/test_option_P_upper.c M contrib/libarchive/tar/test/test_option_ignore_zeros.c A contrib/libarchive/tar/test/test_option_mtime.c M contrib/libarchive/tar/test/test_option_s.c M contrib/libarchive/tar/test/test_stdio.c M contrib/libarchive/tar/util.c M contrib/libarchive/tar/write.c M contrib/libarchive/test_utils/test_common.h M contrib/libarchive/test_utils/test_main.c M contrib/libarchive/test_utils/test_utils.c M contrib/libarchive/test_utils/test_utils.h M contrib/libarchive/unzip/bsdunzip.c A contrib/libarchive/unzip/la_getline.h M lib/libarchive/Makefile M lib/libarchive/tests/Makefile M usr.bin/tar/tests/Makefile ____________________________________________________________________________________________________________ Commit: 610a0ffabae6aa711ad03e0d6c2c81753220fef6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=610a0ffabae6aa711ad03e0d6c2c81753220fef6 Author: Graham Perrin (Fri 10 Jan 2025 18:02:25 GMT) Committer: Lexi Winter (Fri 20 Jun 2025 18:33:39 BST) zfsboot: fix misuse of the phrase zpool A pool is not a zpool. Reviewed by: jbh, ivy Approved by: des (mentor) MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1569 (cherry picked from commit f69afe4201ff33da0b3c3ca464a92e2e0b07ac43) M usr.sbin/bsdinstall/scripts/zfsboot ____________________________________________________________________________________________________________ Commit: e3fd26a3d71b753e302b6f7ee49e9879d2f3f5a7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e3fd26a3d71b753e302b6f7ee49e9879d2f3f5a7 Author: Nathan Whitehorn (Sun 2 Jan 2022 00:34:48 GMT) Committer: Ed Maste (Thu 19 Jun 2025 19:25:48 BST) bsdinstall: Fix grammatical issues. PR: 263488 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263488 ) (cherry picked from commit dfa5a74357f3837b93b0cc90e5bee0a1d298ca3e) M usr.sbin/bsdinstall/scripts/bootconfig ____________________________________________________________________________________________________________ Commit: 47807edf0ac29cbc6c11c49d6152d740040f387d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=47807edf0ac29cbc6c11c49d6152d740040f387d Author: Xin LI (Tue 20 May 2025 04:44:02 BST) Committer: Xin LI (Tue 10 Jun 2025 07:05:19 BST) MFC: MFV: less v678. (cherry picked from commit 252d6dde57d5dd0184929d1f8fb65e7713f51c6d) M contrib/less/LICENSE M contrib/less/NEWS M contrib/less/brac.c M contrib/less/ch.c M contrib/less/charset.c M contrib/less/charset.h M contrib/less/cmd.h M contrib/less/cmdbuf.c M contrib/less/command.c M contrib/less/compose.uni M contrib/less/cvt.c M contrib/less/decode.c M contrib/less/edit.c M contrib/less/evar.c M contrib/less/filename.c M contrib/less/fmt.uni M contrib/less/forwback.c M contrib/less/funcs.h M contrib/less/help.c M contrib/less/ifile.c M contrib/less/input.c M contrib/less/jump.c M contrib/less/lang.h M contrib/less/less.h M contrib/less/less.hlp M contrib/less/less.nro M contrib/less/lessecho.c M contrib/less/lessecho.nro M contrib/less/lesskey.c M contrib/less/lesskey.h M contrib/less/lesskey.nro M contrib/less/lesskey_parse.c M contrib/less/lglob.h M contrib/less/line.c M contrib/less/linenum.c M contrib/less/lsystem.c M contrib/less/main.c M contrib/less/mark.c M contrib/less/mkutable M contrib/less/optfunc.c M contrib/less/option.c M contrib/less/option.h M contrib/less/opttbl.c M contrib/less/os.c M contrib/less/output.c M contrib/less/pattern.c M contrib/less/pattern.h M contrib/less/pckeys.h M contrib/less/position.c M contrib/less/position.h M contrib/less/prompt.c M contrib/less/screen.c M contrib/less/scrsize.c M contrib/less/search.c M contrib/less/signal.c M contrib/less/tags.c M contrib/less/ttyin.c M contrib/less/ubin.uni M contrib/less/version.c M contrib/less/wide.uni M usr.bin/less/defines.h ____________________________________________________________________________________________________________ Commit: be0706e8e15de57c7d245abe918f494d90a49934 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=be0706e8e15de57c7d245abe918f494d90a49934 Author: Dag-Erling Smørgrav (Sat 31 May 2025 19:07:46 BST) Committer: Dag-Erling Smørgrav (Sat 7 Jun 2025 07:51:39 BST) netcat: Allow service names to be used. Someone should really do a vendor import, but it's non-trivial, as we have local modifications. In the meantime, here's a nine-year-old upstream patch which allows service names to be used instead of port numbers. MFC after: 1 week Obtained from: OpenBSD Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D50348 (cherry picked from commit 6d3d1fc3a30453be19831f79399bcba0ae822ad1) M contrib/netcat/nc.1 M contrib/netcat/netcat.c ____________________________________________________________________________________________________________ Commit: 39f039512f8bad0401481eacaf285b77ec5dbb70 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=39f039512f8bad0401481eacaf285b77ec5dbb70 Author: Dag-Erling Smørgrav (Sat 31 May 2025 15:26:50 BST) Committer: Dag-Erling Smørgrav (Sat 7 Jun 2025 07:50:38 BST) libpam: Additional module directory. Many if not most ports that install PAM modules install them into ${LOCALBASE}/lib/security instead of just ${LOCALBASE}/lib, because all the world is Linux. Rather than try to fix the ports, add that directory to the search path. MFC after: 1 week Relnotes: yes Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D50626 (cherry picked from commit bb625fc2ac801d0a06ef0edab37a9bdaf209f008) M contrib/openpam/lib/libpam/openpam_constants.c ____________________________________________________________________________________________________________ Commit: 06664c3b0ec2f446466f0d7e53addad0d7c2dd64 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=06664c3b0ec2f446466f0d7e53addad0d7c2dd64 Author: Kristof Provost (Fri 6 Jun 2025 22:20:16 BST) Committer: Kristof Provost (Fri 6 Jun 2025 22:20:16 BST) pf: fix panic in pf_return() We (correctly) NULL out sk and nk before calling pf_return(), but that function still tried to use them to undo NAT transformations. Store the old port numbers and use those rather than sk/nk. This is a partial import of e11dacbf8484adc7bbb61b20fee3ab8385745925 (osport/odport), and the missing parts of bdea9cbcf2decafeb4da5a0280313efccc09e1b3. Direct commit to stable/14. PR: 287254 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287254 ) (cherry picked from commit 6f6ca5288060110c7385b9424e4729b192ed6308) M sys/net/pfvar.h M sys/netpfil/pf/pf.c ____________________________________________________________________________________________________________ Commit: cda1b2b634ce39269f4e0e0b9856c205034ec2ab URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cda1b2b634ce39269f4e0e0b9856c205034ec2ab Author: Michael Osipov (Wed 28 May 2025 16:02:54 BST) Committer: Michael Osipov (Wed 4 Jun 2025 20:32:53 BST) caroot: Update certdata URL for GitHub switch Mozilla has migrated its projects' source code to GitHub, update certdata URL along with it. Reference: https://github.com/curl/curl/pull/17321 Reviewed by: jrm (mentor), otis (mentor), kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50575 (cherry picked from commit 87c46facc3cf1744c30ecc9f63c10a778a1af104) M secure/caroot/Makefile ____________________________________________________________________________________________________________ Commit: c92ffde748d5fa397964fbc4c1f6766858aeb337 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c92ffde748d5fa397964fbc4c1f6766858aeb337 Author: Alexander Motin (Sun 25 May 2025 19:23:54 BST) Committer: Alexander Motin (Wed 28 May 2025 01:27:55 BST) systat/top: Update ZFS sysctl names Some of ARC statistic sysctls changed years ago, but those tools are still using legacy shims, that are going to be removed. MFC after: 3 days (cherry picked from commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf) M usr.bin/systat/main.c M usr.bin/top/machine.c ____________________________________________________________________________________________________________ Commit: 2e4014e81f6c755b5977662917c2defbb697ff53 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2e4014e81f6c755b5977662917c2defbb697ff53 Author: Lexi Winter (Fri 4 Apr 2025 11:59:09 BST) Committer: Lexi Winter (Tue 27 May 2025 08:11:56 BST) net/if_bridgevar.h: add include guard Reviewed by: kp Approved by: des (mentor) (cherry picked from commit f6aedb956ef154828c4bfaddaa5d5eb2dda5225c) M sys/net/if_bridgevar.h ____________________________________________________________________________________________________________ Commit: 1c12934eba86c7294becc23c7518e0fb9b996fa8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1c12934eba86c7294becc23c7518e0fb9b996fa8 Author: Jordan Gordeev (Sun 18 May 2025 20:55:05 BST) Committer: Dimitry Andric (Sun 25 May 2025 10:20:41 BST) libc++: fix compiling with -fmodules In /usr/include/c++/v1/__locale_dir/locale_base_api.h, xlocale.h is included without first including stdio.h and stdlib.h, which causes functions like strtoll_l() or sscanf_l() to not be declared. When compiling with -fmodules, locale_base_api.h is processed separately due to a declaration in /usr/include/c++/v1/module.modulemap, and this will cause errors due to the above undeclared symbols. Meanwhile, upstream has substantially reorganized this part of libc++'s headers, so apply a minimalistic workaround: specifically when compiling with -fmodules, add includes of stdio.h and stdlib.h. PR: 286342 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=286342 ) MFC after: 1 week (cherry picked from commit c809b0184d0a6543bc5327d4252fa56a07ce4689) M contrib/llvm-project/libcxx/include/__locale_dir/locale_base_api.h ____________________________________________________________________________________________________________ Commit: df16df7700c829c6807021ed883ef538806609d6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=df16df7700c829c6807021ed883ef538806609d6 Author: Philip Paeps (Wed 21 May 2025 10:15:50 BST) Committer: Philip Paeps (Sat 24 May 2025 05:39:20 BST) zoneinfo: don't install version The commit teaching the build to install tzdata.zi for libcxx also instals version. It turns out this makes at least one piece of third party software cry: rubygem-tzinfo expects any file in zoneinfo to be at least 44 bytes long. Clearly this is a bug in rubygem-tzinfo but since nothing actually uses version, we may as well not install it ... as we did previously. Reported by: delphij Fixes: 91506dba7f2e zoneinfo: also install tzdata.zi and version MFC after: 1 day (cherry picked from commit 23a0c88b037625745b88d1661b9552f1ebe97ebc) M ObsoleteFiles.inc M share/zoneinfo/Makefile ____________________________________________________________________________________________________________ Commit: 50cf49f6011f861c1824303e26fff1655fc3e54a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=50cf49f6011f861c1824303e26fff1655fc3e54a Author: sd@mostnet.ru (Fri 9 May 2025 15:48:27 BST) Committer: Mateusz Piotrowski <0mp@FreeBSD.org> (Fri 23 May 2025 09:43:58 BST) service(8): Allow for passing no arguments to the service script Currently, service(8) requires the user to provide a command to the rc service script. For example, service cron does not even run the cron rc service script but instead shows the usage message of service(8). This patch makes it so running the rc service script with no arguments via service(8) is closer to running the rc service script directly (e.g., /etc/rc.d/cron). Long story short, for most of the rc service scripts this change means that running "service FOO" now shows the usage message of FOO instead of the usage message of service(8). PR: 255115 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255115 ) Reviewed by: bnovkov, christos, imp, lme, markj Approved by: bnovkov (mentor), christos (mentor), markj (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47328 (cherry picked from commit 7ffedfe14ca85aa3474980092a732d4e49309c62) M usr.sbin/service/service.8 M usr.sbin/service/service.sh ____________________________________________________________________________________________________________ Commit: 5fa8cce7e949008c05730934fd23ce8b9b9102be URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5fa8cce7e949008c05730934fd23ce8b9b9102be Author: Dan Langille (Sun 23 Feb 2025 01:42:33 GMT) Committer: Lexi Winter (Thu 22 May 2025 22:45:13 BST) newsyslog.conf.d/opensm.conf: remove leading blank line Reviewed by: jlduran, ivy, kevans Approved by: kevans (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1603 (cherry picked from commit 2d22d54fc4abc1b4901cf62ef3888172df6798cd) M usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf ____________________________________________________________________________________________________________ Commit: 3214a7958563e02df3c53c26f090ce958ce8eda0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3214a7958563e02df3c53c26f090ce958ce8eda0 Author: Lexi Winter (Wed 14 May 2025 23:02:59 BST) Committer: Lexi Winter (Wed 21 May 2025 00:17:06 BST) link_addr: be more strict about address formats instead of accepting any character as a delimiter, only accept ':', '.' and '-', and only permit a single delimiter in an address. this prevents accepting bizarre addresses like: ifconfig epair2a link 10.1.2.200/28 ... which is particularly problematic on an INET6-only system, in which case ifconfig defaults to the 'link' family, meaning that: ifconfig epair2a 10.1.2.200/28 ... changes the Ethernet address of the interface. bump __FreeBSD_version so link_addr() consumers can detect the change. Reviewed by: kp, des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D49936 (cherry picked from commit a1215090416b8afb346fb2ff5b38f25ba0134a3a) M lib/libc/net/linkaddr.3 M lib/libc/net/linkaddr.c M lib/libc/tests/net/link_addr_test.cc M sbin/ifconfig/af_link.c M sys/net/if_dl.h M sys/sys/param.h ____________________________________________________________________________________________________________ Commit: 054468aa45d0327f85832a7b3c13c083de0537fc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=054468aa45d0327f85832a7b3c13c083de0537fc Author: Lexi Winter (Fri 9 May 2025 22:34:16 BST) Committer: Lexi Winter (Tue 20 May 2025 23:11:59 BST) net/if_dl.h: add param names in prototypes previously these _KERNEL functions were inconsistent, with some having parameter names and some not. fix this by giving them all names, per style(9). Reviewed by: thj, des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50219 (cherry picked from commit 8c7d193e3cbe3d1c9a7f7869f1748bebefabaccf) M sys/net/if_dl.h ____________________________________________________________________________________________________________ Commit: 838c75f8699fbbb54dd4ab545632bbe950b37d8c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=838c75f8699fbbb54dd4ab545632bbe950b37d8c Author: Lexi Winter (Wed 7 May 2025 10:34:08 BST) Committer: Lexi Winter (Tue 20 May 2025 23:11:52 BST) libc: add link_ntoa_r() this is a re-entrant version of link_ntoa. use an in-out parameter for the buffer size, so the user requires at most two calls to determine the needed size. reimplement link_ntoa using link_ntoa_r with a static buffer. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50202 (cherry picked from commit da509c29089ab169b667ebdf82aa903987ba9c6d) M lib/libc/net/Makefile.inc M lib/libc/net/Symbol.map M lib/libc/net/linkaddr.3 M lib/libc/net/linkaddr.c M lib/libc/tests/net/link_addr_test.cc M sys/net/if_dl.h ____________________________________________________________________________________________________________ Commit: 55f0de27930678dbd0b5d6e627e5dd5eee3d11f8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=55f0de27930678dbd0b5d6e627e5dd5eee3d11f8 Author: Lexi Winter (Mon 5 May 2025 18:25:03 BST) Committer: Lexi Winter (Tue 20 May 2025 23:11:46 BST) libc tests: add tests for link_addr(3) and link_ntoa(3) for now, since link_addr() has no way to indicate an error, these are only positive tests which check the outcome of valid inputs. Reviewed by: ngie, des, adrian Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50062 (cherry picked from commit 757e973fb2112ea442aa8990d991f406d407b6f7) link_addr_test: use , not is the correct header; this fixes the GCC build. while here, sort the headers. Fixes: 757e973fb211 ("libc tests: add tests for link_addr(3) and link_ntoa(3)") Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50189 (cherry picked from commit bbffdfef3bf04b2f89027cb20e2019fdc74c4b1b) M lib/libc/tests/net/Makefile A lib/libc/tests/net/link_addr_test.cc ____________________________________________________________________________________________________________ Commit: c82e2174150a47cdc5bfa61e6383cfc6343c5389 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c82e2174150a47cdc5bfa61e6383cfc6343c5389 Author: Lexi Winter (Wed 7 May 2025 10:27:20 BST) Committer: Lexi Winter (Tue 20 May 2025 22:03:29 BST) column(1): add tests and -l flag column(1): add tests Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D49911 (cherry picked from commit 6f2b1b56ac3dd154bd98f5a7ea075abcb4356560) column(1): add -l flag the '-l ' flag limits the number of columns that column(1) will produce in -t mode. this is syntax-compatible with the same option in util-linux's column(1), but due to existing differences between the two implementations, it's not semantically compatible. as a side-effect, fix a pre-existing bug where empty fields could cause incorrect output: % echo ':' | column -ts: (null) while here, also fix a couple of minor existing issues. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50290 (cherry picked from commit 313713b24c6d2a3061972c4f431515c4f1b01c77) M etc/mtree/BSD.tests.dist M usr.bin/column/Makefile M usr.bin/column/column.1 M usr.bin/column/column.c A usr.bin/column/tests/Makefile A usr.bin/column/tests/column.sh ____________________________________________________________________________________________________________ Commit: 9f290050a6cda849783d4d58e8f9a3307dc3792e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9f290050a6cda849783d4d58e8f9a3307dc3792e Author: Seyed Pouria Mousavizadeh Tehrani (Fri 16 May 2025 17:19:56 BST) Committer: Lexi Winter (Tue 20 May 2025 22:03:29 BST) ng_sample: fix style nits MFC after: 3 days Reviewed by: ivy, kp, des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50343 (cherry picked from commit 95c414dd27c26285cdd6ed4288832b3db0ea6628) M sys/netgraph/ng_sample.c ____________________________________________________________________________________________________________ Commit: 513df87288d0ac09cb378b40eeb1abd3ee79bee9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=513df87288d0ac09cb378b40eeb1abd3ee79bee9 Author: Lexi Winter (Fri 9 May 2025 22:28:14 BST) Committer: Lexi Winter (Tue 20 May 2025 22:03:29 BST) sys/cdefs.h: add __nodiscard annotation __nodiscard adds the [[nodiscard]] attribute to a function, type or constructor in C or C++, causing a value so marked to issue a compiler warning if it is discarded (i.e., not used or assigned) other than by casting it to void. this replaces the existing __result_use_or_ignore_check, which has a similar purpose but different semantics. since __nodiscard provides more functionality (at least in GCC) and __result_use_or_ignore_check only had a single user, remove __result_use_or_ignore_check. [[nodiscard]] has been supported in C++ since C++17, but only in C since C23; however, both LLVM and GCC implement it even in older language versions, so it should always be available with a relatively modern compiler. for Clang, [[nodiscard]] in C is only available since LLVM 17, but we can fall back to __attribute__((__warn_unused_result__)) which has the same semantics and provides support back to (at least) LLVM 11. GCC supports [[nodiscard]] in both C and C++ since at least GCC 11. for GCC, we can't provide a fallback as the semantics of its warn_unused_result are different, but since __result_use_or_ignore_check isn't defined for GCC anyway, we don't lose anything here. MFC after: 2 weeks Reviewed by: des, emaste Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50217 (cherry picked from commit 7e0c5e0128c43bbae78190911aead8e1d9475ba5) M sys/sys/cdefs.h ____________________________________________________________________________________________________________ Commit: ca7778575215a740ed7575203e75e99dc0bd8a1a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ca7778575215a740ed7575203e75e99dc0bd8a1a Author: Roger Pau Monné (Tue 9 Jan 2024 09:26:06 GMT) Committer: Roger Pau Monné (Mon 19 May 2025 09:25:08 BST) xen: improve man (4) page Update the xen(4) man page to reflect the current support status. Reported by: kevans Reviewed by: bcr kevans imp Differential revision: https://reviews.freebsd.org/D43373 (cherry picked from commit 82126ef92fdb3c13a67ad44d33c0fe6ea479c01a) M share/man/man4/xen.4 ____________________________________________________________________________________________________________ Commit: 9523a569fc02cf7d61e30016d2eb5e562981fe57 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9523a569fc02cf7d61e30016d2eb5e562981fe57 Author: Lexi Winter (Tue 15 Apr 2025 17:13:23 BST) Committer: Lexi Winter (Mon 19 May 2025 03:49:20 BST) sys/net: add a new ether_vlanid_t type ether_vlanid_t is a type to represent a VLAN ID, for example inside a .1q tag. since this is specific to Ethernet, put it in net/ethernet.h. change bridge to use the new type instead of uint{16,32}_t. Reviewed by: adrian, kp Differential Revision: https://reviews.freebsd.org/D49836 (cherry picked from commit 96f830456fd449c4cb5a7df8a2f6c3c96993b43e) M sys/net/ethernet.h M sys/net/if_bridge.c M sys/net/if_bridgevar.h ____________________________________________________________________________________________________________ Commit: 738c0bb0ad0b2a732841526f74af045703ec5236 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=738c0bb0ad0b2a732841526f74af045703ec5236 Author: Cy Schubert (Mon 28 Apr 2025 02:16:37 BST) Committer: Cy Schubert (Sun 11 May 2025 05:50:00 BST) wpa_supplicant: Use PF_LOCAL instead of PF_INET* Using a local socket circumvents the issue of needing any Internet protocol (PF_INET or PF_INET6) support. We only use interface ("i" group) ioctls on this socket so we can get away with using PF_LOCAL instead of requring any Internet protocol (PF_INET or PF_INET6) support on the system. This simplifies the patch from 8c7149c73f8f. PR: 286259 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=286259 ) Noted by: kevans Fixes: 8c7149c73f8f Reviewed by: kevans, philip, zarychtam_plan-b.pwste.edu.pl (mzar) Differential revision: https://reviews.freebsd.org/D50050 (cherry picked from commit 6aeec6a741975143f53feabceb1726d5033aafd6) M contrib/wpa/src/drivers/driver_bsd.c ____________________________________________________________________________________________________________ Commit: b3e677d58b7a3247d213456e05389586da82195e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b3e677d58b7a3247d213456e05389586da82195e Author: Marek Zarychta (Mon 28 Apr 2025 01:02:04 BST) Committer: Cy Schubert (Sun 11 May 2025 05:49:59 BST) wpa_supplicant: Handle systems without INET (legacy IP) support Currently, wpa_supplicant fails when legacy IP support is disabled in FreeBSD (i.e., the world built with WITHOUT_INET and nooptions INET in the kernel config). The proposed patch allows running wpa_supplicant and connecting to wireless networks without INET support when INET6 is available. Reviewed by: cy, adrian, philip, roy_marples.name Differential Revision: https://reviews.freebsd.org/D49959 (cherry picked from commit 8c7149c73f8f2301369f271c98470b72973b0c01) M contrib/wpa/src/drivers/driver_bsd.c ____________________________________________________________________________________________________________ Commit: 560608f78a538f87559b2bffde27fd75b4abd93e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=560608f78a538f87559b2bffde27fd75b4abd93e Author: Cy Schubert (Sun 27 Apr 2025 04:39:21 BST) Committer: Cy Schubert (Sun 11 May 2025 05:49:59 BST) unbound: Update version strings Fixes: be771a7b7f45 MFC after: 2 weeks (cherry picked from commit 3bef9b313be73788cd3b77d9b514d292169c442e) M lib/libunbound/config.h ____________________________________________________________________________________________________________ Commit: 8f00a3eabdcf3fe4e7ca353aae2aa16afe840d8f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8f00a3eabdcf3fe4e7ca353aae2aa16afe840d8f Author: Cy Schubert (Fri 25 Apr 2025 15:48:44 BST) Committer: Cy Schubert (Sun 11 May 2025 05:49:59 BST) unbound: Vendor import 1.23.0 Release notes at https://nlnetlabs.nl/news/2025/Apr/24/unbound-1.23.0-released/ Merge commit '44bab727dfe28451b777dc9e47db4f748b709182' (cherry picked from commit be771a7b7f4580a30d99e41a5bb1b93a385a119d) M contrib/unbound/Makefile.in A contrib/unbound/ax_build_date_epoch.m4 M contrib/unbound/cachedb/cachedb.c M contrib/unbound/cachedb/redis.c M contrib/unbound/compat/malloc.c M contrib/unbound/config.h.in M contrib/unbound/configure M contrib/unbound/configure.ac M contrib/unbound/contrib/android/install_expat.sh M contrib/unbound/contrib/ios/install_expat.sh M contrib/unbound/daemon/acl_list.c M contrib/unbound/daemon/acl_list.h M contrib/unbound/daemon/cachedump.c M contrib/unbound/daemon/daemon.c M contrib/unbound/daemon/daemon.h M contrib/unbound/daemon/remote.c M contrib/unbound/daemon/remote.h M contrib/unbound/daemon/stats.c M contrib/unbound/daemon/unbound.c M contrib/unbound/daemon/worker.c M contrib/unbound/daemon/worker.h M contrib/unbound/dns64/dns64.c M contrib/unbound/dnstap/dnstap.c M contrib/unbound/dnstap/dnstap.h M contrib/unbound/dnstap/unbound-dnstap-socket.c M contrib/unbound/doc/Changelog M contrib/unbound/doc/README M contrib/unbound/doc/example.conf.in M contrib/unbound/doc/libunbound.3.in M contrib/unbound/doc/unbound-anchor.8.in M contrib/unbound/doc/unbound-checkconf.8.in M contrib/unbound/doc/unbound-control.8.in M contrib/unbound/doc/unbound-host.1.in M contrib/unbound/doc/unbound.8.in M contrib/unbound/doc/unbound.conf.5.in M contrib/unbound/ipsecmod/ipsecmod.c M contrib/unbound/iterator/iter_delegpt.c M contrib/unbound/iterator/iter_fwd.c M contrib/unbound/iterator/iter_fwd.h M contrib/unbound/iterator/iter_hints.c M contrib/unbound/iterator/iter_hints.h M contrib/unbound/iterator/iter_utils.c M contrib/unbound/iterator/iter_utils.h M contrib/unbound/iterator/iterator.c M contrib/unbound/iterator/iterator.h M contrib/unbound/libunbound/libworker.c M contrib/unbound/libunbound/unbound.h A contrib/unbound/pythonmod/interface.i A contrib/unbound/pythonmod/pythonmod_utils.c M contrib/unbound/respip/respip.c M contrib/unbound/respip/respip.h M contrib/unbound/services/authzone.c M contrib/unbound/services/authzone.h M contrib/unbound/services/cache/dns.c M contrib/unbound/services/cache/dns.h M contrib/unbound/services/cache/infra.c M contrib/unbound/services/cache/infra.h M contrib/unbound/services/listen_dnsport.c M contrib/unbound/services/listen_dnsport.h M contrib/unbound/services/localzone.c M contrib/unbound/services/localzone.h M contrib/unbound/services/mesh.c M contrib/unbound/services/mesh.h M contrib/unbound/services/outside_network.c M contrib/unbound/services/outside_network.h M contrib/unbound/services/rpz.c M contrib/unbound/services/rpz.h M contrib/unbound/services/view.c M contrib/unbound/services/view.h M contrib/unbound/sldns/keyraw.c M contrib/unbound/sldns/rrdef.c M contrib/unbound/sldns/rrdef.h M contrib/unbound/sldns/str2wire.c M contrib/unbound/sldns/str2wire.h M contrib/unbound/sldns/wire2str.c M contrib/unbound/sldns/wire2str.h M contrib/unbound/smallapp/unbound-checkconf.c M contrib/unbound/smallapp/unbound-control-setup.sh.in M contrib/unbound/smallapp/unbound-control.c M contrib/unbound/smallapp/worker_cb.c A contrib/unbound/testcode/checklocks.c A contrib/unbound/testcode/do-tests.sh A contrib/unbound/testcode/doqclient.c A contrib/unbound/testcode/fake_event.c A contrib/unbound/testcode/testbound.c A contrib/unbound/testcode/unitdname.c A contrib/unbound/testcode/unitinfra.c A contrib/unbound/testcode/unitldns.c A contrib/unbound/testcode/unitmain.c A contrib/unbound/testcode/unitmain.h A contrib/unbound/testcode/unitneg.c A contrib/unbound/testcode/unitverify.c A contrib/unbound/testcode/unitzonemd.c A contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.conf A contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.test A contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.testns A contrib/unbound/testdata/acl_interface.tdir/acl_interface.conf A contrib/unbound/testdata/acl_interface.tdir/acl_interface.test.scenario A contrib/unbound/testdata/auth_tls.tdir/auth_tls.pre A contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.pre A contrib/unbound/testdata/cachedb_expired.crpl A contrib/unbound/testdata/cachedb_expired_reply_ttl.crpl A contrib/unbound/testdata/cachedb_servfail_cname.crpl A contrib/unbound/testdata/cachedb_val_expired.crpl A contrib/unbound/testdata/common.sh A contrib/unbound/testdata/dns_error_reporting.rpl A contrib/unbound/testdata/dnstap.tdir/dnstap.conf A contrib/unbound/testdata/fast_reload_fwd.tdir/auth1.zone A contrib/unbound/testdata/fast_reload_fwd.tdir/auth2.zone A contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.conf A contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.conf2 A contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.dsc A contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.ns1 A contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.ns2 A contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.post A contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.pre A contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.test A contrib/unbound/testdata/fast_reload_most_options.tdir/auth.nlnetlabs.nl.zone A contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.conf A contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.dsc A contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.post A contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.pre A contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.test A contrib/unbound/testdata/fast_reload_most_options.tdir/rpz.nlnetlabs.nl.zone A contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.conf A contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.dsc A contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.post A contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.pre A contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.test A contrib/unbound/testdata/fwd_0ttlservfail.rpl A contrib/unbound/testdata/iter_failreply.rpl A contrib/unbound/testdata/iter_fwdstubauth.rpl A contrib/unbound/testdata/iter_scrub_rr_length.rpl A contrib/unbound/testdata/log_servfail.tdir/log_servfail.conf A contrib/unbound/testdata/log_servfail.tdir/log_servfail.dsc A contrib/unbound/testdata/log_servfail.tdir/log_servfail.post A contrib/unbound/testdata/log_servfail.tdir/log_servfail.pre A contrib/unbound/testdata/log_servfail.tdir/log_servfail.test A contrib/unbound/testdata/redis_replica.tdir/after.zone A contrib/unbound/testdata/redis_replica.tdir/before.zone A contrib/unbound/testdata/redis_replica.tdir/redis.conf A contrib/unbound/testdata/redis_replica.tdir/redis_replica.conf A contrib/unbound/testdata/redis_replica.tdir/redis_replica.dsc A contrib/unbound/testdata/redis_replica.tdir/redis_replica.post A contrib/unbound/testdata/redis_replica.tdir/redis_replica.pre A contrib/unbound/testdata/redis_replica.tdir/redis_replica.test A contrib/unbound/testdata/redis_replica.tdir/unbound_control.key A contrib/unbound/testdata/redis_replica.tdir/unbound_control.pem A contrib/unbound/testdata/redis_replica.tdir/unbound_server.key A contrib/unbound/testdata/redis_replica.tdir/unbound_server.pem A contrib/unbound/testdata/rpz_nsdname.rpl A contrib/unbound/testdata/rpz_val_block.rpl A contrib/unbound/testdata/serve_expired.rpl A contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl A contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl A contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl A contrib/unbound/testdata/serve_expired_cached_servfail.rpl A contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl A contrib/unbound/testdata/serve_expired_client_timeout_servfail.rpl A contrib/unbound/testdata/serve_expired_client_timeout_val_bogus.rpl A contrib/unbound/testdata/serve_expired_reply_ttl.rpl A contrib/unbound/testdata/serve_expired_ttl.rpl A contrib/unbound/testdata/serve_expired_ttl_reset.rpl A contrib/unbound/testdata/serve_expired_val_bogus.rpl A contrib/unbound/testdata/serve_expired_zerottl.rpl A contrib/unbound/testdata/serve_original_ttl.rpl A contrib/unbound/testdata/stat_values.tdir/stat_values.conf A contrib/unbound/testdata/stat_values.tdir/stat_values.pre A contrib/unbound/testdata/stat_values.tdir/stat_values.test A contrib/unbound/testdata/stat_values.tdir/stat_values.testns A contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf A contrib/unbound/testdata/stat_values.tdir/stat_values_discard_wait_limit.conf A contrib/unbound/testdata/subnet_cached_servfail.crpl A contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl A contrib/unbound/testdata/subnet_global_prefetch_expired.crpl A contrib/unbound/testdata/test_ldnsrr.4 A contrib/unbound/testdata/test_ldnsrr.5 A contrib/unbound/testdata/test_ldnsrr.c3 A contrib/unbound/testdata/test_ldnsrr.c4 A contrib/unbound/testdata/test_ldnsrr.c5 A contrib/unbound/testdata/val_failure_dnskey.rpl A contrib/unbound/testdata/val_scrub_rr_length.rpl M contrib/unbound/util/config_file.c M contrib/unbound/util/config_file.h M contrib/unbound/util/configlexer.c M contrib/unbound/util/configlexer.lex M contrib/unbound/util/configparser.c M contrib/unbound/util/configparser.h M contrib/unbound/util/configparser.y M contrib/unbound/util/data/dname.c M contrib/unbound/util/data/dname.h M contrib/unbound/util/data/msgreply.c M contrib/unbound/util/data/msgreply.h M contrib/unbound/util/edns.c M contrib/unbound/util/edns.h M contrib/unbound/util/fptr_wlist.c M contrib/unbound/util/iana_ports.inc M contrib/unbound/util/log.c M contrib/unbound/util/module.c M contrib/unbound/util/module.h M contrib/unbound/util/net_help.c M contrib/unbound/util/net_help.h M contrib/unbound/util/netevent.c M contrib/unbound/util/netevent.h M contrib/unbound/util/shm_side/shm_main.c M contrib/unbound/util/storage/dnstree.c M contrib/unbound/util/storage/lruhash.c M contrib/unbound/util/storage/lruhash.h M contrib/unbound/util/storage/slabhash.c M contrib/unbound/util/storage/slabhash.h M contrib/unbound/util/tcp_conn_limit.c M contrib/unbound/util/tcp_conn_limit.h M contrib/unbound/util/tube.c M contrib/unbound/util/ub_event.c M contrib/unbound/validator/autotrust.c M contrib/unbound/validator/val_anchor.c M contrib/unbound/validator/val_anchor.h M contrib/unbound/validator/val_neg.c M contrib/unbound/validator/val_neg.h M contrib/unbound/validator/validator.c M contrib/unbound/validator/validator.h A contrib/unbound/winrc/win_svc.c ____________________________________________________________________________________________________________ Commit: 7e755cde72e3351a2ec998606a5b612cb7dbe5d1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7e755cde72e3351a2ec998606a5b612cb7dbe5d1 Author: Cy Schubert (Wed 26 Mar 2025 13:43:54 GMT) Committer: Cy Schubert (Sun 11 May 2025 05:49:59 BST) heimdal: Add missing symbols to map Patch supplied by mi@ through a private email. Bump __FreeBSD_version for ports that might need this. PR: 280025 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280025 ) (cherry picked from commit d5c804138845a1c8d81fbbce48de676806de32e6) M crypto/heimdal/lib/krb5/version-script.map M sys/sys/param.h ____________________________________________________________________________________________________________ Commit: b2bd1781fe5645fbbdc6641a1275b6d0696f6663 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b2bd1781fe5645fbbdc6641a1275b6d0696f6663 Author: Dimitry Andric (Fri 25 Apr 2025 18:58:03 BST) Committer: Dimitry Andric (Fri 9 May 2025 20:53:20 BST) depend-cleanup: ensure clang and llvm binaries are rebuilt In 2e47f35be5dc, libllvm, libclang and liblldb became shared libraries, so make sure the binaries that depend on these libraries get rebuilt. MFC after: 2 weeks (cherry picked from commit d4dab32448ce7aff01273ecf9965125f0cb8067a) M tools/build/depend-cleanup.sh ____________________________________________________________________________________________________________ Commit: ae60fcd40fc6e46d239104464f61a6ae30d14e5b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ae60fcd40fc6e46d239104464f61a6ae30d14e5b Author: Dimitry Andric (Fri 25 Apr 2025 18:56:39 BST) Committer: Dimitry Andric (Fri 9 May 2025 18:16:15 BST) Convert libllvm, libclang and liblldb into private shared libraries This allows clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. Since these are not quite the same as the shared libraries shipped by the upstream llvm build system, and we do not want to expose the ABI to external programs such as ports, make them private libraries. Note that during the cross-tools stage they are still built as static libraries, so the cross compiler and linker are static binaries, as they have always been. This also requires a depend-cleanup.sh kludge which will be added in a follow-up commit, to ensure binaries are rebuilt against the shared libraries in case of incremental builds. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49967 (cherry picked from commit 2e47f35be5dc61945afdbd1a70e8fd505c032c94) M lib/clang/libclang/Makefile M lib/clang/liblldb/Makefile M lib/clang/libllvm/Makefile M tools/build/mk/OptionalObsoleteFiles.inc M usr.bin/clang/Makefile.inc M usr.bin/clang/clang.prog.mk M usr.bin/clang/lld/Makefile M usr.bin/clang/lldb-server/Makefile M usr.bin/clang/lldb/Makefile M usr.bin/clang/llvm.prog.mk ____________________________________________________________________________________________________________ Commit: faf7c4ad59df3a6870a9aa8d80767bd750991817 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=faf7c4ad59df3a6870a9aa8d80767bd750991817 Author: Gordon Bergling (Mon 5 May 2025 09:47:23 BST) Committer: Gordon Bergling (Thu 8 May 2025 07:45:28 BST) udf: Fix a typo in a source code comment - s/demostrates/demonstrates/ (cherry picked from commit f6674f74fb299821d0f159b9f11cf7dd9b3e70ad) M sys/fs/udf/udf_vfsops.c ____________________________________________________________________________________________________________ Commit: 346bb5d3fe19024e48976cd4705f45ab60cb9faf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=346bb5d3fe19024e48976cd4705f45ab60cb9faf Author: Xin LI (Sun 4 May 2025 08:06:22 BST) Committer: Xin LI (Wed 7 May 2025 22:23:44 BST) MFV: xz 5.8.1. PR: bin/286252 (cherry picked from commit 128836d304d93f2d00eb14069c27089ab46c38d4) M contrib/xz/AUTHORS M contrib/xz/COPYING M contrib/xz/ChangeLog M contrib/xz/README M contrib/xz/THANKS M contrib/xz/TODO A contrib/xz/src/common/my_landlock.h M contrib/xz/src/common/sysdefs.h M contrib/xz/src/common/tuklib_common.h M contrib/xz/src/common/tuklib_gettext.h M contrib/xz/src/common/tuklib_mbstr.h A contrib/xz/src/common/tuklib_mbstr_nonprint.c A contrib/xz/src/common/tuklib_mbstr_nonprint.h M contrib/xz/src/common/tuklib_mbstr_width.c A contrib/xz/src/common/tuklib_mbstr_wrap.c A contrib/xz/src/common/tuklib_mbstr_wrap.h M contrib/xz/src/common/tuklib_physmem.c M contrib/xz/src/liblzma/api/lzma/bcj.h M contrib/xz/src/liblzma/api/lzma/container.h M contrib/xz/src/liblzma/api/lzma/lzma12.h M contrib/xz/src/liblzma/api/lzma/version.h M contrib/xz/src/liblzma/check/check.h M contrib/xz/src/liblzma/check/crc32_arm64.h M contrib/xz/src/liblzma/check/crc32_fast.c A contrib/xz/src/liblzma/check/crc32_loongarch.h M contrib/xz/src/liblzma/check/crc32_small.c D contrib/xz/src/liblzma/check/crc32_table.c M contrib/xz/src/liblzma/check/crc32_x86.S M contrib/xz/src/liblzma/check/crc64_fast.c D contrib/xz/src/liblzma/check/crc64_table.c M contrib/xz/src/liblzma/check/crc64_x86.S A contrib/xz/src/liblzma/check/crc_clmul_consts_gen.c M contrib/xz/src/liblzma/check/crc_common.h M contrib/xz/src/liblzma/check/crc_x86_clmul.h M contrib/xz/src/liblzma/common/alone_decoder.c M contrib/xz/src/liblzma/common/auto_decoder.c M contrib/xz/src/liblzma/common/block_decoder.c M contrib/xz/src/liblzma/common/block_encoder.c M contrib/xz/src/liblzma/common/common.c M contrib/xz/src/liblzma/common/file_info.c M contrib/xz/src/liblzma/common/index_decoder.c M contrib/xz/src/liblzma/common/index_encoder.c M contrib/xz/src/liblzma/common/index_hash.c M contrib/xz/src/liblzma/common/lzip_decoder.c M contrib/xz/src/liblzma/common/memcmplen.h M contrib/xz/src/liblzma/common/stream_decoder.c M contrib/xz/src/liblzma/common/stream_decoder_mt.c M contrib/xz/src/liblzma/common/stream_encoder_mt.c M contrib/xz/src/liblzma/common/string_conversion.c M contrib/xz/src/liblzma/liblzma_generic.map M contrib/xz/src/liblzma/liblzma_linux.map M contrib/xz/src/liblzma/lz/lz_decoder.c M contrib/xz/src/liblzma/lz/lz_decoder.h M contrib/xz/src/liblzma/lz/lz_encoder.c M contrib/xz/src/liblzma/lz/lz_encoder_hash.h M contrib/xz/src/liblzma/lzma/lzma2_encoder.c M contrib/xz/src/liblzma/lzma/lzma_decoder.c M contrib/xz/src/liblzma/simple/arm.c M contrib/xz/src/liblzma/simple/arm64.c M contrib/xz/src/liblzma/simple/armthumb.c M contrib/xz/src/liblzma/simple/ia64.c M contrib/xz/src/liblzma/simple/powerpc.c M contrib/xz/src/liblzma/simple/riscv.c M contrib/xz/src/liblzma/simple/sparc.c M contrib/xz/src/liblzma/simple/x86.c M contrib/xz/src/lzmainfo/lzmainfo.c M contrib/xz/src/xz/args.c M contrib/xz/src/xz/args.h M contrib/xz/src/xz/coder.c M contrib/xz/src/xz/file_io.c M contrib/xz/src/xz/file_io.h M contrib/xz/src/xz/list.c M contrib/xz/src/xz/main.c M contrib/xz/src/xz/message.c M contrib/xz/src/xz/options.c M contrib/xz/src/xz/private.h M contrib/xz/src/xz/sandbox.c M contrib/xz/src/xz/suffix.c M contrib/xz/src/xz/util.c M contrib/xz/src/xz/xz.1 M contrib/xz/src/xzdec/xzdec.c M lib/liblzma/Makefile M lib/liblzma/Symbol.map M lib/liblzma/Versions.def M lib/liblzma/config.h M usr.bin/lzmainfo/Makefile M usr.bin/xz/Makefile M usr.bin/xzdec/Makefile ____________________________________________________________________________________________________________ Commit: b18da5008e97446db7238bcfa310d2c576e5e52f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b18da5008e97446db7238bcfa310d2c576e5e52f Author: Lexi Winter (Tue 6 May 2025 11:20:44 BST) Committer: Lexi Winter (Wed 7 May 2025 22:01:28 BST) net/if_dl.h: make self-contained include for u_char and u_short. to avoid including , remove the caddr_t cast from LLADDR. we are trying to get rid of caddr_t anyway, and since sdl_data is already an array of char, the cast is unnecessary. this also makes LLADDR const-correct, i.e. passing a const sockaddr_dl will return a const pointer. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50065 (cherry picked from commit 70b5c918571b6c79459ee6de66ceb4c83974d542) M sys/net/if_dl.h ____________________________________________________________________________________________________________ Commit: 243de2ac15455d58311046981e55b718af5723d4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=243de2ac15455d58311046981e55b718af5723d4 Author: Lexi Winter (Tue 6 May 2025 11:18:43 BST) Committer: Lexi Winter (Wed 7 May 2025 20:21:25 BST) net/if_dl.h: put kernel decls behind _KERNEL Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50063 (cherry picked from commit a5ba03f6e4f003022968b50161abac24c7ec1d38) M sys/net/if_dl.h ____________________________________________________________________________________________________________ Commit: a13702f04affcafb98840553599f7a5267adc791 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a13702f04affcafb98840553599f7a5267adc791 Author: Lexi Winter (Fri 4 Apr 2025 16:05:01 BST) Committer: Lexi Winter (Wed 7 May 2025 20:09:59 BST) bridge: define VLANTAGOF correctly to avoid strange precedence errors, enclose the macro body in parentheses. this fixes constructs like: if (VLANTAGOF(m) == i) Reviewed by: kp (cherry picked from commit f36292f010fcc6391605182f2973fdc12a3bd15f) M sys/net/if_bridge.c ____________________________________________________________________________________________________________ Commit: 9a6a287c8b924f837ae6ef5d45db5081a496549c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9a6a287c8b924f837ae6ef5d45db5081a496549c Author: Graham Perrin (Tue 18 Mar 2025 04:55:29 GMT) Committer: Lexi Winter (Wed 7 May 2025 19:59:47 BST) tty.4: see also: cross-reference pts(4) pts(4) already refers to tty(4). Add a cross-reference. Reviewed by: kevans Approved by: kevans (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1617 (cherry picked from commit 6f4c4cfe4b138297957d80c0887f99a83d9facf7) M share/man/man4/tty.4 ____________________________________________________________________________________________________________ Commit: 7e98bfd666c42ec91491f0739d15da57cc5389c7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7e98bfd666c42ec91491f0739d15da57cc5389c7 Author: K Rin (Sun 6 Apr 2025 19:15:07 BST) Committer: Lexi Winter (Wed 7 May 2025 19:53:52 BST) netstat(1): add description for option -o and -O. Reviewed by: kevans, ziaee, ivy Approved by: kevans (mentor) Fixes: fedeb08b6a58 ("Introduce scalable route multipath.") Fixes: a666325282ea ("Introduce nexthop objects and new routing KPI.") Pull Request: https://github.com/freebsd/freebsd-src/pull/1643 (cherry picked from commit afa30c5dec5afc8496172a062c93e96d78f5b9b9) M usr.bin/netstat/netstat.1 ____________________________________________________________________________________________________________ Commit: 77e0f080b2f821b76b2cecd843aafffb234d45b8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=77e0f080b2f821b76b2cecd843aafffb234d45b8 Author: Lexi Winter (Wed 23 Apr 2025 05:38:13 BST) Committer: Lexi Winter (Wed 7 May 2025 15:17:26 BST) etc: add config tag to /root/.k5login this prevents the file being overwritten every time FreeBSD-runtime is upgraded. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D49907 (cherry picked from commit eef0c78e435d5e38392c239d878784fda80b1fb8) M etc/Makefile ____________________________________________________________________________________________________________ Commit: cc6b1138519d75402be8f948dd858c028c3a5005 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cc6b1138519d75402be8f948dd858c028c3a5005 Author: Lexi Winter (Wed 7 May 2025 15:00:16 BST) Committer: Lexi Winter (Wed 7 May 2025 15:00:16 BST) rc.conf.5: add a missing word in the description of $ipv6_enable Reviewed by: ziaee, kevans Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50113 (cherry picked from commit dd2d270923884f0bb272da71cf76397ec5e8539c) M share/man/man5/rc.conf.5 ____________________________________________________________________________________________________________ Commit: 3502f06c6686fbb8335872b8bb3b951b549d8b2f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3502f06c6686fbb8335872b8bb3b951b549d8b2f Author: Philip Paeps (Tue 1 Apr 2025 09:09:37 BST) Committer: Philip Paeps (Tue 6 May 2025 02:57:32 BST) zoneinfo: also install tzdata.zi and version Build and install the shrunk version of the time zone database required by libc++ 19 std::chrono::current_zone (etc). While here, also install the tzdata 'version' file to align more closely with other vendors. PR: 282377 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282377 ) Reviewed by: dim, emaste, imp Differential Revision: https://reviews.freebsd.org/D49577 (cherry picked from commit 91506dba7f2eb147eeb55ec30640bc11755a1e8e) M share/zoneinfo/Makefile ____________________________________________________________________________________________________________ Commit: 979864eef41b5f8e4d201c2b37e0733c33cf41b2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=979864eef41b5f8e4d201c2b37e0733c33cf41b2 Author: Dimitry Andric (Mon 21 Apr 2025 20:52:29 BST) Committer: Dimitry Andric (Mon 5 May 2025 09:59:30 BST) Use .pieo extension for WITH_PIE bsd.prog.mk output When object files for programs are built using bsd.prog.mk, and WITH_PIE is enabled, the extension used is still plain ".o". To be consistent with bsd.lib.mk, and to allow changes in WITH_PIE settings to propagate correctly, the extension should be ".pieo" instead. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49966 (cherry picked from commit 245bb0110639fe963086fb2903143dbd4e6ac48c) M share/mk/bsd.prog.mk M share/mk/bsd.progs.mk M tests/sys/fs/fusefs/Makefile ____________________________________________________________________________________________________________ Commit: 70369e4c2c1a882fcf9abf293b305f4f8a0b0c16 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=70369e4c2c1a882fcf9abf293b305f4f8a0b0c16 Author: Rick Macklem (Fri 2 May 2025 00:17:20 BST) Committer: Rick Macklem (Sun 4 May 2025 02:08:24 BST) mountd: Fix updating the network/host(s) for an exports line Mountd reloads the exports(5) file(s) when it receives a SIGHUP and then compares the old and new exports, updating any ones that have changed in the kernel. Without this patch, mountd failed to recognize that a network/host(s) had changed, if there was no other change to the exports line. As such, the change of network/hosts(s) did not take effect until the mountd daemon was (re)started. This patch fixes the code so that it checks for changes in the network/host(s) list for an exports line. PR: 286260 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=286260 ) (cherry picked from commit 68daa781c1f12e1cfef768030eaff970c3d35543) M usr.sbin/mountd/mountd.c ____________________________________________________________________________________________________________ Commit: ee75c4d77a80d7299d50cf6413dafeaccd0d1ac5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ee75c4d77a80d7299d50cf6413dafeaccd0d1ac5 Author: Gordon Bergling (Sat 26 Apr 2025 11:18:31 BST) Committer: Gordon Bergling (Sat 3 May 2025 12:31:31 BST) nvmecontrol(8): Fix two typos in command messages Fix two typos in command messages: - s/identiy/identity/ (cherry picked from commit 52cc1708f5afdb3208d7797b87b3059a780d613b) M sbin/nvmecontrol/identify.c M sbin/nvmecontrol/ns.c ____________________________________________________________________________________________________________ Commit: 7ea71ba86a57e10a313c7633a894f8c53afcd6c6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7ea71ba86a57e10a313c7633a894f8c53afcd6c6 Author: Arthur Kiyanovski (Fri 25 Apr 2025 18:19:32 BST) Committer: Arthur Kiyanovski (Thu 1 May 2025 19:14:30 BST) ena: Bump driver version to v2.8.1 Changes since 2.8.0: Bug Fixes: * Fix LLQ normal width misconfiguration * Check for errors when detaching children first, not last Minor Changes: * Remove \n from sysctl description Approved by: cperciva (mentor) Sponsored by: Amazon, Inc. Differential Revision: https://reviews.freebsd.org/D50041 (cherry picked from commit 59b30c1a864ee8a22c2e9912301cb88674f714c9) M sys/dev/ena/ena.h ____________________________________________________________________________________________________________ Commit: 162b5bbb4048d0ba99d759616c127ba04c9289c3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=162b5bbb4048d0ba99d759616c127ba04c9289c3 Author: David Arinzon (Tue 22 Apr 2025 11:54:18 BST) Committer: Arthur Kiyanovski (Thu 1 May 2025 19:14:30 BST) ena: Fix misconfiguration when requesting regular LLQ Patch 0a33c047a443 introduced new values to hw.ena.force_large_llq_header. The default value of 2 means no preference, while 0 and 1 act as the previous false and true respectively, which allowed forcefully setting regular or large LLQ. There are 2 ways to force the driver to select regular LLQ: 1. Setting hw.ena.force_large_llq_header = 0 via sysctl. 2. Turning on ena express, which makes the recommendation by the FW to be regular LLQ. When the device supports large LLQ but the driver is forced to regular LLQ, llq_config->llq_ring_entry_size_value is never initialized and since it is a variable allocated on the stack, it stays garbage. Since this variable is involved in calculating max_entries_in_tx_burst, it could cause the maximum burst size to be zero. This causes the driver to ignore the real maximum burst size of the device, leading to driver resets in devices that have a maximum burst size (Nitro v4 and on. see [1] for more information). In case the garbage value is 0, the calculation of max_entries_in_tx_burst divides by 0 and causes kernel panic. The patch modifies the logic to take into account all use-cases and ensure that the relevant fields are properly initialized. [1]: https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html Fixes: 0a33c047a443 ("ena: Support LLQ entry size recommendation from device") Approved by: cperciva (mentor) Sponsored by: Amazon, Inc. Differential Revision: https://reviews.freebsd.org/D50040 (cherry picked from commit 56c45700f2ae15755358f2da8266247613c564df) M sys/dev/ena/ena.c ____________________________________________________________________________________________________________ Commit: 00c8c5e2c35862d61ddb2618d5ecd08db1e9fb89 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=00c8c5e2c35862d61ddb2618d5ecd08db1e9fb89 Author: John Baldwin (Tue 22 Apr 2025 03:08:17 BST) Committer: John Baldwin (Tue 29 Apr 2025 15:46:43 BST) pcib: Clear any pending slot status events during attach Any events left over from boot firmware, etc. are not meaningful so clear pending events during attach. If they are still pending they should remain asserted when the slot status register is re-read. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D49950 (cherry picked from commit ff45e4759a38f44a0199b2948b7b1e987e7c71da) M sys/dev/pci/pci_pci.c ____________________________________________________________________________________________________________ Commit: 37032a39c5e9fcac3100bb7cfce3f2f3d701b5bd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=37032a39c5e9fcac3100bb7cfce3f2f3d701b5bd Author: John Baldwin (Tue 22 Apr 2025 03:08:01 BST) Committer: John Baldwin (Tue 29 Apr 2025 15:46:30 BST) pcib: Ignore power fault detected if a power controller is not present At least some PCI-express bridges exposed by Intel Volume Management Devices report bogus power faults in their slot status register. As a workaround, ignore the power fault detected flag if the slot capability register does not indicate support for a power controller. While the PCI-e spec does not explicitly state that the PFD flag should always be zero if a power controller is not present, parts of the spec do seem to assume this. For example, the flag is included in the "Power Controller Registers" register group in 6.7.2.4, and the definition of the value for this flag seems to presume the presence of a power controller: If a Power Controller that supports power fault detection is implemented, this bit is Set when the Power Controller detects a power fault at this slot. Note that, depending on hardware capability, it is possible that a power fault can be detected at any time, independent of the Power Controller Control setting or the occupancy of the slot. If power fault detection is not supported, this bit must not be Set. PR: 285993 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=285993 ) Reported by: Jim Long Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D49949 (cherry picked from commit 4c8b9f40cda7dd6b2de547b288d712c85998ce11) M sys/dev/pci/pci_pci.c ____________________________________________________________________________________________________________ Commit: eef4e44a41e467416322d0ee8907262e4bb07d49 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eef4e44a41e467416322d0ee8907262e4bb07d49 Author: John Baldwin (Wed 16 Apr 2025 14:41:03 BST) Committer: John Baldwin (Tue 29 Apr 2025 15:45:59 BST) telnet: Prevent buffer overflow in the user prompt for SRA The Secure RPC authenticator for telnet prompts the local user for the username to use for authentication. Previously it was using sprintf() into a buffer of 256 bytes, but the username received over the wire can be up to 255 bytes long which would overflow the prompt buffer. Fix this in two ways: First, use snprintf() and check for overflow. If the prompt buffer overflows, fail authentication without prompting the user. Second, add 10 bytes to the buffer size to account for the overhead of the prompt so that a maximally sized username fits. While here, replace a bare 255 in the subsequent telnet_gets call with an expression using sizeof() the relevant buffer. PR: 270263 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270263 ) Reported by: Robert Morris Tested on: CHERI Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D49832 (cherry picked from commit 5737c2ae06e143e49496df2ab5a64f76d5456012) M contrib/telnet/libtelnet/sra.c ____________________________________________________________________________________________________________ Commit: 2ef9c17d68c491064bd00d68f3d417581128b9f3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2ef9c17d68c491064bd00d68f3d417581128b9f3 Author: Colin Percival (Wed 23 Apr 2025 05:39:56 BST) Committer: Colin Percival (Sat 26 Apr 2025 20:49:35 BST) release: Pass PKG_INSTALL_EPOCH (take 2) We need to pass this to cloudware builds, not just VM builds. MFC after: 4 days Fixes: 81ca663642ef ("release: Pass PKG_INSTALL_EPOCH to vmimage.subr") Sponsored by: Amazon (cherry picked from commit d14036ea424d5aa3eee20cc6f0b5d7117cc3931b) M release/Makefile.vm ____________________________________________________________________________________________________________ Commit: d434f9f58d88ff5157387610b23ae6d7d58ef630 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d434f9f58d88ff5157387610b23ae6d7d58ef630 Author: Colin Percival (Thu 10 Apr 2025 07:05:55 BST) Committer: Colin Percival (Sat 26 Apr 2025 20:49:09 BST) release: Pass PKG_INSTALL_EPOCH to vmimage.subr This value, if not already set, comes from the timestamp of the most recent git commit (which is now also available in src/release code as GITEPOCH) or 0 if git is not installed. This should allow /var/db/pkg/local.sqlite to be reproducible in VM images which have packages installed (e.g. cloudware). Reviewed by: emaste, bapt MFC after: 5 days Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D49760 (cherry picked from commit 81ca663642ef1ed5111a88d2e9102f6788fab407) M release/Makefile.inc1 M release/Makefile.vm ____________________________________________________________________________________________________________ Commit: 061ce1c392f0223c6ff6578c9649e79da89f9796 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=061ce1c392f0223c6ff6578c9649e79da89f9796 Author: Dimitry Andric (Tue 22 Apr 2025 19:26:56 BST) Committer: Dimitry Andric (Sat 26 Apr 2025 12:31:20 BST) Move extra suffix-transformation rules into bsd.suffixes-extra.mk To make it possible to use the .SUFFIXES list and suffix-transformation rules from bsd.lib.mk in other places, move them to a separate file, bsd.suffixes-extra.mk. Note that we cannot add the list and rules to bsd.suffixes.mk, since that file also gets included by sys.mk, which applies to non-source builds. That would require a whole ports exp-run. No functional change intended. Reviewed by: brooks, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49965 (cherry picked from commit 9c4f1497dae7832e2727682e9161ca9572e56dfe) M share/mk/Makefile M share/mk/bsd.lib.mk A share/mk/bsd.suffixes-extra.mk ____________________________________________________________________________________________________________ Commit: b03ee8687e940dd74b73ac91623e36709c700356 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b03ee8687e940dd74b73ac91623e36709c700356 Author: Dimitry Andric (Sat 19 Apr 2025 20:27:16 BST) Committer: Dimitry Andric (Sat 26 Apr 2025 12:19:27 BST) libllvm: remove duplicated SRCS_MIN line This is not harmful when making a static library apparently, but will result in duplicate symbol errors when making a dynamic library. MFC after: 3 days (cherry picked from commit 160a2ba804973e4b258c24247fa7c0cdc230dfb4) M lib/clang/libllvm/Makefile ____________________________________________________________________________________________________________ Commit: f7851ff75061e28230e21931af39b23bb82a245d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f7851ff75061e28230e21931af39b23bb82a245d Author: Mark Johnston (Thu 10 Apr 2025 13:41:28 BST) Committer: Mark Johnston (Thu 24 Apr 2025 14:23:38 BST) netinet: Make ip.h self-contained In general we are working towards making public headers self-contained. cdefs.h is included for __packed; just assume that types.h includes cdefs.h as that's a very common assumption. PR: 285924 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=285924 ) Reviewed by: emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49735 (cherry picked from commit 31d3a94bdda4a9ca4c4d7d4e8e8a0ba1b05c7f18) M sys/netinet/ip.h ____________________________________________________________________________________________________________ Commit: 5195ff613fca40653d263bbada8a335ad864612e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5195ff613fca40653d263bbada8a335ad864612e Author: Dimitry Andric (Fri 18 Apr 2025 11:55:36 BST) Committer: Dimitry Andric (Wed 23 Apr 2025 20:37:40 BST) Fix build with WITH_CLANG_BOOTSTRAP and WITHOUT_CLANG When WITH_CLANG_BOOTSTRAP and WITHOUT_CLANG are both set, the cross-tools stage does not build a cross clang binary. This is because the Makefile in usr.bin/clang checks for WITHOUT_CLANG, and skips building the binary. To fix this, ensure that WITH_CLANG is set for the cross-tools phase whenever WITH_CLANG_BOOTSTRAP is set. While here, skip using the Makefile in usr.bin/clang, and directly use the Makefile in usr.bin/clang/clang instead. PR: 286154 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=286154 ) Reported by: avg Reviewed by: avg, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49886 (cherry picked from commit ea231471d024e93279dc2196d6d5d87e199ad55b) M Makefile.inc1 ____________________________________________________________________________________________________________ Commit: c8c624de57b072d14c1ab23167880a069ef51f11 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c8c624de57b072d14c1ab23167880a069ef51f11 Author: Colin Percival (Tue 8 Apr 2025 23:50:01 BST) Committer: Colin Percival (Wed 23 Apr 2025 05:50:55 BST) dhclient: Keep two clocks Until July 2024, dhclient kept track of time as seconds-since-epoch as a time_t. This was a problem because (a) we wanted sub-second timeouts and (b) timeouts didn't always do the right thing if the system clock changed. Switching to using CLOCK_MONOTONIC and struct timespec fixed those issues but introduced a new problem: CLOCK_MONOTONIC values were being intepreted as seconds-since-epoch and written to the dhclient.leases file, causing confusion with DHCP leases expiring in early 1970. Attempt to compromise between these by keeping track of both times; any type within dhclient which is a time_t now refers to seconds past the epoch, while any struct timespec value is a CLOCK_MONOTONIC time. PR: 283256 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283256 ) Reviewed by: dch Fixes: f0a38976b01e ("dhclient: Use clock_gettime() instead of time()") Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D49720 (cherry picked from commit 43d19e6a4c42ade0f276ceca18a09e2e3829fce4) M sbin/dhclient/dhclient.c M sbin/dhclient/dhcpd.h M sbin/dhclient/dispatch.c ____________________________________________________________________________________________________________ Commit: 5b182c68c0f5d7cf65933b75157d9c363f7a9ee5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5b182c68c0f5d7cf65933b75157d9c363f7a9ee5 Author: Kristof Provost (Tue 15 Apr 2025 12:13:50 BST) Committer: Kristof Provost (Mon 21 Apr 2025 22:14:17 BST) pfctl: also remove incorrect counter print for rule anchors Just as for nat anchors we can't print counters for rule anchors. Remove the incorrect print call. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 0fc3c29fb3dd6ab6436a78c502544ebf2cf63ee2) M sbin/pfctl/pfctl.c ____________________________________________________________________________________________________________ Commit: 35a83d58bdbeae4e823710924a7e64fa00e64547 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=35a83d58bdbeae4e823710924a7e64fa00e64547 Author: Kristof Provost (Mon 14 Apr 2025 17:41:00 BST) Committer: Kristof Provost (Mon 21 Apr 2025 22:14:17 BST) pfctl: fix crash on "pfctl -a '*' -vvsr" When printing a nat anchor we don't have rule information, or rule counters. Do not attempt to print them. The information is nonsensical anyway, and this can cause a crash converting the timestamp to a string, as years in the very distant future use more digits, and we exceed the 30 byte buffer allocated for this. MFC after: 2 weeks Sponsored by: Orange Business Services (cherry picked from commit 168d873ae41fd8bd40555322a79c9f215cb4cb9c) M sbin/pfctl/pfctl.c ____________________________________________________________________________________________________________ Commit: 4df4b69530c34122775ce77945002c745f395651 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4df4b69530c34122775ce77945002c745f395651 Author: Kristof Provost (Thu 27 Mar 2025 14:37:59 GMT) Committer: Kristof Provost (Mon 21 Apr 2025 22:14:16 BST) pf: explicitly NULL state key pointers After the pf_state_insert() call we may not use these pointers again. Explicitly NULL them to ensure we don't. Also NULL them out if we free the keys directly. Reviewed by: glebius, markj MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D49553 (cherry picked from commit 592418343348bcf4355c249f53cff89ed90ea1f5) M sys/netpfil/pf/pf.c ____________________________________________________________________________________________________________ Commit: 7161339bb5e9feda4e63c5903314fc17ea1e5319 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7161339bb5e9feda4e63c5903314fc17ea1e5319 Author: Kristof Provost (Thu 27 Mar 2025 14:35:40 GMT) Committer: Kristof Provost (Mon 21 Apr 2025 22:14:16 BST) pf: don't use state keys after pf_state_insert() pf_state_insert() may free the state keys, it's not safe to access these pointers after the call. Introduce osrc/odst (similar to osport/odport) to store the original source and destination addresses. This allows us to undo NAT transformations without having to access the state keys. Reviewed by: glebius, markj MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D49551 (cherry picked from commit bdea9cbcf2decafeb4da5a0280313efccc09e1b3) M sys/net/pfvar.h M sys/netpfil/pf/pf.c ____________________________________________________________________________________________________________ Commit: d6381193a3e8bf4663863510fd8af8396f4fdb07 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d6381193a3e8bf4663863510fd8af8396f4fdb07 Author: Kristof Provost (Thu 27 Mar 2025 14:21:41 GMT) Committer: Kristof Provost (Mon 21 Apr 2025 22:14:16 BST) pf: improve pf_state_key_attach() error handling If we fail to attach the stack key that means we've already attached the wire key. That means the state could be found by other cores, and given that we then free it, be used after free. Fix this by not releasing the ID hashrow lock and key locks until after we've removed the inserted key again, ensuring the state cannot be found by other cores. Reported by: markj Submitted by: glebius Reviewed by: glebius, markj MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D49550 (cherry picked from commit 8efd2acf07bc0e1c3ea1f7390e0f1cfb7cf6f86c) M sys/netpfil/pf/pf.c ____________________________________________________________________________________________________________ Commit: c6cb1b2ee5065ea2eaf725c09b45fd7a249bb4dc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c6cb1b2ee5065ea2eaf725c09b45fd7a249bb4dc Author: Dag-Erling Smørgrav (Tue 15 Apr 2025 18:57:28 BST) Committer: Dag-Erling Smørgrav (Sun 20 Apr 2025 09:00:24 BST) cp: Improve error messages. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D49841 (cherry picked from commit 7622e2d21a22f7af65a7145f91ef34179bb6ee03) M bin/cp/cp.c ____________________________________________________________________________________________________________ Commit: 413e5dca9dc5e0c638f79e0904efbeaf38e6037c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=413e5dca9dc5e0c638f79e0904efbeaf38e6037c Author: Dag-Erling Smørgrav (Thu 10 Apr 2025 12:34:41 BST) Committer: Dag-Erling Smørgrav (Sun 20 Apr 2025 09:00:24 BST) fts: Move private flags away from public ones. Renumber the private flags so there is a sizeable gap between them and the public flags, making it easier to add public flags in the future. These private flags are only ever set or read by FTS itself, so there is no compatibility issue. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49711 (cherry picked from commit 80e06d621ac545ac0a69d4e95e7392be38013a78) M include/fts.h ____________________________________________________________________________________________________________ Commit: cc7bff26328d81268a8fba620670428ea0867d81 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cc7bff26328d81268a8fba620670428ea0867d81 Author: Kyle Evans (Sat 5 Apr 2025 01:47:54 BST) Committer: Kyle Evans (Thu 17 Apr 2025 02:02:43 BST) libc: tests: add some tests for __cxa_atexit handling This adds a basic test that __cxa_atexit works, and also adds some tests for __cxa_atexit handlers registered in the middle of __cxa_finalize. PR: 285870 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=285870 ) (cherry picked from commit ee9ce1078c596f5719f312feedd616ab0fb41dc9) M lib/libc/tests/stdlib/Makefile A lib/libc/tests/stdlib/cxa_atexit_test.c A lib/libc/tests/stdlib/libatexit/Makefile A lib/libc/tests/stdlib/libatexit/libatexit.cc ____________________________________________________________________________________________________________ Commit: 04f7496f89e28057079f3f0b1a02d7d9d874487f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=04f7496f89e28057079f3f0b1a02d7d9d874487f Author: Aurélien Croc de Suray (Sat 5 Apr 2025 01:47:53 BST) Committer: Kyle Evans (Thu 17 Apr 2025 02:02:12 BST) libc: allow __cxa_atexit handlers to be added during __cxa_finalize science/dlib-cpp reveals an interesting scenario that works fine on other platforms but not on FreeBSD; notably, it ends up creating a new global object from some destructor which is called during __cxa_finalize. This breaks when libdlib is dlopen()ed and then subsequently dlclose()ed, as we never end up invoking the created object's dtor until program exit when the shlib is already unmapped. Fix it by noting when we're in the middle of __cxa_finalize for a dso, and then restarting the search if __cxa_atexit() was called in the middle somewhere. We wait until we've processed the initial set before starting over and processing the newly added handlers as if it were a complete set of handlers added during runtime. The alternative is calling them as they're added to maintain a LIFO in terms of total ordering, but in theory a constructor could add another global object that also needs to be destroyed, and that object needs to be destroyed after the one that constructed it to avoid creating unexpected lifetime issues. This manifests in the pdlib PHP extension for dlib crashing, see [0]. [0] https://github.com/goodspb/pdlib/issues/39 PR: 285870 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=285870 ) Reviewed by: kevans (also supplied commit message) (cherry picked from commit 23427c8e1fedb9fc68ad0bd27a59c7ffd2b3008c) M lib/libc/stdlib/atexit.c ____________________________________________________________________________________________________________ Commit: 9edd1e62ca11e2d15bc31db4901da8d2ec44c5d3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9edd1e62ca11e2d15bc31db4901da8d2ec44c5d3 Author: Kristof Provost (Wed 2 Apr 2025 17:04:46 BST) Committer: Kristof Provost (Wed 16 Apr 2025 08:35:42 BST) pfctl: fix recursive printing of NAT rules pfctl_show_nat() is called recursively to print nat anchors. This passes the anchor path, but this path was modified by pfctl_show_nat(), leading to issues printing the anchors. Make a copy of the path ('npath') before we modify it. Ensure we do this correctly by sprinking in 'const', and add a test case to verify that we do now print things correctly. Reported by: Thomas Pasqualini MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 58164dcb55d62ca73b5e550b8344bf61e2d8a47a) M sbin/pfctl/pfctl.c M tests/sys/netpfil/pf/anchor.sh ____________________________________________________________________________________________________________ Commit: c976df712c0f64d43970be7036301ce7cf558a78 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c976df712c0f64d43970be7036301ce7cf558a78 Author: Ed Maste (Wed 9 Apr 2025 15:54:46 BST) Committer: Ed Maste (Mon 14 Apr 2025 20:25:13 BST) OpenSSH: Fix logic error in DisableForwarding option This option was documented as disabling X11 and agent forwarding but it failed to do so. Spotted by Tim Rice. Obtained from: OpenBSD d31ec64016fc Sponsored by: The FreeBSD Foundation (cherry picked from commit 3620d70511dc8bf45752028dac0af6f157ec6146) (cherry picked from commit fcda475ccfcabe6f70e6ef25ccd507ac4b92c1ee) M crypto/openssh/session.c ____________________________________________________________________________________________________________ Commit: 92c6cc8ee3a16f1a6f4dc339dbfa7aaf8f153fc2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=92c6cc8ee3a16f1a6f4dc339dbfa7aaf8f153fc2 Author: Eugene Grosbein (Tue 25 Feb 2025 07:18:29 GMT) Committer: Eugene Grosbein (Sat 12 Apr 2025 23:04:43 BST) netgraph: MFC: prevent panic with INVARIANTS-enabled kernel This change makes NG_ABI_VERSION depend on INVARIANTS in addition to NETGRAPH_DEBUG. PR: 257876 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257876 ) (cherry picked from commit 93b4a54456589e78dcd37f2db8333baff3f3f0b2) M sys/netgraph/netgraph.h ____________________________________________________________________________________________________________ Commit: 64f5a71c1cb79c09e50a37ddbe958224bb64add4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=64f5a71c1cb79c09e50a37ddbe958224bb64add4 Author: Dag-Erling Smørgrav (Tue 1 Apr 2025 14:56:52 BST) Committer: Dag-Erling Smørgrav (Tue 8 Apr 2025 11:19:41 BST) fts: Stop abusing the comma operator. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D49624 (cherry picked from commit 5abef29833d32d257a20b61732993987dd2a6056) M lib/libc/gen/fts.c ____________________________________________________________________________________________________________ Commit: 5630672e6f6d58597a3d6f01928a7703f1cdd207 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5630672e6f6d58597a3d6f01928a7703f1cdd207 Author: Philip Paeps (Mon 7 Apr 2025 04:36:45 BST) Committer: Philip Paeps (Mon 7 Apr 2025 04:40:56 BST) lib/libexpat: update build config for 2.7.1 Forgotten in fe9278888fd4414abe2d922e469cf608005f4c65. Point hat to: philip (cherry picked from commit 00c8538e87c61f1fd57ccd9e02a6d435b68d9a73) M lib/libexpat/expat_config.h ____________________________________________________________________________________________________________ Commit: adc9e9e8dbddcf7d57bcdef0d9d0a0e7c08c15ba URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=adc9e9e8dbddcf7d57bcdef0d9d0a0e7c08c15ba Author: Philip Paeps (Mon 7 Apr 2025 03:35:19 BST) Committer: Philip Paeps (Mon 7 Apr 2025 03:39:30 BST) lib/libexpat: bump libbsdxml.3 after 2.7.1 import Forgotten in fe9278888fd4414abe2d922e469cf608005f4c65. Pointy hat to: philip (cherry picked from commit 03a1992591b0ae85b6b250255fe56e17f6d919c6) M lib/libexpat/libbsdxml.3 ____________________________________________________________________________________________________________ Commit: a8431b47adae8f8b731206dc38d82b2245ad245e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a8431b47adae8f8b731206dc38d82b2245ad245e Author: Norbert Ciosek (Sat 29 Mar 2025 00:02:37 GMT) Committer: Kevin Bowling (Sat 5 Apr 2025 04:44:37 BST) ixgbe: fix mailbox ack handling Check if CTS bit is set in the mailbox message before waiting for ACK. Otherwise ACK will never be received causing the function to timeout. Add a note for ixgbe_write_mbx that it should be called while holding a lock. Fixes: 6d243d2 ("net/ixgbe/base: introduce new mailbox API") Cc: stable@dpdk.org Signed-off-by: Norbert Ciosek Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson Obtained from: DPDK (1f119e4) (cherry picked from commit 1580f8d9c1740e0c54554e6c185573d34f2dcf76) M sys/dev/ixgbe/ixgbe_mbx.c ____________________________________________________________________________________________________________ Commit: 41b768ae1970ed484abaaea401453c3902df93c2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=41b768ae1970ed484abaaea401453c3902df93c2 Author: Philip Paeps (Wed 2 Apr 2025 09:56:02 BST) Committer: Philip Paeps (Sat 5 Apr 2025 04:19:08 BST) contrib/expat: import expat 2.7.1 Changes: https://github.com/libexpat/libexpat/blob/R_2_7_1/expat/Changes https://github.com/libexpat/libexpat/blob/R_2_7_0/expat/Changes Security: CVE-2024-8176 (cherry picked from commit fe9278888fd4414abe2d922e469cf608005f4c65) M contrib/expat/COPYING M contrib/expat/Changes M contrib/expat/Makefile.am M contrib/expat/Makefile.in M contrib/expat/README.md M contrib/expat/configure.ac M contrib/expat/doc/reference.html M contrib/expat/doc/xmlwf.1 M contrib/expat/doc/xmlwf.xml A contrib/expat/fuzz/xml_lpm_fuzzer.cpp A contrib/expat/fuzz/xml_lpm_fuzzer.proto M contrib/expat/fuzz/xml_parse_fuzzer.c M contrib/expat/fuzz/xml_parsebuffer_fuzzer.c M contrib/expat/lib/expat.h M contrib/expat/lib/internal.h M contrib/expat/lib/xmlparse.c M contrib/expat/tests/acc_tests.c M contrib/expat/tests/alloc_tests.c M contrib/expat/tests/basic_tests.c M contrib/expat/tests/benchmark/benchmark.c M contrib/expat/tests/common.c M contrib/expat/tests/common.h M contrib/expat/tests/handlers.c M contrib/expat/tests/handlers.h M contrib/expat/tests/minicheck.h M contrib/expat/tests/misc_tests.c M contrib/expat/tests/xmltest.sh M contrib/expat/xmlwf/readfilemap.c ____________________________________________________________________________________________________________ Commit: 5ae5f71d505ccddc7de235d3f9e3d9bdb03dd454 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5ae5f71d505ccddc7de235d3f9e3d9bdb03dd454 Author: Eric Joyner (Wed 26 Feb 2025 17:19:38 GMT) Committer: Eric Joyner (Thu 3 Apr 2025 21:00:25 BST) igc(4): Fix attach for I226-K and LMVP devices Summary: The device IDs for these were in the driver's list of PCI ids to attach to, but igc_set_mac_type() had never been setup to set the correct mac type for these devices. Fix this by adding these IDs to the switch block in order for them to be recognized by the driver instead of returning an error. This fixes the igc(4) attach for the I226-K LOM on the ASRock Z790 PG-ITX/TB4 motherboard, allowing it to be recognized and used. Signed-off-by: Eric Joyner Reviewed by: kbowling@ Relnotes: yes Differential Revision: https://reviews.freebsd.org/D49147 (cherry picked from commit 7ee310c80ea7b336972f53cc48b8c3d03029941e) M sys/dev/igc/igc_api.c ____________________________________________________________________________________________________________ Commit: 42aa0d02c281d790c77ce18789ccab20e9274260 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=42aa0d02c281d790c77ce18789ccab20e9274260 Author: Kristof Provost (Thu 20 Mar 2025 01:27:52 GMT) Committer: Kristof Provost (Thu 3 Apr 2025 06:58:58 BST) pf tests: test table information export via snmp_pf Event: Tokyo Hackathon 202503 (cherry picked from commit 36586800803d24f1137d861bbaf487a6bde16a09) M tests/sys/netpfil/pf/snmp.sh ____________________________________________________________________________________________________________ Commit: ca1bf31177d2cdf7618f63f2317558fa089af54e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ca1bf31177d2cdf7618f63f2317558fa089af54e Author: Kristof Provost (Wed 19 Mar 2025 06:42:42 GMT) Committer: Kristof Provost (Thu 3 Apr 2025 06:58:48 BST) pf tests: add a basic snmp_pf test case Event: Tokyo Hackathon 202503 (cherry picked from commit c849f533326026501c28cb2c344b16723862551a) M tests/sys/netpfil/pf/Makefile A tests/sys/netpfil/pf/bsnmpd.conf A tests/sys/netpfil/pf/snmp.sh ____________________________________________________________________________________________________________ Commit: 861b8faca9e3644cc88e391e852bf034e5cfc298 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=861b8faca9e3644cc88e391e852bf034e5cfc298 Author: Kristof Provost (Wed 19 Mar 2025 06:08:55 GMT) Committer: Kristof Provost (Thu 3 Apr 2025 06:57:30 BST) snmp_pf: fix pfInterfacesIfRefsState pfInterfacesIfRefsState was described as 'Null', which upset bsnmpwalk's attempt to resolve OIDs to symbolic names: > bsnmpwalk: Error adding leaf pfInterfacesIfRefsState to list This was done back in d6d3f01e0a339, because we don't return this value any more. Return it to 'Unsigned32', which fixes things, even if we still don't actually return this value. While here update the ORGANIZATION to reflect current ownership. Reviewed by: philip MFC after: 2 weeks Event: Tokyo Hackathon 202503 Differential Revision: https://reviews.freebsd.org/D49413 (cherry picked from commit 712309a64512c7e4ebf0e10de8a5c59d5a185ae8) M usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt M usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def ____________________________________________________________________________________________________________ Commit: f8cd0c8e20b0be367c9508770a92ea7649f5da4b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f8cd0c8e20b0be367c9508770a92ea7649f5da4b Author: Andrey V. Elsukov (Tue 25 Mar 2025 07:23:40 GMT) Committer: Andrey V. Elsukov (Wed 2 Apr 2025 08:54:12 BST) tests: fix test for NULL encription After 04207850a9b9 it is required that key length is not zero. Add some key to avoid error. Reported by: markj (cherry picked from commit b6708045590712930c533e916e3d6fdfe48ec5ba) M tests/sys/netipsec/tunnel/empty.sh ____________________________________________________________________________________________________________ Commit: 4b98fe9def2d182c45bc86fc6716c47e957902c3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4b98fe9def2d182c45bc86fc6716c47e957902c3 Author: Enji Cooper (Fri 18 Aug 2023 12:28:13 BST) Committer: Enji Cooper (Tue 1 Apr 2025 06:30:20 BST) Fix GoogleTest 1.14.0 import - Prune headers and tests no longer installed after the upgrade. - Remove GoogleTest-related files when MK_GOOGLETEST == no. - Disable `-Werror` with gcc to unbreak the gcc12 CI run with `lib/googletest`. Any issues found by g++ will be filed upstream and hopefully resolved in a future version. - Remove clang -Werror issues which are resolved in version 1.14.0 to avoid masking valid issues. Conflicts: ObsoleteFiles.inc tools/build/mk/OptionalObsoleteFiles.inc MFC after: 1 week MFC with: 28f6c2f292806bf31230a959bc4b19d7081669a7 (cherry picked from commit 0c785f06020f3b02e34c97eb27fecd3af8eb2a7b) M ObsoleteFiles.inc M lib/googletest/tests/gmock_main/Makefile M lib/googletest/tests/gtest/Makefile M lib/googletest/tests/gtest_main/Makefile M share/mk/googletest.test.inc.mk M tools/build/mk/OptionalObsoleteFiles.inc ____________________________________________________________________________________________________________ Commit: b84a505d2eaea45a873f7a9778e73443ad0c65bb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b84a505d2eaea45a873f7a9778e73443ad0c65bb Author: Mark Johnston (Wed 23 Aug 2023 20:43:33 BST) Committer: Enji Cooper (Tue 1 Apr 2025 03:39:18 BST) m4 tests: Update tests after $FreeBSD$ removal Fixes: d54a7d337331 ("Remove $FreeBSD$: one-line m4 tag") (cherry picked from commit d5b5497e10fd11dfea350d229406fa63fd0ea70f) M usr.bin/m4/tests/regress.gnusofterror.out M usr.bin/m4/tests/regress.quotes.out ____________________________________________________________________________________________________________ Commit: ebd127c3e36c1f02a7a9b2d63621040e7d1a00d4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ebd127c3e36c1f02a7a9b2d63621040e7d1a00d4 Author: Xin LI (Mon 9 Oct 2023 07:06:20 BST) Committer: Enji Cooper (Mon 31 Mar 2025 22:34:46 BST) file: Support testing multiple magic files. This is based on upstream b74150490be904801378b2712fe0d532e1700124 but adapted to ATF. Reviewed by: jlduran@gmail.com, markj, vangyzen Differential Revision: https://reviews.freebsd.org/D42129 (cherry picked from commit 8f75390c66bdcde95e1b383aecaa27b4adf88279) M usr.bin/file/tests/Makefile M usr.bin/file/tests/file_test.sh ____________________________________________________________________________________________________________ Commit: 18c4022e9fdc6d7f4f5da713de0e9d34d170536e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=18c4022e9fdc6d7f4f5da713de0e9d34d170536e Author: Mark Johnston (Sat 7 Sep 2024 20:39:49 BST) Committer: Enji Cooper (Mon 31 Mar 2025 22:30:41 BST) netbsd-tests: Update a test case to chase grep symlink handling changes This test case verifies that grep detects symlink loops when traversing a directory hierarchy. Fixes: fc12c191c087 ("grep: Default to -p instead of -S.") Reviewed by: ngie, jhb Reported by: Jenkins MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46544 (cherry picked from commit a700bef1e4ee3e6f4e1a86a374bf9b4044f69a70) M contrib/netbsd-tests/usr.bin/grep/t_grep.sh ____________________________________________________________________________________________________________ Commit: 910535a82a29d71eb3951b2368aef358a207f18d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=910535a82a29d71eb3951b2368aef358a207f18d Author: Mark Johnston (Mon 17 Mar 2025 19:12:58 GMT) Committer: Dag-Erling Smørgrav (Mon 31 Mar 2025 19:36:01 BST) uma: Avoid excessive per-CPU draining After commit 389a3fa693ef, uma_reclaim_domain(UMA_RECLAIM_DRAIN_CPU) calls uma_zone_reclaim_domain(UMA_RECLAIM_DRAIN_CPU) twice on each zone in addition to globally draining per-CPU caches. This was unintended and is unnecessarily slow; in particular, draining per-CPU caches requires binding to each CPU. Stop draining per-CPU caches when visiting each zone, just do it once in pcpu_cache_drain_safe() to minimize the amount of expensive sched_bind() calls. Fixes: 389a3fa693ef ("uma: Add UMA_ZONE_UNMANAGED") MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: gallatin, kib Differential Revision: https://reviews.freebsd.org/D49349 (cherry picked from commit f506d5af50fccc37f5aa9fe090e9a0d5f05506c8) M sys/vm/uma_core.c ____________________________________________________________________________________________________________ Commit: 227c1270719f1add47b70d13b3a8cbf3cb188e13 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=227c1270719f1add47b70d13b3a8cbf3cb188e13 Author: Dag-Erling Smørgrav (Thu 6 Mar 2025 13:43:44 GMT) Committer: Dag-Erling Smørgrav (Mon 31 Mar 2025 19:36:01 BST) top: Make locale issues non-fatal. If the `setlocale()` call fails, emit a warning and sleep briefly so the user has a chance to see the warning before we redraw the screen. Note that we have no way of knowing exactly what is wrong, but at least we can suggest that they check their environment. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D49230 (cherry picked from commit 180065eb09e699820a1e1c45d3d00156e0effe29) M usr.bin/top/top.c ____________________________________________________________________________________________________________ Commit: c15ed41118c9174160a1a854355320558b48928d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c15ed41118c9174160a1a854355320558b48928d Author: Enji Cooper (Sat 27 May 2023 02:02:34 BST) Committer: Enji Cooper (Wed 26 Mar 2025 21:36:43 GMT) dumpon: provide diag info when `PEM_read_RSA_PUBKEY` fails This change modifies dumpon to print out the last error from OpenSSL when `PEM_read_RSA_PUBKEY` fails. This allows end-users to diagnose why reading in RSA pubkey files fails so they can adjust the usage to meet the needs of the command. MFC after: 1 week (cherry picked from commit 52b63df9b6dfc157fb0b9f61a770b64e3663dee9) M sbin/dumpon/dumpon.c ____________________________________________________________________________________________________________ Commit: 30cfebf2f089466f9ee2c5fa25b0d47f868e3539 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=30cfebf2f089466f9ee2c5fa25b0d47f868e3539 Author: Enji Cooper (Wed 29 Jan 2025 21:24:53 GMT) Committer: Enji Cooper (Wed 26 Mar 2025 21:26:50 GMT) mca_log: add missing breaks when handling thresholds Per the "Intel® 64 and IA-32 Architectures Software Developer’s Manual Combined Volumes: Vol. 3B 17-7", the Green and Yellow threshold indicators are mutually exclusive. Add the missing `break` statements so they're treated that way. MFC after: 1 week Reported by: Coverity Differential Revision: https://reviews.freebsd.org/D48722 (cherry picked from commit 36d7d2044b934103ad9254cd03ea61245c16ccda) M sys/x86/x86/mca.c ____________________________________________________________________________________________________________ Commit: d5425ed751aa89c8bedaf7a84c3cae2bfd195247 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d5425ed751aa89c8bedaf7a84c3cae2bfd195247 Author: Enji Cooper (Thu 25 May 2023 05:54:02 BST) Committer: Enji Cooper (Wed 26 Mar 2025 21:26:13 GMT) mptutil: document that disabled/enabled are also supported This change officially documents the fact that the `volume cache enabled` and `volume cache disabled` are also supported. While here, remove an unnecessary newline at the end of a warn*(3) call. warn*(3) adds a newline automatically. MFC after: 1 week (cherry picked from commit 9a49a3792940497ddf4657f6e5be56d8ef881edc) M usr.sbin/mptutil/mpt_volume.c M usr.sbin/mptutil/mptutil.8 ____________________________________________________________________________________________________________ Commit: b99e7c46884a5e9c750746f831697cc4fc8fe81b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b99e7c46884a5e9c750746f831697cc4fc8fe81b Author: Enji Cooper (Sat 28 Oct 2023 02:56:41 BST) Committer: Enji Cooper (Wed 26 Mar 2025 21:18:00 GMT) lib/libcrypt: another trivial style change Normalize on hard tabs. I didn't catch this before pushing the previous commit. No functional changes intended. MFC after: 2 weeks MFC with: 8ef8da882ff475e3da3bde57d97593a68f7d97b2 (cherry picked from commit 61b15e6dfc963a0c67dbaeae7f4590674976111f) M lib/libcrypt/crypt-nthash.c ____________________________________________________________________________________________________________ Commit: 62e7a3c6cd67568d16f0ac3c5667b42e4260d29f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=62e7a3c6cd67568d16f0ac3c5667b42e4260d29f Author: Enji Cooper (Sat 28 Oct 2023 02:10:39 BST) Committer: Enji Cooper (Wed 26 Mar 2025 21:16:38 GMT) lib/libcrypt: remove trailing whitespace No functional change intended. MFC after: 2 weeks (cherry picked from commit 8ef8da882ff475e3da3bde57d97593a68f7d97b2) M lib/libcrypt/crypt-nthash.c ____________________________________________________________________________________________________________ Commit: f7d46b858a54cdaf648ff532025b2fd4e34e59a5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f7d46b858a54cdaf648ff532025b2fd4e34e59a5 Author: Enji Cooper (Tue 4 Jun 2024 21:01:55 BST) Committer: Enji Cooper (Wed 26 Mar 2025 21:15:25 GMT) radlib: fix a memory leak in `is_valid_request` Call `HMAC_CTX_free` if returning early from `is_valid_request` when processing `Message-Authenticator` tags. Reported by: Coverity MFC after: 1 week Fixes: 8d5c7813061d ("libradius: Fix input validation bugs") Differential Revision: https://reviews.freebsd.org/D45488 (cherry picked from commit 77c04f3eb12a560eb61252c817e4147bc0178e43) M lib/libradius/radlib.c ____________________________________________________________________________________________________________ Commit: f50d338974f27fcf075ec041c68753ffd4366c80 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f50d338974f27fcf075ec041c68753ffd4366c80 Author: Enji Cooper (Mon 2 Dec 2024 04:39:52 GMT) Committer: Enji Cooper (Wed 26 Mar 2025 21:10:48 GMT) lib/libsbuf/tests: reformat with `clang-format` This change is being done first so any functional changes from the tests will be clearer to reviewers. No functional change intended. MFC after: 2 weeks Ref: https://reviews.freebsd.org/D47826 (cherry picked from commit 991bd461625a2c521d5be4fd6938deed57f60972) M lib/libsbuf/tests/sbuf_core_test.c M lib/libsbuf/tests/sbuf_stdio_test.c M lib/libsbuf/tests/sbuf_string_test.c ____________________________________________________________________________________________________________ Commit: a5403c1f7d57112e12c3966761dbc481e9c415e1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a5403c1f7d57112e12c3966761dbc481e9c415e1 Author: Enji Cooper (Sun 20 Oct 2024 02:51:18 BST) Committer: Enji Cooper (Wed 26 Mar 2025 20:00:35 GMT) contrib/googletest: update from 1.14.0 to 1.15.2 The changes between the two versions can be found in this diff of the two release tags: https://github.com/google/googletest/compare/v1.14.0...v1.15.2 One notable change is that GoogleTest 1.15.x now officially requires C++-14 (1.14.x required C++-11). MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47197 Merge commit '14f7077fed7d82046bdcbe347004132f08aba886' (cherry picked from commit 5ca8c28cd8c725b81781201cfdb5f9969396f934) (cherry picked from commit 1d67cec525421c568199a0524357c35d35e3f6e2) M contrib/googletest/BUILD.bazel M contrib/googletest/CMakeLists.txt M contrib/googletest/CONTRIBUTING.md M contrib/googletest/CONTRIBUTORS A contrib/googletest/MODULE.bazel M contrib/googletest/README.md M contrib/googletest/WORKSPACE A contrib/googletest/WORKSPACE.bzlmod M contrib/googletest/ci/linux-presubmit.sh M contrib/googletest/ci/macos-presubmit.sh M contrib/googletest/ci/windows-presubmit.bat M contrib/googletest/docs/advanced.md M contrib/googletest/docs/faq.md M contrib/googletest/docs/gmock_cook_book.md M contrib/googletest/docs/gmock_for_dummies.md M contrib/googletest/docs/primer.md M contrib/googletest/docs/reference/assertions.md M contrib/googletest/docs/reference/mocking.md M contrib/googletest/docs/reference/testing.md A contrib/googletest/fake_fuchsia_sdk.bzl M contrib/googletest/googlemock/CMakeLists.txt M contrib/googletest/googlemock/README.md M contrib/googletest/googlemock/include/gmock/gmock-actions.h M contrib/googletest/googlemock/include/gmock/gmock-function-mocker.h M contrib/googletest/googlemock/include/gmock/gmock-matchers.h M contrib/googletest/googlemock/include/gmock/gmock-more-actions.h M contrib/googletest/googlemock/include/gmock/gmock.h M contrib/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h M contrib/googletest/googlemock/include/gmock/internal/gmock-port.h M contrib/googletest/googlemock/src/gmock-internal-utils.cc M contrib/googletest/googlemock/src/gmock-matchers.cc M contrib/googletest/googlemock/src/gmock-spec-builders.cc M contrib/googletest/googlemock/test/gmock-matchers-comparisons_test.cc M contrib/googletest/googlemock/test/gmock-matchers-containers_test.cc M contrib/googletest/googlemock/test/gmock-more-actions_test.cc M contrib/googletest/googlemock/test/gmock-spec-builders_test.cc M contrib/googletest/googlemock/test/gmock_link_test.h M contrib/googletest/googletest/CMakeLists.txt M contrib/googletest/googletest/README.md M contrib/googletest/googletest/cmake/Config.cmake.in M contrib/googletest/googletest/cmake/internal_utils.cmake M contrib/googletest/googletest/include/gtest/gtest-assertion-result.h M contrib/googletest/googletest/include/gtest/gtest-death-test.h M contrib/googletest/googletest/include/gtest/gtest-message.h M contrib/googletest/googletest/include/gtest/gtest-param-test.h M contrib/googletest/googletest/include/gtest/gtest-printers.h M contrib/googletest/googletest/include/gtest/gtest-typed-test.h M contrib/googletest/googletest/include/gtest/gtest.h M contrib/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h M contrib/googletest/googletest/include/gtest/internal/gtest-filepath.h M contrib/googletest/googletest/include/gtest/internal/gtest-internal.h M contrib/googletest/googletest/include/gtest/internal/gtest-param-util.h M contrib/googletest/googletest/include/gtest/internal/gtest-port-arch.h M contrib/googletest/googletest/include/gtest/internal/gtest-port.h M contrib/googletest/googletest/include/gtest/internal/gtest-type-util.h M contrib/googletest/googletest/src/gtest-death-test.cc M contrib/googletest/googletest/src/gtest-filepath.cc M contrib/googletest/googletest/src/gtest-internal-inl.h M contrib/googletest/googletest/src/gtest-port.cc M contrib/googletest/googletest/src/gtest.cc M contrib/googletest/googletest/test/googletest-color-test.py M contrib/googletest/googletest/test/googletest-death-test-test.cc M contrib/googletest/googletest/test/googletest-json-output-unittest.py M contrib/googletest/googletest/test/googletest-options-test.cc M contrib/googletest/googletest/test/googletest-output-test-golden-lin.txt M contrib/googletest/googletest/test/googletest-port-test.cc M contrib/googletest/googletest/test/googletest-printers-test.cc M contrib/googletest/googletest/test/gtest_environment_test.cc M contrib/googletest/googletest/test/gtest_help_test.py M contrib/googletest/googletest/test/gtest_json_test_utils.py M contrib/googletest/googletest/test/gtest_repeat_test.cc M contrib/googletest/googletest/test/gtest_unittest.cc M contrib/googletest/googletest/test/gtest_xml_output_unittest.py M contrib/googletest/googletest_deps.bzl ____________________________________________________________________________________________________________ Commit: eb331308b0d59eeb00b40a25580d4091dd9cc07e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eb331308b0d59eeb00b40a25580d4091dd9cc07e Author: Enji Cooper (Sat 19 Oct 2024 16:34:07 BST) Committer: Enji Cooper (Wed 26 Mar 2025 19:34:05 GMT) tests/sys/fs/fusefs: include iomanip header io.cc relies on `std::setw(..)`, which is exported by the iomanip C++ header. Newer versions of GoogleTest don't export this header, so add the explicit include. This unbreaks the build with GoogleTest 1.15.2. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47194 (cherry picked from commit 0077477f215c851fe15c9ea12cfb005125c4238a) M tests/sys/fs/fusefs/io.cc ____________________________________________________________________________________________________________ Commit: 687096cf1e2a8d1cf2ba983452d6a566acb47d95 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=687096cf1e2a8d1cf2ba983452d6a566acb47d95 Author: Enji Cooper (Tue 8 Aug 2023 07:17:32 BST) Committer: Enji Cooper (Wed 26 Mar 2025 16:41:31 GMT) Import GoogleTest 1.14.0 GoogleTest 1.14.0 now requires C++14 to build. Change `googletest.test.inc.mk` to reflect this requirement. Adjust the build integration logic to handle the new version of GoogleTest (add/remove headers/sources as needed). Tighten down warnings via `CXXFLAGS.clang` instead of ignoring all warnings. Some new warnings snuck in after I did my last round of fix submissions upstream. Also address some overlinking added in the previous version import by removing superfluous libraries. =============================== Expect WhenDynamicCastToTest.AmbiguousCast to fail This change reapplies the expected failure from 1.10.0. Ref: https://github.com/google/googletest/issues/2172 MFC after: 2 weeks Reviewed by: asomers, emaste Differential Revision: https://reviews.freebsd.org/D41399 Merge commit '8ef491440fcaec96f899d73e08873426c78583a4' into googletest-v1.14.0-import (cherry picked from commit 28f6c2f292806bf31230a959bc4b19d7081669a7) A contrib/googletest/.clang-format A contrib/googletest/.github/ISSUE_TEMPLATE/00-bug_report.yml A contrib/googletest/.github/ISSUE_TEMPLATE/10-feature_request.yml A contrib/googletest/.github/ISSUE_TEMPLATE/config.yml A contrib/googletest/.github/workflows/gtest-ci.yml M contrib/googletest/.gitignore M contrib/googletest/BUILD.bazel M contrib/googletest/CMakeLists.txt M contrib/googletest/CONTRIBUTING.md R060 contrib/googletest/googletest/CONTRIBUTORS contrib/googletest/CONTRIBUTORS D contrib/googletest/Makefile.am M contrib/googletest/README.md M contrib/googletest/WORKSPACE D contrib/googletest/appveyor.yml D contrib/googletest/ci/build-linux-bazel.sh D contrib/googletest/ci/env-linux.sh D contrib/googletest/ci/env-osx.sh D contrib/googletest/ci/get-nprocessors.sh D contrib/googletest/ci/install-linux.sh D contrib/googletest/ci/install-osx.sh A contrib/googletest/ci/linux-presubmit.sh R056 contrib/googletest/googletest/xcode/Scripts/runtests.sh contrib/googletest/ci/macos-presubmit.sh D contrib/googletest/ci/travis.sh A contrib/googletest/ci/windows-presubmit.bat D contrib/googletest/configure.ac A contrib/googletest/docs/_config.yml A contrib/googletest/docs/_data/navigation.yml A contrib/googletest/docs/_layouts/default.html A contrib/googletest/docs/_sass/main.scss R056 contrib/googletest/googletest/docs/advanced.md contrib/googletest/docs/advanced.md A contrib/googletest/docs/assets/css/style.scss A contrib/googletest/docs/community_created_documentation.md R066 contrib/googletest/googletest/docs/faq.md contrib/googletest/docs/faq.md A contrib/googletest/docs/gmock_cheat_sheet.md A contrib/googletest/docs/gmock_cook_book.md A contrib/googletest/docs/gmock_faq.md A contrib/googletest/docs/gmock_for_dummies.md A contrib/googletest/docs/index.md A contrib/googletest/docs/pkgconfig.md A contrib/googletest/docs/platforms.md A contrib/googletest/docs/primer.md A contrib/googletest/docs/quickstart-bazel.md A contrib/googletest/docs/quickstart-cmake.md A contrib/googletest/docs/reference/actions.md A contrib/googletest/docs/reference/assertions.md A contrib/googletest/docs/reference/matchers.md A contrib/googletest/docs/reference/mocking.md A contrib/googletest/docs/reference/testing.md R085 contrib/googletest/googletest/docs/samples.md contrib/googletest/docs/samples.md D contrib/googletest/googlemock/CHANGES M contrib/googletest/googlemock/CMakeLists.txt D contrib/googletest/googlemock/CONTRIBUTORS D contrib/googletest/googlemock/LICENSE D contrib/googletest/googlemock/Makefile.am M contrib/googletest/googlemock/README.md D contrib/googletest/googlemock/build-aux/.keep M contrib/googletest/googlemock/cmake/gmock.pc.in M contrib/googletest/googlemock/cmake/gmock_main.pc.in D contrib/googletest/googlemock/configure.ac D contrib/googletest/googlemock/docs/CheatSheet.md D contrib/googletest/googlemock/docs/CookBook.md D contrib/googletest/googlemock/docs/DesignDoc.md D contrib/googletest/googlemock/docs/Documentation.md D contrib/googletest/googlemock/docs/ForDummies.md D contrib/googletest/googlemock/docs/FrequentlyAskedQuestions.md D contrib/googletest/googlemock/docs/KnownIssues.md A contrib/googletest/googlemock/docs/README.md M contrib/googletest/googlemock/include/gmock/gmock-actions.h M contrib/googletest/googlemock/include/gmock/gmock-cardinalities.h A contrib/googletest/googlemock/include/gmock/gmock-function-mocker.h D contrib/googletest/googlemock/include/gmock/gmock-generated-actions.h D contrib/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump D contrib/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h D contrib/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump D contrib/googletest/googlemock/include/gmock/gmock-generated-matchers.h D contrib/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump D contrib/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h D contrib/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump M contrib/googletest/googlemock/include/gmock/gmock-matchers.h M contrib/googletest/googlemock/include/gmock/gmock-more-actions.h M contrib/googletest/googlemock/include/gmock/gmock-more-matchers.h A contrib/googletest/googlemock/include/gmock/gmock-nice-strict.h M contrib/googletest/googlemock/include/gmock/gmock-spec-builders.h M contrib/googletest/googlemock/include/gmock/gmock.h M contrib/googletest/googlemock/include/gmock/internal/custom/README.md M contrib/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h D contrib/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump M contrib/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h M contrib/googletest/googlemock/include/gmock/internal/custom/gmock-port.h D contrib/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h D contrib/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump M contrib/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h M contrib/googletest/googlemock/include/gmock/internal/gmock-port.h A contrib/googletest/googlemock/include/gmock/internal/gmock-pp.h D contrib/googletest/googlemock/make/Makefile D contrib/googletest/googlemock/msvc/2005/gmock.sln D contrib/googletest/googlemock/msvc/2005/gmock.vcproj D contrib/googletest/googlemock/msvc/2005/gmock_config.vsprops D contrib/googletest/googlemock/msvc/2005/gmock_main.vcproj D contrib/googletest/googlemock/msvc/2005/gmock_test.vcproj D contrib/googletest/googlemock/msvc/2010/gmock.sln D contrib/googletest/googlemock/msvc/2010/gmock.vcxproj D contrib/googletest/googlemock/msvc/2010/gmock_config.props D contrib/googletest/googlemock/msvc/2010/gmock_main.vcxproj D contrib/googletest/googlemock/msvc/2010/gmock_test.vcxproj D contrib/googletest/googlemock/msvc/2015/gmock.sln D contrib/googletest/googlemock/msvc/2015/gmock.vcxproj D contrib/googletest/googlemock/msvc/2015/gmock_config.props D contrib/googletest/googlemock/msvc/2015/gmock_main.vcxproj D contrib/googletest/googlemock/msvc/2015/gmock_test.vcxproj D contrib/googletest/googlemock/scripts/fuse_gmock_files.py D contrib/googletest/googlemock/scripts/generator/LICENSE D contrib/googletest/googlemock/scripts/generator/README D contrib/googletest/googlemock/scripts/generator/README.cppclean D contrib/googletest/googlemock/scripts/generator/cpp/__init__.py D contrib/googletest/googlemock/scripts/generator/cpp/ast.py D contrib/googletest/googlemock/scripts/generator/cpp/gmock_class.py D contrib/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py D contrib/googletest/googlemock/scripts/generator/cpp/keywords.py D contrib/googletest/googlemock/scripts/generator/cpp/tokenize.py D contrib/googletest/googlemock/scripts/generator/cpp/utils.py D contrib/googletest/googlemock/scripts/generator/gmock_gen.py D contrib/googletest/googlemock/scripts/gmock-config.in D contrib/googletest/googlemock/scripts/gmock_doctor.py D contrib/googletest/googlemock/scripts/upload.py D contrib/googletest/googlemock/scripts/upload_gmock.py M contrib/googletest/googlemock/src/gmock-cardinalities.cc M contrib/googletest/googlemock/src/gmock-internal-utils.cc M contrib/googletest/googlemock/src/gmock-matchers.cc M contrib/googletest/googlemock/src/gmock-spec-builders.cc M contrib/googletest/googlemock/src/gmock.cc M contrib/googletest/googlemock/src/gmock_main.cc M contrib/googletest/googlemock/test/BUILD.bazel M contrib/googletest/googlemock/test/gmock-actions_test.cc M contrib/googletest/googlemock/test/gmock-cardinalities_test.cc A contrib/googletest/googlemock/test/gmock-function-mocker_test.cc D contrib/googletest/googlemock/test/gmock-generated-actions_test.cc D contrib/googletest/googlemock/test/gmock-generated-function-mockers_test.cc D contrib/googletest/googlemock/test/gmock-generated-internal-utils_test.cc D contrib/googletest/googlemock/test/gmock-generated-matchers_test.cc M contrib/googletest/googlemock/test/gmock-internal-utils_test.cc A contrib/googletest/googlemock/test/gmock-matchers-arithmetic_test.cc A contrib/googletest/googlemock/test/gmock-matchers-comparisons_test.cc A contrib/googletest/googlemock/test/gmock-matchers-containers_test.cc A contrib/googletest/googlemock/test/gmock-matchers-misc_test.cc D contrib/googletest/googlemock/test/gmock-matchers_test.cc A contrib/googletest/googlemock/test/gmock-matchers_test.h M contrib/googletest/googlemock/test/gmock-more-actions_test.cc M contrib/googletest/googlemock/test/gmock-nice-strict_test.cc M contrib/googletest/googlemock/test/gmock-port_test.cc A contrib/googletest/googlemock/test/gmock-pp-string_test.cc A contrib/googletest/googlemock/test/gmock-pp_test.cc M contrib/googletest/googlemock/test/gmock-spec-builders_test.cc M contrib/googletest/googlemock/test/gmock_all_test.cc M contrib/googletest/googlemock/test/gmock_ex_test.cc M contrib/googletest/googlemock/test/gmock_leak_test.py M contrib/googletest/googlemock/test/gmock_leak_test_.cc M contrib/googletest/googlemock/test/gmock_link2_test.cc M contrib/googletest/googlemock/test/gmock_link_test.cc M contrib/googletest/googlemock/test/gmock_link_test.h M contrib/googletest/googlemock/test/gmock_output_test.py M contrib/googletest/googlemock/test/gmock_output_test_.cc M contrib/googletest/googlemock/test/gmock_output_test_golden.txt M contrib/googletest/googlemock/test/gmock_stress_test.cc M contrib/googletest/googlemock/test/gmock_test.cc M contrib/googletest/googlemock/test/gmock_test_utils.py D contrib/googletest/googletest/CHANGES M contrib/googletest/googletest/CMakeLists.txt D contrib/googletest/googletest/LICENSE D contrib/googletest/googletest/Makefile.am M contrib/googletest/googletest/README.md M contrib/googletest/googletest/cmake/gtest.pc.in M contrib/googletest/googletest/cmake/gtest_main.pc.in M contrib/googletest/googletest/cmake/internal_utils.cmake A contrib/googletest/googletest/cmake/libgtest.la.in D contrib/googletest/googletest/codegear/gtest.cbproj D contrib/googletest/googletest/codegear/gtest.groupproj D contrib/googletest/googletest/codegear/gtest_link.cc D contrib/googletest/googletest/codegear/gtest_main.cbproj D contrib/googletest/googletest/codegear/gtest_unittest.cbproj D contrib/googletest/googletest/configure.ac D contrib/googletest/googletest/docs/Pkgconfig.md D contrib/googletest/googletest/docs/PumpManual.md A contrib/googletest/googletest/docs/README.md D contrib/googletest/googletest/docs/XcodeGuide.md D contrib/googletest/googletest/docs/primer.md A contrib/googletest/googletest/include/gtest/gtest-assertion-result.h M contrib/googletest/googletest/include/gtest/gtest-death-test.h A contrib/googletest/googletest/include/gtest/gtest-matchers.h M contrib/googletest/googletest/include/gtest/gtest-message.h M contrib/googletest/googletest/include/gtest/gtest-param-test.h D contrib/googletest/googletest/include/gtest/gtest-param-test.h.pump M contrib/googletest/googletest/include/gtest/gtest-printers.h M contrib/googletest/googletest/include/gtest/gtest-spi.h M contrib/googletest/googletest/include/gtest/gtest-test-part.h M contrib/googletest/googletest/include/gtest/gtest-typed-test.h M contrib/googletest/googletest/include/gtest/gtest.h M contrib/googletest/googletest/include/gtest/gtest_pred_impl.h M contrib/googletest/googletest/include/gtest/gtest_prod.h M contrib/googletest/googletest/include/gtest/internal/custom/README.md M contrib/googletest/googletest/include/gtest/internal/custom/gtest-port.h M contrib/googletest/googletest/include/gtest/internal/custom/gtest-printers.h M contrib/googletest/googletest/include/gtest/internal/custom/gtest.h M contrib/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h M contrib/googletest/googletest/include/gtest/internal/gtest-filepath.h M contrib/googletest/googletest/include/gtest/internal/gtest-internal.h D contrib/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h D contrib/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h D contrib/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump M contrib/googletest/googletest/include/gtest/internal/gtest-param-util.h M contrib/googletest/googletest/include/gtest/internal/gtest-port-arch.h M contrib/googletest/googletest/include/gtest/internal/gtest-port.h M contrib/googletest/googletest/include/gtest/internal/gtest-string.h D contrib/googletest/googletest/include/gtest/internal/gtest-tuple.h D contrib/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump M contrib/googletest/googletest/include/gtest/internal/gtest-type-util.h D contrib/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump D contrib/googletest/googletest/m4/acx_pthread.m4 D contrib/googletest/googletest/m4/gtest.m4 D contrib/googletest/googletest/make/Makefile D contrib/googletest/googletest/msvc/2010/gtest-md.sln D contrib/googletest/googletest/msvc/2010/gtest-md.vcxproj D contrib/googletest/googletest/msvc/2010/gtest-md.vcxproj.filters D contrib/googletest/googletest/msvc/2010/gtest.sln D contrib/googletest/googletest/msvc/2010/gtest.vcxproj D contrib/googletest/googletest/msvc/2010/gtest.vcxproj.filters D contrib/googletest/googletest/msvc/2010/gtest_main-md.vcxproj D contrib/googletest/googletest/msvc/2010/gtest_main-md.vcxproj.filters D contrib/googletest/googletest/msvc/2010/gtest_main.vcxproj D contrib/googletest/googletest/msvc/2010/gtest_main.vcxproj.filters D contrib/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj D contrib/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters D contrib/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj D contrib/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj.filters D contrib/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj D contrib/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj.filters D contrib/googletest/googletest/msvc/2010/gtest_unittest.vcxproj D contrib/googletest/googletest/msvc/2010/gtest_unittest.vcxproj.filters M contrib/googletest/googletest/samples/prime_tables.h M contrib/googletest/googletest/samples/sample1.cc M contrib/googletest/googletest/samples/sample1.h M contrib/googletest/googletest/samples/sample10_unittest.cc M contrib/googletest/googletest/samples/sample1_unittest.cc M contrib/googletest/googletest/samples/sample2.cc M contrib/googletest/googletest/samples/sample2.h M contrib/googletest/googletest/samples/sample2_unittest.cc M contrib/googletest/googletest/samples/sample3-inl.h M contrib/googletest/googletest/samples/sample3_unittest.cc M contrib/googletest/googletest/samples/sample4.cc M contrib/googletest/googletest/samples/sample4.h M contrib/googletest/googletest/samples/sample4_unittest.cc M contrib/googletest/googletest/samples/sample5_unittest.cc M contrib/googletest/googletest/samples/sample6_unittest.cc M contrib/googletest/googletest/samples/sample7_unittest.cc M contrib/googletest/googletest/samples/sample8_unittest.cc M contrib/googletest/googletest/samples/sample9_unittest.cc D contrib/googletest/googletest/scripts/common.py D contrib/googletest/googletest/scripts/fuse_gtest_files.py D contrib/googletest/googletest/scripts/gen_gtest_pred_impl.py D contrib/googletest/googletest/scripts/gtest-config.in D contrib/googletest/googletest/scripts/pump.py D contrib/googletest/googletest/scripts/release_docs.py D contrib/googletest/googletest/scripts/test/Makefile D contrib/googletest/googletest/scripts/upload.py D contrib/googletest/googletest/scripts/upload_gtest.py M contrib/googletest/googletest/src/gtest-all.cc R051 contrib/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc contrib/googletest/googletest/src/gtest-assertion-result.cc M contrib/googletest/googletest/src/gtest-death-test.cc M contrib/googletest/googletest/src/gtest-filepath.cc M contrib/googletest/googletest/src/gtest-internal-inl.h A contrib/googletest/googletest/src/gtest-matchers.cc M contrib/googletest/googletest/src/gtest-port.cc M contrib/googletest/googletest/src/gtest-printers.cc M contrib/googletest/googletest/src/gtest-test-part.cc M contrib/googletest/googletest/src/gtest-typed-test.cc M contrib/googletest/googletest/src/gtest.cc M contrib/googletest/googletest/src/gtest_main.cc M contrib/googletest/googletest/test/BUILD.bazel M contrib/googletest/googletest/test/googletest-break-on-failure-unittest.py M contrib/googletest/googletest/test/googletest-break-on-failure-unittest_.cc M contrib/googletest/googletest/test/googletest-catch-exceptions-test.py M contrib/googletest/googletest/test/googletest-catch-exceptions-test_.cc M contrib/googletest/googletest/test/googletest-color-test.py M contrib/googletest/googletest/test/googletest-color-test_.cc M contrib/googletest/googletest/test/googletest-death-test-test.cc M contrib/googletest/googletest/test/googletest-death-test_ex_test.cc M contrib/googletest/googletest/test/googletest-env-var-test.py M contrib/googletest/googletest/test/googletest-env-var-test_.cc A contrib/googletest/googletest/test/googletest-failfast-unittest.py A contrib/googletest/googletest/test/googletest-failfast-unittest_.cc M contrib/googletest/googletest/test/googletest-filepath-test.cc M contrib/googletest/googletest/test/googletest-filter-unittest.py M contrib/googletest/googletest/test/googletest-filter-unittest_.cc A contrib/googletest/googletest/test/googletest-global-environment-unittest.py R067 contrib/googletest/googletest/xcode/Samples/FrameworkSample/widget.h contrib/googletest/googletest/test/googletest-global-environment-unittest_.cc M contrib/googletest/googletest/test/googletest-json-outfiles-test.py M contrib/googletest/googletest/test/googletest-json-output-unittest.py D contrib/googletest/googletest/test/googletest-linked-ptr-test.cc M contrib/googletest/googletest/test/googletest-list-tests-unittest.py M contrib/googletest/googletest/test/googletest-list-tests-unittest_.cc M contrib/googletest/googletest/test/googletest-listener-test.cc M contrib/googletest/googletest/test/googletest-message-test.cc M contrib/googletest/googletest/test/googletest-options-test.cc M contrib/googletest/googletest/test/googletest-output-test-golden-lin.txt M contrib/googletest/googletest/test/googletest-output-test.py M contrib/googletest/googletest/test/googletest-output-test_.cc M contrib/googletest/googletest/test/googletest-param-test-invalid-name1-test.py M contrib/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc M contrib/googletest/googletest/test/googletest-param-test-invalid-name2-test.py M contrib/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc M contrib/googletest/googletest/test/googletest-param-test-test.cc M contrib/googletest/googletest/test/googletest-param-test-test.h M contrib/googletest/googletest/test/googletest-param-test2-test.cc M contrib/googletest/googletest/test/googletest-port-test.cc M contrib/googletest/googletest/test/googletest-printers-test.cc R064 contrib/googletest/ci/build-linux-autotools.sh contrib/googletest/googletest/test/googletest-setuptestsuite-test.py R078 contrib/googletest/googletest/codegear/gtest_all.cc contrib/googletest/googletest/test/googletest-setuptestsuite-test_.cc M contrib/googletest/googletest/test/googletest-shuffle-test.py M contrib/googletest/googletest/test/googletest-shuffle-test_.cc M contrib/googletest/googletest/test/googletest-test-part-test.cc D contrib/googletest/googletest/test/googletest-test2_test.cc M contrib/googletest/googletest/test/googletest-throw-on-failure-test.py M contrib/googletest/googletest/test/googletest-throw-on-failure-test_.cc D contrib/googletest/googletest/test/googletest-tuple-test.cc M contrib/googletest/googletest/test/googletest-uninitialized-test.py M contrib/googletest/googletest/test/googletest-uninitialized-test_.cc M contrib/googletest/googletest/test/gtest-typed-test2_test.cc M contrib/googletest/googletest/test/gtest-typed-test_test.cc M contrib/googletest/googletest/test/gtest-typed-test_test.h M contrib/googletest/googletest/test/gtest-unittest-api_test.cc M contrib/googletest/googletest/test/gtest_all_test.cc M contrib/googletest/googletest/test/gtest_assert_by_exception_test.cc A contrib/googletest/googletest/test/gtest_dirs_test.cc M contrib/googletest/googletest/test/gtest_environment_test.cc M contrib/googletest/googletest/test/gtest_help_test.py M contrib/googletest/googletest/test/gtest_help_test_.cc M contrib/googletest/googletest/test/gtest_json_test_utils.py M contrib/googletest/googletest/test/gtest_list_output_unittest.py M contrib/googletest/googletest/test/gtest_list_output_unittest_.cc M contrib/googletest/googletest/test/gtest_main_unittest.cc M contrib/googletest/googletest/test/gtest_pred_impl_unittest.cc M contrib/googletest/googletest/test/gtest_premature_exit_test.cc M contrib/googletest/googletest/test/gtest_repeat_test.cc R061 contrib/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh contrib/googletest/googletest/test/gtest_skip_check_output_test.py R066 contrib/googletest/ci/log-config.sh contrib/googletest/googletest/test/gtest_skip_environment_check_output_test.py M contrib/googletest/googletest/test/gtest_skip_in_environment_setup_test.cc M contrib/googletest/googletest/test/gtest_skip_test.cc M contrib/googletest/googletest/test/gtest_sole_header_test.cc M contrib/googletest/googletest/test/gtest_stress_test.cc M contrib/googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc M contrib/googletest/googletest/test/gtest_test_utils.py M contrib/googletest/googletest/test/gtest_testbridge_test.py M contrib/googletest/googletest/test/gtest_testbridge_test_.cc M contrib/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc M contrib/googletest/googletest/test/gtest_unittest.cc M contrib/googletest/googletest/test/gtest_xml_outfile1_test_.cc M contrib/googletest/googletest/test/gtest_xml_outfile2_test_.cc M contrib/googletest/googletest/test/gtest_xml_outfiles_test.py M contrib/googletest/googletest/test/gtest_xml_output_unittest.py M contrib/googletest/googletest/test/gtest_xml_output_unittest_.cc M contrib/googletest/googletest/test/gtest_xml_test_utils.py M contrib/googletest/googletest/test/production.h D contrib/googletest/googletest/xcode/Config/DebugProject.xcconfig D contrib/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig D contrib/googletest/googletest/xcode/Config/General.xcconfig D contrib/googletest/googletest/xcode/Config/ReleaseProject.xcconfig D contrib/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig D contrib/googletest/googletest/xcode/Config/TestTarget.xcconfig D contrib/googletest/googletest/xcode/Resources/Info.plist D contrib/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist D contrib/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj D contrib/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc D contrib/googletest/googletest/xcode/Scripts/versiongenerate.py D contrib/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj A contrib/googletest/googletest_deps.bzl M lib/googletest/gmock/Makefile M lib/googletest/gtest/Makefile M lib/googletest/tests/gmock/Makefile M lib/googletest/tests/gmock_main/Makefile M lib/googletest/tests/gtest/Makefile M lib/googletest/tests/gtest_main/Makefile M share/mk/googletest.test.inc.mk ____________________________________________________________________________________________________________ Commit: 2adc0bae0b4613282f2a954089b5bdad487a4c2d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2adc0bae0b4613282f2a954089b5bdad487a4c2d Author: Enji Cooper (Tue 8 Aug 2023 14:42:07 BST) Committer: Enji Cooper (Wed 26 Mar 2025 16:40:48 GMT) fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0 `INSTANTIATE_TEST_CASE_P` has been replaced with `INSTANTIATE_TEST_SUITE_P`. Replace all uses of the former macro with the latter macro. While here, address the fact that the latter macro doesn't permit some of the constructions that the former macro did, e.g., empty parameters, etc. Conflicts: tests/sys/fs/fusefs/fallocate.cc (fix applied manually) tests/sys/fs/fusefs/io.cc (change reverted) MFC after: 2 weeks Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D41398 (cherry picked from commit 811e0a31acafd6ab21f89bec8ba0fb8c09f258d2) M tests/sys/fs/fusefs/bmap.cc M tests/sys/fs/fusefs/cache.cc M tests/sys/fs/fusefs/dev_fuse_poll.cc M tests/sys/fs/fusefs/io.cc M tests/sys/fs/fusefs/last_local_modify.cc M tests/sys/fs/fusefs/mount.cc M tests/sys/fs/fusefs/read.cc M tests/sys/fs/fusefs/write.cc ____________________________________________________________________________________________________________ Commit: 7b17666c32f7cad4a26cc9da2d3347dca90af32e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7b17666c32f7cad4a26cc9da2d3347dca90af32e Author: Philip Paeps (Sun 23 Mar 2025 01:28:44 GMT) Committer: Philip Paeps (Wed 26 Mar 2025 01:04:40 GMT) contrib/tzdata: import tzdata 2025b Changes: https://github.com/eggert/tz/blob/2025b/NEWS (cherry picked from commit d2cccdef30376b7de5643caae1ef035f8e6932f0) M contrib/tzdata/NEWS M contrib/tzdata/asia M contrib/tzdata/northamerica M contrib/tzdata/southamerica M contrib/tzdata/version M contrib/tzdata/zone.tab M contrib/tzdata/zone1970.tab M contrib/tzdata/zonenow.tab ____________________________________________________________________________________________________________ Commit: 69569859a0a4767c4351e52cfe137098bd869715 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=69569859a0a4767c4351e52cfe137098bd869715 Author: Alexander Ziaee (Fri 21 Mar 2025 16:31:26 GMT) Committer: Alexander Ziaee (Mon 24 Mar 2025 01:42:56 GMT) ports.7: Update dialog4ports to portconfig dialog4ports has been replaced with portconfig for several years. It was marked as deprecated and broken in ports:61e4a788ecab. While here, tag SPDX. MFC after: 3 days Reported by: Community Discord Reviewed by: bapt (previous version), mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D49204 (cherry picked from commit 3bf433f141a5c8987f347c6618bab0482063a66c) M share/man/man7/ports.7 ____________________________________________________________________________________________________________ Commit: f89c056e118438759d3aa5b8475c075dcad9299e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f89c056e118438759d3aa5b8475c075dcad9299e Author: Michael Osipov (Fri 7 Mar 2025 18:58:55 GMT) Committer: Michael Osipov (Thu 20 Mar 2025 11:32:44 GMT) caroot: update the root bundle Summary: - Seven (7) new roots - Four (4) distrusted roots - Fourteen (14) removed (expired) roots Reviewed by: kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49294 (cherry picked from commit 0100da4deb96e15acf72d7655127c6faafa4148f) M ObsoleteFiles.inc D secure/caroot/blacklisted/AddTrust_External_Root.pem D secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem D secure/caroot/blacklisted/Cybertrust_Global_Root.pem D secure/caroot/blacklisted/DST_Root_CA_X3.pem D secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem R100 secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem secure/caroot/blacklisted/Entrust_Root_Certification_Authority_-_G4.pem D secure/caroot/blacklisted/GeoTrust_Global_CA.pem D secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem D secure/caroot/blacklisted/Hongkong_Post_Root_CA_1.pem D secure/caroot/blacklisted/QuoVadis_Root_CA.pem R100 secure/caroot/trusted/SecureSign_RootCA11.pem secure/caroot/blacklisted/SecureSign_RootCA11.pem R100 secure/caroot/trusted/Security_Communication_RootCA3.pem secure/caroot/blacklisted/Security_Communication_RootCA3.pem D secure/caroot/blacklisted/Security_Communication_Root_CA.pem D secure/caroot/blacklisted/Sonera_Class_2_Root_CA.pem D secure/caroot/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem D secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem R100 secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem secure/caroot/blacklisted/SwissSign_Silver_CA_-_G2.pem D secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem A secure/caroot/trusted/D-TRUST_BR_Root_CA_2_2023.pem A secure/caroot/trusted/D-TRUST_EV_Root_CA_2_2023.pem A secure/caroot/trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem A secure/caroot/trusted/SecureSign_Root_CA12.pem A secure/caroot/trusted/SecureSign_Root_CA14.pem A secure/caroot/trusted/SecureSign_Root_CA15.pem A secure/caroot/trusted/TWCA_CYBER_Root_CA.pem ____________________________________________________________________________________________________________ Commit: dd503d7b4ce735335fefeef006259204467f27d1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dd503d7b4ce735335fefeef006259204467f27d1 Author: Cy Schubert (Fri 31 Jan 2025 23:36:59 GMT) Committer: Cy Schubert (Thu 20 Mar 2025 03:10:43 GMT) ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream 98e34e8e2557 circumvented an upstream patch which caused an IPv6 pool regresson. This patch removes the circumvention and replaces it with an upstream patch planned for the new release of ntp. (cherry picked from commit bc02e655872021595c434850fbcbdb8dd11d4a46) M contrib/ntp/ntpd/ntp_io.c M contrib/ntp/ntpd/ntp_proto.c ____________________________________________________________________________________________________________ Commit: 9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5 Author: Cy Schubert (Mon 3 Feb 2025 23:16:08 GMT) Committer: Cy Schubert (Thu 20 Mar 2025 03:10:29 GMT) ntp: Another patch to address IPv6 pool regression 98e34e8e2557 circumvented an upstream patch which caused an IPv6 pool regression. This patch, discussed in https://bugs.ntp.org/show_bug.cgi?id=3958, addresses another unworkable combination of link-local local address with non-link-local server. (cherry picked from commit c1767cf87cb64c25426fd7fe119be283b134509a) M contrib/ntp/ntpd/ntp_proto.c ____________________________________________________________________________________________________________ Commit: e7b5dabcba26e28f79e9681a8fdb2ffa2c5122dc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e7b5dabcba26e28f79e9681a8fdb2ffa2c5122dc Author: Cy Schubert (Fri 31 Jan 2025 22:25:14 GMT) Committer: Cy Schubert (Thu 20 Mar 2025 03:10:09 GMT) ntp: ntpd does not connect to NTP server with link local IPv6 address Upstream bug 3943 (https://bugs.ntp.org/show_bug.cgi?id=3943) discusses: Starting with 4.2.8p18 ntp does not synchronize or even connect to the configured NTP server any more. ntp stays in .INIT. state indefinitely and checking the network traffic shows that ntp does not attempt to contact the NTP server. This is regression introduced by the fix for upstream bug 3913. This is a similar bug I reported upstream (ntp bug 3841). (cherry picked from commit 381956e267569031883a516e10446c29490ee41d) M contrib/ntp/ntpd/ntp_io.c ____________________________________________________________________________________________________________ Commit: d0105578f05f507614185436cf5aba92a2b61782 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d0105578f05f507614185436cf5aba92a2b61782 Author: Mateusz Guzik (Mon 10 Feb 2025 14:27:37 GMT) Committer: Mateusz Guzik (Tue 18 Mar 2025 14:38:00 GMT) inet6: add the missing lock acquire to nd6_get_llentry Reported by: Lexi Winter PR: 282378 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282378 ) Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit d6138a65405f697715189363b2b18581e7abd982) M sys/netinet6/nd6.c ____________________________________________________________________________________________________________ Commit: b297093ebab6a16f23cebeeb1dbd7470c13db004 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b297093ebab6a16f23cebeeb1dbd7470c13db004 Author: Andrey V. Elsukov (Sun 2 Mar 2025 10:53:49 GMT) Committer: Andrey V. Elsukov (Tue 18 Mar 2025 09:11:37 GMT) routing: do not allow PINNED routes to be overriden First configured PINNED routes should have higher priority. Fixes: 1da4954c92ea Differential Revision: https://reviews.freebsd.org/D48650 (cherry picked from commit 361a8395f0b0e6f254fd138798232529679d99f6) M sys/net/route/route_ctl.c ____________________________________________________________________________________________________________ Commit: 61df1b78f90681c015fade9b81b40ae1f379e1df URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=61df1b78f90681c015fade9b81b40ae1f379e1df Author: Michael Osipov (Fri 3 May 2024 08:57:06 BST) Committer: Michael Osipov (Sat 15 Mar 2025 14:01:42 GMT) sh(1): Replace recommendation of use of -e with a note This partially reverts b14cfdf665bb8b7b2898a4ee5b073ab87f8ea3d0 and has been discussed in D42719. Reviewed by: jrm (mentor), otis (mentor), mandree, ziaee (manpages) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45073 (cherry picked from commit 7bd8da72c5814b486ae7f492286fe3ac0a5bf03d) M bin/sh/sh.1 ____________________________________________________________________________________________________________ Commit: d3e5558d31688688684533e3fc575bc65d5e4b84 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d3e5558d31688688684533e3fc575bc65d5e4b84 Author: Michael Osipov (Thu 20 Feb 2025 09:48:48 GMT) Committer: Michael Osipov (Sat 15 Mar 2025 13:56:16 GMT) caroot: Ignore soft distrust of server CA certificates after 398 days Mozilla introduced the field CKA_NSS_SERVER_DISTRUST_AFTER which indicates that a CA certificate will be distrusted in the future before its NotAfter time. This means that the CA stops issuing new certificates, but previous ones are still valid, but at most for 398 days after the distrust date. See also: * https://bugzilla.mozilla.org/show_bug.cgi?id=1465613 * https://github.com/Lukasa/mkcert/issues/19 * https://gitlab.alpinelinux.org/alpine/ca-certificates/-/merge_requests/16 * https://github.com/curl/curl/commit/448df98d9280b3290ecf63e5fc9452d487f41a7c Tested by: michaelo Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49075 (cherry picked from commit 457c03b397c80d44da92684d417a58b3ca1fed02) M secure/caroot/MAca-bundle.pl ____________________________________________________________________________________________________________ Commit: a4a271424f5e8c4c90090d13a52034308fed60b5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a4a271424f5e8c4c90090d13a52034308fed60b5 Author: Warner Losh (Fri 10 May 2024 16:18:43 BST) Committer: Warner Losh (Fri 14 Mar 2025 17:51:46 GMT) posix: POSIX-1.2008 moved SA_* from XSI to base standard Starting with POSIX-1.2008, "The SA_RESETHAND, SA_RESTART, SA_SIGINFO, SA_NOCLDWAIT, and SA_NODEFER constants are moved from the XSI option to the Base." Make them so visible. PR: 275328 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275328 ) Sponsored by: Netflix (cherry picked from commit 06af7bd12a4a654f5c5e8da41cf329eee3aa61f6) M sys/sys/signal.h ____________________________________________________________________________________________________________ Commit: 1219a3f40db386aaa10edfea27d9cc73fdea3935 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1219a3f40db386aaa10edfea27d9cc73fdea3935 Author: Andrey V. Elsukov (Thu 6 Mar 2025 12:18:59 GMT) Committer: Andrey V. Elsukov (Thu 13 Mar 2025 10:23:29 GMT) pfkey2: use correct value for a key length The length of key data is specified via sadb_key_bits field. Use specified size for buffer allocation and key copying. Also add a check that the value of sadb_key_bits is not zero, as explicitly required in RFC 2367. PR: 241010 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241010 ) Submitted by: jean-francois.hren at stormshield eu (cherry picked from commit 04207850a9b988d3c04e904cb5783f33da7fe184) M sys/netipsec/key.c ____________________________________________________________________________________________________________ Commit: f1929835f76d587804c417f19188f41b77e8e7c6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f1929835f76d587804c417f19188f41b77e8e7c6 Author: Andrey V. Elsukov (Wed 5 Mar 2025 09:29:22 GMT) Committer: Andrey V. Elsukov (Thu 13 Mar 2025 10:18:44 GMT) ipfw: fix dump_soptcodes() handler Use correct indent number to dump registered socket options. It is not currently in use but can be used for debugging. PR: 283970 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283970 ) (cherry picked from commit b405250c77e6841a8159a4081d4e0f61e49dfbf8) M sys/netpfil/ipfw/ip_fw_sockopt.c ____________________________________________________________________________________________________________ Commit: 067cf605f884d888fd269ca269d9dda3b66a8787 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=067cf605f884d888fd269ca269d9dda3b66a8787 Author: Cy Schubert (Tue 11 Mar 2025 17:51:11 GMT) Committer: Cy Schubert (Tue 11 Mar 2025 17:59:36 GMT) Revert "ntpd: Use the ntpd -u option in preference to the rc su plumbing" Using the ntpd -u option to set the credentials ntpd is to run under while still using rc(8) to invoke causes some FreeBSD installs to fail to load mac_ntp. The fact that that can_run_nonroot() does not indicate why failures occur leaves people on the mailing lists guessing as to why there are failures. Let's revert back to using the rc(8) provided su. The ntpd rc script will be rewritten when the ntpd chroot will be implemented. Reported on: freebsd-stable@ This reverts commit 521f66715afb312b356afafc68cbc044a436a753. (cherry picked from commit 5ca7754519e8c618968d8acbf54d653b6e968829) M libexec/rc/rc.d/ntpd ____________________________________________________________________________________________________________ Commit: 20083496866c379aef98fc352a4b6fd49801894d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=20083496866c379aef98fc352a4b6fd49801894d Author: Jose Luis Duran (Tue 4 Mar 2025 13:51:47 GMT) Committer: Jose Luis Duran (Tue 11 Mar 2025 00:42:30 GMT) vmm: Emulate testb imm8,r/m8 Add support for "testb imm8,r/m8" emulation. PR: 261940 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261940 ) PR: 282852 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282852 ) Reviewed by: markj, emaste Approved by: emaste (mentor) Obtained from: Illumos (https://www.illumos.org/issues/14483) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49208 (cherry picked from commit 49a4838a0d94e145a826abf02aa03ff444e614e3) M sys/amd64/vmm/vmm_instruction_emul.c ____________________________________________________________________________________________________________ Commit: 6771ec1d6a50f9cf82e3951711a98a58a9543fc9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6771ec1d6a50f9cf82e3951711a98a58a9543fc9 Author: Zhenlei Huang (Fri 7 Mar 2025 04:14:44 GMT) Committer: Zhenlei Huang (Mon 10 Mar 2025 10:23:11 GMT) netlink: Fix getting route scope of interface's IPv4 addresses sin_addr of a `struct sockaddr_in` is stored in network byte order, but IN_LOOPBACK() and IN_LINKLOCAL() want the host order. Reviewed by: melifaro, #network Fixes: 7e5bf68495cc netlink: add netlink support MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49226 (cherry picked from commit 0e096bb3fcaaf663df372aa4abb986e8d63c6e68) (cherry picked from commit 057165012b4d190a8efef83b465d3bbd10a43e28) M sys/netlink/route/iface.c ____________________________________________________________________________________________________________ Commit: 9f26a03fdbdc94196e062aa34066143279f7ca8d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9f26a03fdbdc94196e062aa34066143279f7ca8d Author: Zhenlei Huang (Fri 7 Mar 2025 04:14:44 GMT) Committer: Zhenlei Huang (Mon 10 Mar 2025 10:23:11 GMT) tests/netlink: Assert the route scope of interface's addresses While here, add one additional IPv4 link-local address to test_46_nofilter to cover the IPv4 RT_SCOPE_LINK case. Reviewed by: melifaro, #network MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49226 (cherry picked from commit 5d8b48487acc8375675f2b7c4507c98ac5d0bf75) (cherry picked from commit e84a17db1cc034b87df7660dadb709a019140c3c) M tests/sys/netlink/test_rtnl_ifaddr.py ____________________________________________________________________________________________________________ Commit: 699ed29c4fd8eec3bbf4883bbca7a6e6f4a0fe12 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=699ed29c4fd8eec3bbf4883bbca7a6e6f4a0fe12 Author: Andrey V. Elsukov (Fri 28 Feb 2025 14:05:47 GMT) Committer: Andrey V. Elsukov (Fri 7 Mar 2025 09:56:14 GMT) routing: set net.route.multipath=0 when kernel doesn't have ROUTE_MPATH (cherry picked from commit f2644d64b40f611fd4d4f66069ad8d6cf33f69df) M sys/net/route/route_ctl.c ____________________________________________________________________________________________________________ Commit: d2011755f36c61d29f33c2f2bb51e4869db3a4f9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d2011755f36c61d29f33c2f2bb51e4869db3a4f9 Author: Cy Schubert (Tue 4 Mar 2025 20:37:20 GMT) Committer: Cy Schubert (Fri 7 Mar 2025 00:33:41 GMT) ipf: Correct ippool.5 man page The file URL must be enclosed in quotes. MFC after: 3 days (cherry picked from commit 278a726eec5a49284df1f54a586be0fe0ce2e0cf) M sbin/ipf/ippool/ippool.5 ____________________________________________________________________________________________________________ Commit: 2fae556f6a8b10bdef22eba0d83b0880e3669496 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2fae556f6a8b10bdef22eba0d83b0880e3669496 Author: Cy Schubert (Tue 26 Nov 2024 15:16:22 GMT) Committer: Cy Schubert (Wed 5 Mar 2025 04:46:14 GMT) var_run: Clean up style Clean up style and make more consistent. Replace test with if-then-else to make the script more legible. Replace the call to dirname with the shell %/* operator avoiding a fork & exec. Reorder the test for $var_run_autosave before the test for /var/run on tmpfs. This avoids gratuitously scanning the mount table for a tmpfs /var/run. Initial concept by and in discussion with: Harry Schmalzbauer No functional change intended. MFC after: 2 weeks Differnential revision: https://reviews.freebsd.org/D47773 (cherry picked from commit ed9712f8943573136fa92a0e61c8e7c10952eeb0) M libexec/rc/rc.d/var_run ____________________________________________________________________________________________________________ Commit: 206ed99650cf0fbdf31d0a1d710ba9cefe48ceae URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=206ed99650cf0fbdf31d0a1d710ba9cefe48ceae Author: Ed Maste (Fri 21 Feb 2025 18:07:32 GMT) Committer: Ed Maste (Mon 3 Mar 2025 16:24:57 GMT) Cirrus-CI: Bump image to (supported) 13.4 Sponsored by: The FreeBSD Foundation (cherry picked from commit 5bd7cf837c5fd30a04a45e20c1dcf18d113d98c4) (cherry picked from commit 7bcd307814d891567155cd8c6736e2c868e8cca2) M .cirrus.yml ____________________________________________________________________________________________________________ Commit: 42ba6765c9328dd283e76ba26c048868033c89b2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=42ba6765c9328dd283e76ba26c048868033c89b2 Author: Kevin Lo (Fri 28 Feb 2025 08:12:00 GMT) Committer: Kevin Lo (Mon 3 Mar 2025 01:39:28 GMT) ixgbe: Fix a logic error in ixgbe_read_mailbox_vf() Reviewed by: kbowling Differential Revision: https://reviews.freebsd.org/D49156 (cherry picked from commit 5c7087c349fc1d826807aa1a11912c9e774e3321) M sys/dev/ixgbe/ixgbe_mbx.c ____________________________________________________________________________________________________________ Commit: e94246e0a2f36f955f481eb9b6f1faf9bd0d5cfd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e94246e0a2f36f955f481eb9b6f1faf9bd0d5cfd Author: Tore Amundsen (Wed 13 Nov 2024 05:08:06 GMT) Committer: Kevin Bowling (Sun 2 Mar 2025 20:57:59 GMT) net: if_media for 1000Base-BX BiDi 1000Base-BX uses two wavelengths, commonly 1310nm, 1490nm, 1550nm, or 1590nm, in a Coarse Wavelength Division Multiplexing (CWDM) arrangement so that a single fiber strand may carry both upstream and downstream. It is sometimes referred to as BiDi for bi-directional usage of one fiber. Optics must be paired such that the RX and TX wavelengths cross over, with one side often called U(pstream) and the other D(ownstream). This technology is useful for increasing link density or working around construction issues, and is also frequently used as a last mile delivery technology for FTTx. Sponsored by: BBOX.io (review/commits) Pull Request: https://github.com/freebsd/freebsd-src/pull/1518 (cherry picked from commit 78c63ed260fa20b3500aedfe41dc0dcae9593f51) M sys/net/ieee8023ad_lacp.c M sys/net/if_media.h ____________________________________________________________________________________________________________ Commit: a3d32f9e6033a9083a22b7c9f25633430372e5b4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a3d32f9e6033a9083a22b7c9f25633430372e5b4 Author: Cy Schubert (Fri 28 Feb 2025 15:46:23 GMT) Committer: Cy Schubert (Fri 28 Feb 2025 15:58:54 GMT) ntp: NULL pointer deref when create_interface() fails Fix NULL pointer dereference when create_interface() fails in update_interfaces(). The upstream bug report says a typo was introduced by https://bk.ntp.org/ntp-dev/ntpd/ntp_io.c?PAGE=diffs&REV=66175036PETA6g__fON8oNrjL54Ttw. ep should have been ep2. Fix obtained from upstream bug report. PR: 285065 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=285065 ) Upstream bug: https://bugs.ntp.org/show_bug.cgi?id=3939 (cherry picked from commit 628715fdcc9f2226bfe0f4ebe381aaa7761cb6cc) M contrib/ntp/ntpd/ntp_io.c ____________________________________________________________________________________________________________ Commit: 4fd887f08b000173c196e954b510752025ff3fc0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4fd887f08b000173c196e954b510752025ff3fc0 Author: Olivier Certner (Thu 27 Feb 2025 20:59:41 GMT) Committer: Olivier Certner (Thu 27 Feb 2025 21:11:10 GMT) queue: Fix STAILQ_ASSERT_EMPTY() The 'while' part corresponding to the 'do' was missing. Did not notice the problem as later commits using it have been stashed and never reworked up to now, and it is currently unused in the tree. While here, fix spacing after the '#define' in the !(_KERNEL && INVARIANS) part. Fixes: 34740937f7a4 ("queue: New debug macros for STAILQ") MFC after: 1 minute Sponsored by: The FreeBSD Foundation (cherry picked from commit d3c4b002d1fd54ac69c1714e208051867ee56dc4) M sys/sys/queue.h ____________________________________________________________________________________________________________ Commit: 319b59fbde2fb90bd4e41d1f66aa59e56f66f1fe URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=319b59fbde2fb90bd4e41d1f66aa59e56f66f1fe Author: Rick Macklem (Mon 24 Feb 2025 20:58:27 GMT) Committer: Rick Macklem (Thu 27 Feb 2025 02:35:54 GMT) nfscl: Fix setting of mtime for the NFSv4.n client It was reported on freebsd-fs@ that unrolling a tarball failed to set the correct modify time if delegations were being issued. This patch fixes the problem. This bug only affects NFSv4 mounts where delegations are being issued. Not running the nfscbd or disabling delegations on the NFSv4 server avoids the problem. (cherry picked from commit b616d997cb48eaafe13069eecd95f0495b2358eb) M sys/fs/nfs/nfs_var.h M sys/fs/nfsclient/nfs_clstate.c M sys/fs/nfsclient/nfs_clvnops.c ____________________________________________________________________________________________________________ Commit: f931a32bcaf3f86581d2dbe46f7809eb47d1b167 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f931a32bcaf3f86581d2dbe46f7809eb47d1b167 Author: Jose Luis Duran (Mon 24 Feb 2025 14:38:52 GMT) Committer: Jose Luis Duran (Wed 26 Feb 2025 16:42:45 GMT) openssh: Fix blacklistd sshd-session integration In version 9.8, the server was split into a listener binary, sshd(8), and a per-session binary "sshd-session". Our blacklistd changes also have to be moved from sshd.c to sshd-session.c. Reviewed by: emaste Approved by: emaste (mentor) Fixes: 0fdf8fae8b56 ("openssh: Update to 9.8p1") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49116 (cherry picked from commit 61d8af38bf1c5328c27ccfcd8a3b73e9e8604d16) (cherry picked from commit 707ac59c2b31bdf3a593bc545d2fe233598cb97c) M crypto/openssh/sshd-session.c M crypto/openssh/sshd.c ____________________________________________________________________________________________________________ Commit: 9b65c9cdbb9419ea987a08b6aaa1e51e54bb52d0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9b65c9cdbb9419ea987a08b6aaa1e51e54bb52d0 Author: Cy Schubert (Thu 2 Jan 2025 03:44:18 GMT) Committer: Cy Schubert (Tue 25 Feb 2025 00:38:10 GMT) shar: Make sure a sed failure in the generated archive results in failure Obtained from: NetBSD hg commit 365369:21b92f0055b4 MFC after: 1 week (cherry picked from commit f0c8d2cd622a47e06c08620a10e13ad7519e9102) M usr.bin/shar/shar.sh ____________________________________________________________________________________________________________ Commit: 9b70262b08076ecde0262173e33d9cfc805b14b5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9b70262b08076ecde0262173e33d9cfc805b14b5 Author: Cy Schubert (Thu 2 Jan 2025 03:35:31 GMT) Committer: Cy Schubert (Tue 25 Feb 2025 00:38:10 GMT) shar: Handle special characters or white space in file names fed to shar Obtained from: NetBSD hg commit 365370:124268924386 MFC after: 1 week (cherry picked from commit 1080f5315427b382221651b342227b4923106f83) M usr.bin/shar/shar.sh ____________________________________________________________________________________________________________ Commit: 92c834c6980d5e86768509104242316a51c064dc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=92c834c6980d5e86768509104242316a51c064dc Author: Cy Schubert (Thu 12 Dec 2024 20:03:09 GMT) Committer: Cy Schubert (Tue 25 Feb 2025 00:38:10 GMT) ntpd: Use the ntpd -u option in preference to the rc su plumbing Using the rc plumbing to setuid(2) is preferred as it allows the user to use the -i option in ntpd_flags to chroot ntpd. Chrooting ntpd by default will be a 2025 project. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D48191 (cherry picked from commit 521f66715afb312b356afafc68cbc044a436a753) M libexec/rc/rc.d/ntpd ____________________________________________________________________________________________________________ Commit: ab4d246b781c844b0fc14a3f525e316e4654f087 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ab4d246b781c844b0fc14a3f525e316e4654f087 Author: Emmanuel Vadot (Wed 22 Jan 2025 16:56:58 GMT) Committer: Ed Maste (Mon 24 Feb 2025 15:53:42 GMT) Deprecate publickey(5) stuff This uses DES and it's likely that nobody uses that in 2025. If somebody uses this we help them by deprecating and removing this. Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D30682 (cherry picked from commit 723425f837270dd3b22098168ae9464a1ebe38c6) (cherry picked from commit 9197c04a251bc531ee5fca8e11cf7b64237a42f3) M usr.bin/chkey/chkey.1 M usr.bin/chkey/chkey.c M usr.bin/keylogin/keylogin.1 M usr.bin/keylogin/keylogin.c M usr.bin/keylogout/keylogout.1 M usr.bin/keylogout/keylogout.c M usr.bin/newkey/newkey.8 M usr.bin/newkey/newkey.c M usr.sbin/keyserv/keyserv.8 M usr.sbin/keyserv/keyserv.c ____________________________________________________________________________________________________________ Commit: 96e06df5bcf18ca20c3bc6ac76a63cc3a5954158 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=96e06df5bcf18ca20c3bc6ac76a63cc3a5954158 Author: Ed Maste (Tue 18 Feb 2025 13:18:56 GMT) Committer: Ed Maste (Mon 24 Feb 2025 15:53:42 GMT) upgt: Deprecate ancient 802.11b/g driver Recently-reported bugs in this driver should be fixed, but also the hardware it supports is obsolete so mark it for deprecation. PR: 284876 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284876 ) Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49045 (cherry picked from commit 7f8a5c5a1585fd9b56adfd8de4f9194ba5cc0785) (cherry picked from commit eb3be1cb9f4ced29183c08a6ea4c195d8b9ce268) M share/man/man4/upgt.4 ____________________________________________________________________________________________________________ Commit: 63422982e074a144cfb420408be06e6dc154f9fe URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=63422982e074a144cfb420408be06e6dc154f9fe Author: Andrey V. Elsukov (Tue 11 Feb 2025 09:48:17 GMT) Committer: Andrey V. Elsukov (Fri 21 Feb 2025 11:18:44 GMT) ipfw: make 'ipfw show' output compatible with 'ipfw add' command If rule was added in compact form and rule body is empty, print 'proto ip' opcode to be compatible with ipfw(8) syntax parser. Before: $ ipfw add allow proto ip 000700 allow After: $ ipfw add allow proto ip 000700 allow proto ip (cherry picked from commit 706a03f61bbb6e0cf10e6c3727966495b30d763e) M sbin/ipfw/ipfw2.c ____________________________________________________________________________________________________________ Commit: a8c1ea2614a43922dff9598c7948df32473c720c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a8c1ea2614a43922dff9598c7948df32473c720c Author: Ed Maste (Wed 19 Feb 2025 19:33:38 GMT) Committer: Ed Maste (Thu 20 Feb 2025 17:56:24 GMT) openssh: Update to 9.9p2 This release exists primarily to fix two security bugs. The fixes have been independently imported into FreeBSD. This import serves to update the ssh and sshd version number. A few minor bug fixes are also included; see the upstream release notes for full details of the 9.9p2 release (https://www.openssh.com/releasenotes.html). Sponsored by: The FreeBSD Foundation (cherry picked from commit 0ae642c7dd0c2cfd965a22bf73876cd26cceadd2) Approved by: re (accelerated MFC) (cherry picked from commit 059b786b7db55b776d82748842f4d6d89cb79664) M crypto/openssh/.github/ci-status.md M crypto/openssh/ChangeLog M crypto/openssh/README M crypto/openssh/config.h M crypto/openssh/configure.ac M crypto/openssh/contrib/redhat/openssh.spec M crypto/openssh/contrib/suse/openssh.spec M crypto/openssh/defines.h M crypto/openssh/gss-serv.c M crypto/openssh/kexmlkem768x25519.c M crypto/openssh/libcrux_mlkem768_sha3.h M crypto/openssh/loginrec.c M crypto/openssh/misc.c M crypto/openssh/misc.h M crypto/openssh/mlkem768.sh M crypto/openssh/readconf.c M crypto/openssh/servconf.c M crypto/openssh/ssh_namespace.h M crypto/openssh/version.h ____________________________________________________________________________________________________________ Commit: 6e688e6d4f9305441adce78079beaf1030e2881b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6e688e6d4f9305441adce78079beaf1030e2881b Author: Ed Maste (Wed 19 Feb 2025 19:08:59 GMT) Committer: Ed Maste (Thu 20 Feb 2025 17:56:23 GMT) openssh: Update to 9.9p1 Highlights from the release notes are reproduced below. Bug fixes and improvements that were previously merged into FreeBSD have been elided. See the upstream release notes for full details of the 9.9p1 release (https://www.openssh.com/releasenotes.html). --- Future deprecation notice ========================= OpenSSH plans to remove support for the DSA signature algorithm in early 2025. Potentially-incompatible changes -------------------------------- * ssh(1): remove support for pre-authentication compression. * ssh(1), sshd(8): processing of the arguments to the "Match" configuration directive now follows more shell-like rules for quoted strings, including allowing nested quotes and \-escaped characters. New features ------------ * ssh(1), sshd(8): add support for a new hybrid post-quantum key exchange based on the FIPS 203 Module-Lattice Key Enapsulation mechanism (ML-KEM) combined with X25519 ECDH as described by https://datatracker.ietf.org/doc/html/draft-kampanakis-curdle-ssh-pq-ke-03 This algorithm "mlkem768x25519-sha256" is available by default. * ssh(1), sshd(8), ssh-agent(1): prevent private keys from being included in core dump files for most of their lifespans. This is in addition to pre-existing controls in ssh-agent(1) and sshd(8) that prevented coredumps. This feature is supported on OpenBSD, Linux and FreeBSD. * All: convert key handling to use the libcrypto EVP_PKEY API, with the exception of DSA. Bugfixes -------- * sshd(8): do not apply authorized_keys options when signature verification fails. Prevents more restrictive key options being incorrectly applied to subsequent keys in authorized_keys. bz3733 * ssh-keygen(1): include pathname in some of ssh-keygen's passphrase prompts. Helps the user know what's going on when ssh-keygen is invoked via other tools. Requested in GHPR503 * ssh(1), ssh-add(1): make parsing user@host consistently look for the last '@' in the string rather than the first. This makes it possible to more consistently use usernames that contain '@' characters. * ssh(1), sshd(8): be more strict in parsing key type names. Only allow short names (e.g "rsa") in user-interface code and require full SSH protocol names (e.g. "ssh-rsa") everywhere else. bz3725 * ssh-keygen(1): clarify that ed25519 is the default key type generated and clarify that rsa-sha2-512 is the default signature scheme when RSA is in use. GHPR505 --- Reviewed by: jlduran (build infrastructure) Reviewed by: cy (build infrastructure) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48947 (cherry picked from commit 3d9fd9fcb432750f3716b28f6ccb0104cd9d351a) Approved by: re (accelerated MFC) (cherry picked from commit 802386cd37f638eec9606cb10d3dd03c8f1d6c17) M crypto/openssh/.depend M crypto/openssh/.github/ci-status.md M crypto/openssh/.github/configs M crypto/openssh/.github/setup_ci.sh M crypto/openssh/.github/workflows/c-cpp.yml M crypto/openssh/.github/workflows/selfhosted.yml M crypto/openssh/ChangeLog M crypto/openssh/LICENCE M crypto/openssh/Makefile.in M crypto/openssh/README M crypto/openssh/auth.c M crypto/openssh/channels.c M crypto/openssh/channels.h M crypto/openssh/cipher.c M crypto/openssh/config.h M crypto/openssh/configure.ac M crypto/openssh/contrib/redhat/openssh.spec M crypto/openssh/contrib/ssh-copy-id M crypto/openssh/contrib/ssh-copy-id.1 M crypto/openssh/contrib/suse/openssh.spec M crypto/openssh/crypto_api.h M crypto/openssh/defines.h M crypto/openssh/kex-names.c M crypto/openssh/kex.c M crypto/openssh/kex.h M crypto/openssh/kexc25519.c M crypto/openssh/kexgen.c A crypto/openssh/kexmlkem768x25519.c M crypto/openssh/kexsntrup761x25519.c A crypto/openssh/libcrux_mlkem768_sha3.h M crypto/openssh/loginrec.c M crypto/openssh/match.c A crypto/openssh/mlkem768.sh M crypto/openssh/moduli M crypto/openssh/monitor.c M crypto/openssh/mux.c M crypto/openssh/myproposal.h M crypto/openssh/nchan.c M crypto/openssh/openbsd-compat/arc4random.h M crypto/openssh/openbsd-compat/openssl-compat.c M crypto/openssh/openbsd-compat/openssl-compat.h M crypto/openssh/openbsd-compat/port-linux.c M crypto/openssh/packet.c M crypto/openssh/packet.h M crypto/openssh/readconf.c M crypto/openssh/regress/cfginclude.sh M crypto/openssh/regress/misc/fuzz-harness/Makefile A crypto/openssh/regress/misc/fuzz-harness/mkcorpus_sntrup761.c A crypto/openssh/regress/misc/fuzz-harness/sntrup761_dec_fuzz.cc A crypto/openssh/regress/misc/fuzz-harness/sntrup761_enc_fuzz.cc A crypto/openssh/regress/misc/fuzz-harness/watch-sntrup761.sh M crypto/openssh/regress/multiplex.sh M crypto/openssh/regress/rekey.sh M crypto/openssh/regress/unittests/kex/Makefile M crypto/openssh/regress/unittests/kex/test_kex.c M crypto/openssh/regress/unittests/sshkey/common.c M crypto/openssh/regress/unittests/sshkey/test_file.c M crypto/openssh/regress/unittests/sshkey/test_sshkey.c M crypto/openssh/regress/unittests/test_helper/fuzz.c M crypto/openssh/servconf.c M crypto/openssh/servconf.h M crypto/openssh/sntrup761.c M crypto/openssh/sntrup761.sh M crypto/openssh/srclimit.c M crypto/openssh/srclimit.h M crypto/openssh/ssh-add.c M crypto/openssh/ssh-ecdsa-sk.c M crypto/openssh/ssh-ecdsa.c M crypto/openssh/ssh-keygen.1 M crypto/openssh/ssh-keygen.c M crypto/openssh/ssh-keyscan.c M crypto/openssh/ssh-pkcs11-client.c M crypto/openssh/ssh-pkcs11-helper.c M crypto/openssh/ssh-pkcs11.c M crypto/openssh/ssh-rsa.c M crypto/openssh/ssh-sk.c M crypto/openssh/ssh.1 M crypto/openssh/ssh_api.c M crypto/openssh/ssh_config.5 M crypto/openssh/ssh_namespace.h M crypto/openssh/sshbuf-getput-crypto.c M crypto/openssh/sshbuf.c M crypto/openssh/sshbuf.h M crypto/openssh/sshconnect2.c M crypto/openssh/sshd-session.c M crypto/openssh/sshd.8 M crypto/openssh/sshd.c M crypto/openssh/sshd_config.5 M crypto/openssh/sshkey.c M crypto/openssh/sshkey.h M crypto/openssh/version.h M secure/lib/libssh/Makefile ____________________________________________________________________________________________________________ Commit: c845ae475579d9b38cd1e3061f3896b44d1cb172 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c845ae475579d9b38cd1e3061f3896b44d1cb172 Author: Ed Maste (Wed 19 Feb 2025 17:20:44 GMT) Committer: Ed Maste (Thu 20 Feb 2025 17:56:23 GMT) openssh: Update to 9.8p1 Highlights from the release notes are reproduced below. Some security and bug fixes were previously merged into FreeBSD and have been elided. See the upstream release notes for full details (https://www.openssh.com/releasenotes.html). --- Future deprecation notice ========================= OpenSSH plans to remove support for the DSA signature algorithm in early 2025. Potentially-incompatible changes -------------------------------- * sshd(8): the server will now block client addresses that repeatedly fail authentication, repeatedly connect without ever completing authentication or that crash the server. See the discussion of PerSourcePenalties below for more information. Operators of servers that accept connections from many users, or servers that accept connections from addresses behind NAT or proxies may need to consider these settings. * sshd(8): the server has been split into a listener binary, sshd(8), and a per-session binary "sshd-session". This allows for a much smaller listener binary, as it no longer needs to support the SSH protocol. As part of this work, support for disabling privilege separation (which previously required code changes to disable) and disabling re-execution of sshd(8) has been removed. Further separation of sshd-session into additional, minimal binaries is planned for the future. * sshd(8): several log messages have changed. In particular, some log messages will be tagged with as originating from a process named "sshd-session" rather than "sshd". * ssh-keyscan(1): this tool previously emitted comment lines containing the hostname and SSH protocol banner to standard error. This release now emits them to standard output, but adds a new "-q" flag to silence them altogether. * sshd(8): (portable OpenSSH only) sshd will no longer use argv[0] as the PAM service name. A new "PAMServiceName" sshd_config(5) directive allows selecting the service name at runtime. This defaults to "sshd". bz2101 New features ------------ * sshd(8): sshd(8) will now penalise client addresses that, for various reasons, do not successfully complete authentication. This feature is controlled by a new sshd_config(5) PerSourcePenalties option and is on by default. * ssh(8): allow the HostkeyAlgorithms directive to disable the implicit fallback from certificate host key to plain host keys. Portability ----------- * sshd(8): expose SSH_AUTH_INFO_0 always to PAM auth modules unconditionally. The previous behaviour was to expose it only when particular authentication methods were in use. * ssh(1), ssh-agent(8): allow the presence of the WAYLAND_DISPLAY environment variable to enable SSH_ASKPASS, similarly to the X11 DISPLAY environment variable. GHPR479 --- Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48914 (cherry picked from commit 0fdf8fae8b569bf9fff3b5171e669dcd7cf9c79e) (cherry picked from commit b4bb480ae9294d7e4b375f0ead9ae57517c79ef3) (cherry picked from commit e95979047aec384852102cf8bb1d55278ea77eeb) (cherry picked from commit dcb4ae528d357f34e4a4b4882c2757c67c98e395) Approved by: re (accelerated MFC) (cherry picked from commit ff2fd01609cc10bcdc87ebe4de42efaf7ffe2ee9) M crypto/openssh/.depend M crypto/openssh/.git_allowed_signers M crypto/openssh/.git_allowed_signers.asc M crypto/openssh/.github/ci-status.md M crypto/openssh/.github/configs M crypto/openssh/.github/run_test.sh M crypto/openssh/.github/workflows/c-cpp.yml M crypto/openssh/.github/workflows/cifuzz.yml M crypto/openssh/.github/workflows/selfhosted.yml M crypto/openssh/.github/workflows/upstream.yml M crypto/openssh/.gitignore M crypto/openssh/.skipped-commit-ids M crypto/openssh/ChangeLog M crypto/openssh/Makefile.in M crypto/openssh/PROTOCOL.agent M crypto/openssh/PROTOCOL.key M crypto/openssh/README M crypto/openssh/addr.c M crypto/openssh/auth-pam.c M crypto/openssh/auth-pam.h M crypto/openssh/auth-rhosts.c M crypto/openssh/auth.c M crypto/openssh/auth.h M crypto/openssh/auth2-gss.c M crypto/openssh/auth2-hostbased.c M crypto/openssh/auth2-kbdint.c A crypto/openssh/auth2-methods.c M crypto/openssh/auth2-none.c M crypto/openssh/auth2-passwd.c M crypto/openssh/auth2-pubkey.c M crypto/openssh/auth2.c M crypto/openssh/channels.c M crypto/openssh/channels.h M crypto/openssh/cipher.c M crypto/openssh/clientloop.c M crypto/openssh/clientloop.h M crypto/openssh/config.h M crypto/openssh/configure.ac M crypto/openssh/contrib/redhat/openssh.spec M crypto/openssh/contrib/suse/openssh.spec M crypto/openssh/ed25519.sh A crypto/openssh/kex-names.c M crypto/openssh/kex.c M crypto/openssh/kex.h M crypto/openssh/kexgexs.c M crypto/openssh/log.c M crypto/openssh/log.h M crypto/openssh/m4/openssh.m4 M crypto/openssh/misc.c M crypto/openssh/misc.h M crypto/openssh/moduli M crypto/openssh/monitor.c M crypto/openssh/monitor.h M crypto/openssh/monitor_wrap.c M crypto/openssh/monitor_wrap.h M crypto/openssh/msg.c M crypto/openssh/openbsd-compat/getrrsetbyname.c M crypto/openssh/openbsd-compat/port-linux.c M crypto/openssh/openbsd-compat/port-linux.h M crypto/openssh/packet.c M crypto/openssh/packet.h M crypto/openssh/pathnames.h A crypto/openssh/platform-listen.c M crypto/openssh/platform.c M crypto/openssh/platform.h M crypto/openssh/readconf.c M crypto/openssh/readpass.c M crypto/openssh/regress/Makefile M crypto/openssh/regress/cfgmatchlisten.sh M crypto/openssh/regress/dropbear-ciphers.sh M crypto/openssh/regress/dropbear-kex.sh M crypto/openssh/regress/key-options.sh M crypto/openssh/regress/misc/fuzz-harness/agent_fuzz_helper.c M crypto/openssh/regress/misc/fuzz-harness/kex_fuzz.cc M crypto/openssh/regress/misc/fuzz-harness/sig_fuzz.cc A crypto/openssh/regress/penalty-expire.sh A crypto/openssh/regress/penalty.sh M crypto/openssh/regress/percent.sh M crypto/openssh/regress/rekey.sh M crypto/openssh/regress/sftp-cmds.sh M crypto/openssh/regress/test-exec.sh M crypto/openssh/regress/unittests/kex/Makefile M crypto/openssh/regress/unittests/kex/test_kex.c M crypto/openssh/regress/yes-head.sh M crypto/openssh/scp.c M crypto/openssh/servconf.c M crypto/openssh/servconf.h M crypto/openssh/serverloop.c M crypto/openssh/session.c M crypto/openssh/sftp-client.c M crypto/openssh/sftp-server.c M crypto/openssh/sftp.c M crypto/openssh/srclimit.c M crypto/openssh/srclimit.h M crypto/openssh/ssh-add.1 M crypto/openssh/ssh-gss.h M crypto/openssh/ssh-keygen.1 M crypto/openssh/ssh-keyscan.1 M crypto/openssh/ssh-keyscan.c M crypto/openssh/ssh-keysign.8 M crypto/openssh/ssh-keysign.c M crypto/openssh/ssh-pkcs11.c M crypto/openssh/ssh.1 M crypto/openssh/ssh_api.c M crypto/openssh/ssh_config.5 M crypto/openssh/ssh_namespace.h M crypto/openssh/sshconnect.c M crypto/openssh/sshconnect.h M crypto/openssh/sshconnect2.c A crypto/openssh/sshd-session.c M crypto/openssh/sshd.8 M crypto/openssh/sshd.c M crypto/openssh/sshd_config.5 M crypto/openssh/sshkey.h M crypto/openssh/version.h M secure/lib/libssh/Makefile M secure/libexec/Makefile A secure/libexec/sshd-session/Makefile M secure/usr.sbin/sshd/Makefile ____________________________________________________________________________________________________________ Commit: 63d3c245221d79f16b59771e84467bdd1abf11dd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=63d3c245221d79f16b59771e84467bdd1abf11dd Author: Ed Maste (Thu 6 Feb 2025 19:21:12 GMT) Committer: Ed Maste (Thu 20 Feb 2025 13:21:02 GMT) libssh: Remove progressmeter It is used only by scp and sftp, and already included directly in their Makefiles. It does not belong in libssh. Fixes: d8b043c8d497 ("Update for 3.6.1p1; also remove Kerberos IV shims.") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48871 (cherry picked from commit c0af32952564099fe30a34aeb335f95a6dc811ba) (cherry picked from commit 8a02eb2c1e4f3847fccf3eb1e7ff914871e35be4) M secure/lib/libssh/Makefile ____________________________________________________________________________________________________________ Commit: 10e9add50f9358b6b74e1d481b270ba32f3e85da URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=10e9add50f9358b6b74e1d481b270ba32f3e85da Author: Ed Maste (Sun 9 Feb 2025 20:37:24 GMT) Committer: Ed Maste (Thu 20 Feb 2025 13:21:02 GMT) ssh: Move XAUTH_PATH setting to ssh.mk XAUTH_PATH is normally set (in the upstream build infrastructure) in config.h. We previously set it in ssh and sshd's Makefiles if LOCALBASE is set, and over time have sometimes also defined it in config.h. Leave it unset in config.h and move the CFLAGS logic to to ssh.mk so that it will be set when building all ssh libraries and programs but still be set by LOCALBASE. Reviewed by: jlduran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48907 (cherry picked from commit a63701848fe5462c4e8bbff0131bb42979e603ec) (cherry picked from commit 73dd56ffcd7b2c46de58980ac888c0421e3ec0b6) M crypto/openssh/config.h M secure/ssh.mk M secure/usr.bin/ssh/Makefile M secure/usr.sbin/sshd/Makefile ____________________________________________________________________________________________________________ Commit: 935e29dcdd84a763ce804293dd385c2126d2ec8f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=935e29dcdd84a763ce804293dd385c2126d2ec8f Author: Ed Maste (Fri 24 Jan 2025 21:15:22 GMT) Committer: Ed Maste (Thu 20 Feb 2025 13:21:02 GMT) ssh_config.5: Remove redundant CheckHostIP default text In 2000 (commit a95c1225217b) we changed the CheckHostIP default to "no". We added text to ssh_config(5) documenting FreeBSD's default. In 2021 OpenSSH made the same change, released with OpenSSH 8.5p1. When we imported the update the added text remained, resulting in: If the option is set to no (the default), the check will not be executed. The default is no. Remove the now-redundant text. Fixes: 206be79acbde ("Vendor import of OpenSSH 8.5p1") Sponsored by: The FreeBSD Foundation (cherry picked from commit 06016adaccca1958cdde4edf845f5b972be7ffc0) (cherry picked from commit 2c97e333166d4f6f6b84da60b96a82982bb19649) M crypto/openssh/ssh_config.5 ____________________________________________________________________________________________________________ Commit: fb4102bc52a69e6736d69818460c01c253bd8753 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fb4102bc52a69e6736d69818460c01c253bd8753 Author: Ed Maste (Mon 20 Jan 2025 20:04:20 GMT) Committer: Ed Maste (Thu 20 Feb 2025 02:49:24 GMT) vtfontcvt: Improve error message for unsupported DWIDTH vtfontcvt requires that all glyphs are 1x or 2x a common width, reporting for example "bitmap with unsupported DWIDTH 27 0 on line xxx" if the font is expected to be 32 pixels wide. Add the expected / permitted values to the error message to make the issue more clear - for the same example, "bitmap with unsupported DWIDTH 27 0 (not 32 or 64)". Reviewed by: ziaee Sponsored by: The FreeBSD Foundation (cherry picked from commit 3433daae0d20d55503084c4d17b8a3e685657ad2) (cherry picked from commit 036ce9b76e0ac5bb3a611a4b259a39e3158c25d4) M usr.bin/vtfontcvt/vtfontcvt.c ____________________________________________________________________________________________________________ Commit: fd3016b17efbfb351c62921e4ec1ac3812baffab URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fd3016b17efbfb351c62921e4ec1ac3812baffab Author: Li-Wen Hsu (Wed 23 Oct 2024 22:03:07 BST) Committer: Ed Maste (Wed 19 Feb 2025 19:52:36 GMT) Canonicalize the name of the FreeBSD Foundation Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit dab59af3bcc7cb7ba01569d3044894b3e860ad56) (cherry picked from commit ef3ed0726f2230e38df76a32a3b9ff145147af65) M crypto/openssh/blacklist.c M crypto/openssh/blacklist_client.h M lib/libc/sys/_umtx_op.2 M lib/libc/sys/fsync.2 M lib/libc/sys/sigfastblock.2 M lib/libc/sys/thr_exit.2 M lib/libc/sys/thr_kill.2 M lib/libc/sys/thr_new.2 M lib/libc/sys/thr_self.2 M lib/libc/sys/thr_set_name.2 M lib/libc/sys/thr_suspend.2 M lib/libc/sys/thr_wake.2 M lib/libc/x86/sys/pkru.3 M lib/libthr/libthr.3 M sbin/ldconfig/ldconfig.8 M share/man/man3/pthread_mutex_consistent.3 M share/man/man3/pthread_mutexattr.3 M share/man/man4/nvdimm.4 M share/man/man5/fdescfs.5 M share/man/man5/tmpfs.5 M share/man/man7/security.7 M share/man/man9/VOP_READ_PGCACHE.9 M share/man/man9/refcount.9 M stand/man/loader.efi.8 M sys/dev/mgb/if_mgb.c M sys/dev/mgb/if_mgb.h M usr.bin/posixshmcontrol/posixshmcontrol.1 M usr.bin/proccontrol/proccontrol.1 ____________________________________________________________________________________________________________ Commit: 4ddbb7945c633f2675daac78b70c3450e67d0498 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4ddbb7945c633f2675daac78b70c3450e67d0498 Author: Colin Percival (Wed 19 Feb 2025 19:21:04 GMT) Committer: Colin Percival (Wed 19 Feb 2025 19:25:50 GMT) pkg-stage.sh: kde5 -> kde The "kde5" package no longer exists; KDE goes to 6. Note: Depending on the size of 13.5-BETA3 DVD images, KDE might end up being removed from this list in the near future. With hat: re@ MFC after: 30 seconds Sponsored by: Amazon (cherry picked from commit 0d7b98c06c5ec9638020844ee460af075cfc6e54) M release/scripts/pkg-stage.sh ____________________________________________________________________________________________________________ Commit: 2dcc11d82758b0b1320dbc16c8ce30b0f8d5b4c5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2dcc11d82758b0b1320dbc16c8ce30b0f8d5b4c5 Author: Jose Luis Duran (Wed 12 Feb 2025 15:31:43 GMT) Committer: Jose Luis Duran (Wed 19 Feb 2025 16:23:59 GMT) uath: Avoid a NULL dereference PR: 284643 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284643 ) Reviewed by: adrian Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48948 (cherry picked from commit 4b77a9a80cf8a9cba5607d8d8fa0742334dcf0f4) M sys/dev/usb/wlan/if_uath.c ____________________________________________________________________________________________________________ Commit: b2674931a281a9d99f8e716d977ffad7f160f2a0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b2674931a281a9d99f8e716d977ffad7f160f2a0 Author: Ed Maste (Wed 23 Feb 2022 18:33:24 GMT) Committer: Ed Maste (Wed 19 Feb 2025 15:26:58 GMT) ssh: update FREEBSD-upgrade instructions Make it clear that the 'freebsd-configure.sh' and 'freebsd-namespace.sh' scripts are run from the crypto/openssh directory. Sponsored by: The FreeBSD Foundation (cherry picked from commit 6834ca8a434b1b934f21bbc068c90ae5c7fec7ef) M crypto/openssh/FREEBSD-upgrade ____________________________________________________________________________________________________________ Commit: 2fc62d0bd4f7ca90d7abdfaf076dd49022bf7d54 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2fc62d0bd4f7ca90d7abdfaf076dd49022bf7d54 Author: Ed Maste (Wed 19 Feb 2025 14:00:42 GMT) Committer: Ed Maste (Wed 19 Feb 2025 15:02:39 GMT) ssh: Bump VersionAddendum for CVE fixes Approved by: so Sponsored by: The FreeBSD Foundation (cherry picked from commit 62df41ae0a71e77ccb1e8fae06d82eec5dff441a) (cherry picked from commit 24ce323f020fb1ee1b463e524a7a6c15f47ec2a4) M crypto/openssh/ssh_config M crypto/openssh/ssh_config.5 M crypto/openssh/sshd_config M crypto/openssh/sshd_config.5 M crypto/openssh/version.h ____________________________________________________________________________________________________________ Commit: 8c67967cb14b0ab7e26ffa9ab6cef470a154e030 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8c67967cb14b0ab7e26ffa9ab6cef470a154e030 Author: Ed Maste (Wed 19 Feb 2025 03:03:26 GMT) Committer: Ed Maste (Wed 19 Feb 2025 15:02:39 GMT) ssh: Fix cases where error codes were not correctly set Obtained from: OpenSSH 38df39ecf278 Security: CVE-2025-26465 Approved by: so Sponsored by: The FreeBSD Foundation (cherry picked from commit 170059d6d33cf4e890067097f3c0beb3061cabbd) (cherry picked from commit 4ad8c195cf54411e3b3fa0bec227eb83ca078404) M crypto/openssh/krl.c M crypto/openssh/ssh-agent.c M crypto/openssh/ssh-sk-client.c M crypto/openssh/sshconnect2.c M crypto/openssh/sshsig.c ____________________________________________________________________________________________________________ Commit: 3ea366f74475132a743f8667ecafe4a091a29d48 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3ea366f74475132a743f8667ecafe4a091a29d48 Author: Ed Maste (Wed 19 Feb 2025 03:00:45 GMT) Committer: Ed Maste (Wed 19 Feb 2025 15:02:39 GMT) ssh: Don't reply to PING in preauth phase or during KEX Obtained from: OpenSSH 5e07dee272c3 Security: CVE-2025-26466 Approved by: so Sponsored by: The FreeBSD Foundation (cherry picked from commit 8a16d0831e70530b2fbd682e748bd051de35f192) (cherry picked from commit 34798cb576bbd2064ab8da372112482bf8e2a7e6) M crypto/openssh/packet.c ____________________________________________________________________________________________________________ Commit: f84494807ec4cc393e09bc6e37d574fd2a691f4a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f84494807ec4cc393e09bc6e37d574fd2a691f4a Author: Kristof Provost (Tue 4 Feb 2025 16:19:55 GMT) Committer: Kristof Provost (Tue 18 Feb 2025 16:49:42 GMT) pf: fix fragment hole count Fragment reassembly finishes when no holes are left in the fragment queue. In certain overlap conditions, the hole counter was wrong and pf(4) created an incomplete IP packet. Before adjusting the length, remove the overlapping fragment from the queue and insert it again afterwards. pf_frent_remove() and pf_frent_insert() adjust the hole counter automatically. bug reported and fix tested by Lucas Aubard with Johan Mazel, Gilles Guette and Pierre Chifflier; OK claudio@ MFC after: 1 week Obtained from: OpenBSD, bluhm , 9915416fe8 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8b2feafb535d10a559b995c6fc2529715f927e2a) M sys/netpfil/pf/pf_norm.c ____________________________________________________________________________________________________________ Commit: a5b6cff9a6ce7f57c4489a715dd30254823a770b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a5b6cff9a6ce7f57c4489a715dd30254823a770b Author: Kristof Provost (Thu 9 Jan 2025 13:11:11 GMT) Committer: Kristof Provost (Tue 18 Feb 2025 16:49:42 GMT) pf: do not keep state when dropping overlapping IPv6 fragments ok sperreault@ Obtained from: OpenBSD, bluhm , cd45765685 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 3b79f6d2d39405bcac395dc036ceb6f8fd09ce99) M sys/netpfil/pf/pf_norm.c ____________________________________________________________________________________________________________ Commit: a61c2617f1894c1e09297334160a1ddbe9f32652 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a61c2617f1894c1e09297334160a1ddbe9f32652 Author: Kristof Provost (Wed 8 Jan 2025 13:34:22 GMT) Committer: Kristof Provost (Tue 18 Feb 2025 16:49:42 GMT) pf: drop IPv6 packets built from overlapping fragments in pf reassembly The reassembly state will be dropped after timeout, all related fragments are dropped until that. This is conforming to RFC 5722. - Sort pf_fragment fields while there. - If the fr_queue is empty, we had overlapping fragments, don't add new ones. - If we detect overlapping IPv6 fragments, flush the fr_queue and drop all fragments immediately. - Rearrange debug output, to make clear what happens. - An IPv4 fragment that is totaly overlapped does not inclease the bad fragment counter. - Put an KASSERT into pf_isfull_fragment() to make sure that the fr_queue is never emtpy there. discussed with Fernando Gont; ok henning@ Obtained from: OpenBSD, bluhm , 8b45f36762 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 6a3266f72e437aecf3edcfb8aa919466b270d548) M sys/netpfil/pf/pf_norm.c M tests/sys/netpfil/pf/frag6.py ____________________________________________________________________________________________________________ Commit: 91ff75b756ec4563e3cc2c466e3841462451794d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=91ff75b756ec4563e3cc2c466e3841462451794d Author: Kristof Provost (Wed 5 Feb 2025 14:52:15 GMT) Committer: Kristof Provost (Tue 18 Feb 2025 16:49:41 GMT) pf.conf.5: fix ≤ pf.conf expects <=, not ≤ (and the same applies to ≥ and >=). Make sure the man page reflects this. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 85c333a947e950d9267517afd1d9c30a655b7bfb) M share/man/man5/pf.conf.5 ____________________________________________________________________________________________________________ Commit: 904510b2ac56900be976dbe739cfb64cb3d37a24 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=904510b2ac56900be976dbe739cfb64cb3d37a24 Author: Zhenlei Huang (Thu 13 Feb 2025 14:42:45 GMT) Committer: Zhenlei Huang (Tue 18 Feb 2025 15:23:37 GMT) powerpc: Remove flag CTLFLAG_TUN from sysctl knob hw.platform Prior to change [1] this flag is useless but harmless. After the change plat_name[] will be fetched from kernel environment after invoking the platform probe function `platform_probe_and_attach()`. The probe function runs at early boot stage prior to `mi_startup()` thus it is too late and pointless to set plat_name[] after the probe. Nathan mentioned that the logic to specify the platform pre-dates the powerpc64 work, and is from the original pre-FDT Book-E bringup from like 2008, so it's irrelevant these days. Instead of fixing setting the sysctl knob hw.platform, let's clean it up now. [1] 3da1cf1e88f8 Extend the meaning of the CTLFLAG_TUN flag to ... Discussed with: nwhitehorn Reviewed by: olce (previous version), jhibbits, #powerpc MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D48897 (cherry picked from commit b61fbbed73ea3bf0c84589b56cca160c46a3739d) (cherry picked from commit 7775f4c5c75221cd9b2aadf12fb1d9a329c08be4) M sys/powerpc/powerpc/platform.c ____________________________________________________________________________________________________________ Commit: d22c7294544e8b672c959b7374ee5c0e863af7f4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d22c7294544e8b672c959b7374ee5c0e863af7f4 Author: Kevin Bowling (Mon 10 Feb 2025 04:02:17 GMT) Committer: Kevin Bowling (Tue 18 Feb 2025 03:27:25 GMT) ixgbe: x550 support for 1000BASE-BX SFP modules Add support for 1Gbit BiDi modules to x550 derivatives (cherry picked from commit 183621655613bcc97e4ec7d22adbc829347ed426) M sys/dev/ixgbe/ixgbe_x550.c ____________________________________________________________________________________________________________ Commit: 8bd278e2707e9522210a1ee164f78a7cacc2e48d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8bd278e2707e9522210a1ee164f78a7cacc2e48d Author: Jose Luis Duran (Mon 17 Feb 2025 20:27:31 GMT) Committer: Jose Luis Duran (Mon 17 Feb 2025 20:49:30 GMT) mtree: Add missing directories generated by certctl This is a direct commit to the stable/13 branch, cherry-picking commit 5b7f73ce16cb ("mtree: Add missing directories generated by certctl"), because the "untrusted" directory is called "blacklisted" on stable/13. PR: 255639 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255639 ) Reviewed by: imp Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D49037 M etc/mtree/BSD.root.dist ____________________________________________________________________________________________________________ Commit: 057598ba1862047c22a31153ffdc9631cf7762ca URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=057598ba1862047c22a31153ffdc9631cf7762ca Author: Jose Luis Duran (Mon 17 Feb 2025 20:08:46 GMT) Committer: Jose Luis Duran (Mon 17 Feb 2025 20:11:19 GMT) mtree: Add missing flua entry This is a direct commit to the stable/14 and stable/13 branch. Reviewed by: emaste Approved by: emaste (mentor) Fixes: bceabe277e12 ("flua: initial support for "require" in the base system") Differential Revision: https://reviews.freebsd.org/D49011 M etc/mtree/BSD.debug.dist ____________________________________________________________________________________________________________ Commit: ff2588f2ac0a7a4d15496e2654f22d4d300037bf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ff2588f2ac0a7a4d15496e2654f22d4d300037bf Author: Andrey V. Elsukov (Mon 10 Feb 2025 07:58:23 GMT) Committer: Andrey V. Elsukov (Mon 17 Feb 2025 07:40:29 GMT) ipfw: add missing initializer for 'limit' table value PR: 284691 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284691 ) (cherry picked from commit 95ab7b3223c08cf48ccf764815523ea995a7ea0e) M sys/netpfil/ipfw/ip_fw_table_value.c ____________________________________________________________________________________________________________ Commit: b6490ad408d0049c5e6ab73aa94151ab33b4106e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b6490ad408d0049c5e6ab73aa94151ab33b4106e Author: Jose Luis Duran (Thu 13 Feb 2025 17:05:33 GMT) Committer: Jose Luis Duran (Sun 16 Feb 2025 04:15:31 GMT) ObsoleteFiles.inc: Remove test debug file from wrong dir Reported by: des Reviewed by: des, emaste Approved by: emaste (mentor) Fixes: 88d448ec815c ("mk: Move vm stack test debug symbols") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48991 (cherry picked from commit e159dcc37e6f538d3d61ea3b2d08b052cf0e0ced) M ObsoleteFiles.inc ____________________________________________________________________________________________________________ Commit: a06369238d7df8c0b691b3a1617d5e2f337b63b2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a06369238d7df8c0b691b3a1617d5e2f337b63b2 Author: Kevin Bowling (Thu 13 Feb 2025 18:22:50 GMT) Committer: Kevin Bowling (Sun 16 Feb 2025 00:26:50 GMT) igc: Remove unused register IGC_RXD_SPC_VLAN_MASK We don't use legacy receive descriptors and masking out the vlan ID isn't necessary since the tag is in the standard format, so remove it. (cherry picked from commit 124b7722aad7d4cf12d96c030659aef78175aa9c) M sys/dev/igc/igc_defines.h ____________________________________________________________________________________________________________ Commit: e812e4d86d283ea65c6275e20b23bbddb9bd97d8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e812e4d86d283ea65c6275e20b23bbddb9bd97d8 Author: Aurelien Cazuc (Thu 13 Feb 2025 18:08:42 GMT) Committer: Kevin Bowling (Sun 16 Feb 2025 00:26:40 GMT) e1000: Fix vlan PCP/DEI on lem(4) The vlan PCP and CFI/DEI were discarded when receiving vlan tagged packets on lem(4) interfaces with vlanhwtag. According to the 82540 SDM[1] (pg. 24), vlan tag is in the standard format, so there's no reason to discard PCP/DEI. [1]: http://iommu.com/datasheets/ethernet/controllers-nics/intel/e1000/pci-pci-x-family-gbe-controllers-software-dev-manual.pdf Sponsored by: Stormshield (author) Differential Revision: https://reviews.freebsd.org/D48987 (cherry picked from commit 4b29599fbbe33b75b7b58cfc5deea7a881e9a10e) M sys/dev/e1000/e1000_defines.h M sys/dev/e1000/em_txrx.c ____________________________________________________________________________________________________________ Commit: b26592d87dbedb202b4b75f8515165deb7e234d0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b26592d87dbedb202b4b75f8515165deb7e234d0 Author: Tore Amundsen (Wed 6 Nov 2024 21:31:01 GMT) Committer: Kevin Bowling (Sun 16 Feb 2025 00:26:26 GMT) ixgbe: Add support for 1000BASE-BX SFP modules Add support for 1Gbit BiDi modules Signed-off-by: Tore Amundsen Relnotes: yes Pull Request: https://github.com/freebsd/freebsd-src/pull/1518 (cherry picked from commit 89d4096950c4db748e39758c941cfb708c2ff808) M sys/dev/ixgbe/if_ix.c M sys/dev/ixgbe/ixgbe_82599.c M sys/dev/ixgbe/ixgbe_phy.c M sys/dev/ixgbe/ixgbe_phy.h M sys/dev/ixgbe/ixgbe_type.h ____________________________________________________________________________________________________________ Commit: 4759b165d5985d6c3b0beb928a1f99efe79b294e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4759b165d5985d6c3b0beb928a1f99efe79b294e Author: Kevin Bowling (Tue 11 Feb 2025 03:40:51 GMT) Committer: Kevin Bowling (Fri 14 Feb 2025 01:25:09 GMT) ixgbe: Add ixgbe_dev_from_hw() back This got lost many years ago in 8eb6488ebb0dcd92517625e4833ddf7d26e3b3a3 It is used by the driver's DBG printfs. (cherry picked from commit bf6f0db8a762966b08430692c92ae34e667948db) M sys/dev/ixgbe/ixgbe_osdep.c M sys/dev/ixgbe/ixgbe_osdep.h ____________________________________________________________________________________________________________ Commit: 749ec2967ed3e157d6cd6cbe85b0ae953ae114c6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=749ec2967ed3e157d6cd6cbe85b0ae953ae114c6 Author: John Baldwin (Fri 3 Jan 2025 15:41:36 GMT) Committer: John Baldwin (Thu 13 Feb 2025 17:49:06 GMT) pac: Consistently use item count as the first argument to calloc Reported by: GCC 14 -Wcalloc-transposed-args (cherry picked from commit 22956bc9dc907296196a37525a6726f6ba2c06ed) M usr.sbin/lpr/pac/pac.c ____________________________________________________________________________________________________________ Commit: 74a5a7d842367f239c7d6f628c3a97f9a467ed84 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=74a5a7d842367f239c7d6f628c3a97f9a467ed84 Author: John Baldwin (Fri 3 Jan 2025 15:39:44 GMT) Committer: John Baldwin (Thu 13 Feb 2025 17:49:02 GMT) pac: Use strdup and asprintf in place of dubious string building GCC 14 warned about transposed arguments to calloc, but these cases are better served by more abstract string functions. (cherry picked from commit f94513a3a36b50823c3918c93ee5c6bf5f525e91) M usr.sbin/lpr/pac/pac.c ____________________________________________________________________________________________________________ Commit: dcd7286d902774428c08b179a72bfdcd4556ec06 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dcd7286d902774428c08b179a72bfdcd4556ec06 Author: Zhenlei Huang (Sun 9 Feb 2025 17:17:11 GMT) Committer: Zhenlei Huang (Thu 13 Feb 2025 10:23:04 GMT) sysctl: Harden sysctl_handle_string() against unterminated string In case a variable string which is not null-terminated is passed in, strlen() may report a length exceeding the max length, hence it is possible to leak a portion of kernel memory to the userland. Harden that by using strnlen() to limit the length to the max length. While here, refactor the code a little to improve readability. Note that, when calculating the out length, the null terminator '\0' of the string is taken into account if available. This is not really necessary but userland applications may have already relied on this behavior. Reviewed by: avg, kib, olce Fixes: 210176ad76ee sysctl(9): add CTLFLAG_NEEDGIANT flag MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D48881 (cherry picked from commit 1951235537fb62150f1bb15dd7e170ac30853d35) (cherry picked from commit 8ca77f9f9ece9d89161d080eee6a1aa706001878) M sys/kern/kern_sysctl.c ____________________________________________________________________________________________________________ Commit: 87836ab994c2ff9d442f84c174bd1fdead3cfa27 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=87836ab994c2ff9d442f84c174bd1fdead3cfa27 Author: Zhenlei Huang (Sun 9 Feb 2025 15:53:29 GMT) Committer: Zhenlei Huang (Thu 13 Feb 2025 10:23:03 GMT) MAC: mac_biba, mac_lomac: Fix setting loader tunables A string loader tunable requires setting the len parameter to a nonzero value, typically the size of the string, to have the flag CTLFLAG_TUN work correctly [1] [2]. Without this fix security.mac.{biba,lomac}.trusted_interfaces would have no effect at all. [1] 3da1cf1e88f8 Extend the meaning of the CTLFLAG_TUN flag to automatically ... [2] 6a3287f889b0 Fix regression issue after r267961. Handle special string case ... Reviewed by: olce, kib Fixes: af3b2549c4ba Pull in r267961 and r267973 again ... MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48898 (cherry picked from commit 7d4c0fac8c7db9c5741ba98a8b3ce3c43feb1cf4) (cherry picked from commit 04f360b782205c799b9302ba8bd810f7a303017f) M sys/security/mac_biba/mac_biba.c M sys/security/mac_lomac/mac_lomac.c ____________________________________________________________________________________________________________ Commit: 9370c2c331255beac5e451c7841e68b2302ebf91 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9370c2c331255beac5e451c7841e68b2302ebf91 Author: Ronald Klop (Mon 10 Feb 2025 18:41:26 GMT) Committer: Dimitry Andric (Thu 13 Feb 2025 08:23:59 GMT) Remove obsolete clang18 files for aarch64 This fixes a warning from "make delete-old" about a non-empty directory on aarch64. Reviewed by: dim Fixes: 0fca6ea1d4ee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48904 (cherry picked from commit 09b435d3dc2a591fba08be04d5659d03cce08285) M ObsoleteFiles.inc ____________________________________________________________________________________________________________ Commit: 931b0990297e2c6307b41bda95c5225cdf48403c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=931b0990297e2c6307b41bda95c5225cdf48403c Author: Dag-Erling Smørgrav (Thu 30 Jan 2025 21:10:29 GMT) Committer: Dag-Erling Smørgrav (Thu 13 Feb 2025 00:39:04 GMT) unifdef: Fix collision check when adding symbols. findsym() is intended for use while parsing input, so it should not be called from addsym2() or indirectsym(), which are called before any input is processed. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D48733 (cherry picked from commit c63af363c2458aebc30c01cd0b93b4b902580019) M contrib/unifdef/unifdef.c M usr.bin/unifdef/tests/unifdef_test.sh ____________________________________________________________________________________________________________ Commit: e1dd07ede92382bdcc52b3093e8f2ec5d9c88467 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e1dd07ede92382bdcc52b3093e8f2ec5d9c88467 Author: Michael Tuexen (Mon 10 Feb 2025 21:16:20 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 14:07:19 GMT) icmp: use per rate limit randomized jitter Using the same random jitter for multiple rate limits allows an attacker to use one rate limiter to figure out the current jitter and then use this knowledge to de-randomize the other rate limiters. This can be mitigated by using a separate randomized jitter for each rate limiter. This issue was reported as issue number 10 in Keyu Man et al.: SCAD: Towards a Universal and Automated Network Side-Channel Vulnerability Detection Reviewed by: rrs, Peter Lei, glebius MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48804 (cherry picked from commit 923c223f27e792e51ca13c476428adbbf6887551) M sys/netinet/ip_icmp.c M sys/netinet6/icmp6.c ____________________________________________________________________________________________________________ Commit: bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0 Author: Michael Tuexen (Thu 12 Dec 2024 14:40:49 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 14:06:14 GMT) icmp: improve INVARIANTS check Actually check the conditions that are enforced by the error checking code instead of a condition which is * checking a number to be non-negative instead of positive * depending on a random number Perform the checks consistently for ICMPv4 and ICMPv6. Reviewed by: glebius, rrs, cc MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48001 (cherry picked from commit c9febea3dc8ac8e308e8fc5a2e74dd0313fdc5d2) M sys/netinet/ip_icmp.c M sys/netinet6/icmp6.c ____________________________________________________________________________________________________________ Commit: 1b4561cf4b46ffbbd8851aa40bd0402a6bba8906 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1b4561cf4b46ffbbd8851aa40bd0402a6bba8906 Author: Gleb Smirnoff (Tue 9 Apr 2024 00:54:19 BST) Committer: Michael Tuexen (Wed 12 Feb 2025 14:05:14 GMT) icmp: correct the assertion that checks limit + jitter Fixes: 4399e055ea610cdefa1470ad1ee614dd81ba5e56 (cherry picked from commit f7c4d12bcd5bd7f7fbf6bf9fa601c47e7f97bc5f) M sys/netinet/ip_icmp.c M sys/netinet6/icmp6.c ____________________________________________________________________________________________________________ Commit: 0b29ef1e3fd57940704dd40a834f98649adbe46e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0b29ef1e3fd57940704dd40a834f98649adbe46e Author: Gleb Smirnoff (Mon 25 Mar 2024 02:52:03 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 14:03:22 GMT) icmp: allow zero value for ICMP limits Zero means limit is disabled, so the value doesn't need to be checked against jitter value. Fixes: ac44739fd834f51cacb26485a4140fd482e20150 Fixes: a03aff88a14448c3084a0384082ec996d7213897 (cherry picked from commit 4399e055ea610cdefa1470ad1ee614dd81ba5e56) M sys/netinet/ip_icmp.c M sys/netinet6/icmp6.c ____________________________________________________________________________________________________________ Commit: 1cc0ac5ef37e134c26d93d4544633b458e46aa78 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1cc0ac5ef37e134c26d93d4544633b458e46aa78 Author: Gleb Smirnoff (Sun 24 Mar 2024 16:13:23 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 14:02:01 GMT) icmp6: bring rate limiting on a par with IPv4 Use counter_ratecheck() instead of racy and slow ppsratecheck. Use a separate counter for every currently known type of ICMPv6. Provide logging of ratelimit events. Provide jitter to counter open UDP port detection. With minor tweaks from tuexen@ to fix merge problems. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44482 (cherry picked from commit a03aff88a14448c3084a0384082ec996d7213897) M sys/netinet6/icmp6.c M sys/netinet6/in6_proto.c ____________________________________________________________________________________________________________ Commit: 90ecc3fc679d1df50772327d80e0d28f59e584af URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=90ecc3fc679d1df50772327d80e0d28f59e584af Author: Gleb Smirnoff (Sun 24 Mar 2024 16:13:23 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 10:28:44 GMT) icmp6: rate limit our echo replies The generation of ICMP6_ECHO_REPLY bypasses icmp6_error(), thus rate limit was not applied. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44480 (cherry picked from commit 32aeee8ce7e72738fff236ccd5629d55035458f8) M sys/netinet6/icmp6.c ____________________________________________________________________________________________________________ Commit: dc167e64dce3ffc212e4f7a2268587abcc22c036 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dc167e64dce3ffc212e4f7a2268587abcc22c036 Author: Gleb Smirnoff (Sun 24 Mar 2024 16:13:23 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 10:27:12 GMT) icmp6: make icmp6_ratelimit() responsible to update the stats counter Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D44479 (cherry picked from commit c6c96aaba8dd74eb39469ed156ff19cc31d599b7) M sys/netinet6/icmp6.c ____________________________________________________________________________________________________________ Commit: 18058544c65b83fffca9556d6d082e823585ef3d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=18058544c65b83fffca9556d6d082e823585ef3d Author: Gleb Smirnoff (Sun 24 Mar 2024 16:13:23 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 10:23:36 GMT) icmp: improve ICMP limit jitter Instead of fixing up invalid values set by a user in badport_bandlim() which is a fast path function, provide a sysctl handler sysctl_icmplim_and_jitter(), that will check that jitter is less than the limit. Provide jitter initilization function icmplim_new_jitter() used at boot, in the sysctl handler and when we actually hit the limit. This also fixes no jitter on a fresh booted system until first limit hit. Instead of CVE number provide link the the actual paper that explains what and why we are doing here. The CVE number isn't very informative, it will just tell you what RedHat version you need to upgrade to. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44478 (cherry picked from commit ac44739fd834f51cacb26485a4140fd482e20150) M sys/netinet/ip_icmp.c ____________________________________________________________________________________________________________ Commit: a71eee300ba7d94a1621c7b31eaaa79243db84ec URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a71eee300ba7d94a1621c7b31eaaa79243db84ec Author: Gleb Smirnoff (Sun 24 Mar 2024 16:13:23 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 10:22:14 GMT) icmp: when logging ICMP ratelimiting message use correct jitter value The limiting of the very last second has been done using certain jitter value. We update the jitter for the next second. But the logging should report the jitter before the change. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44477 (cherry picked from commit b508545ce044dbfdd83da772e73f969a3713d59d) M sys/netinet/ip_icmp.c ____________________________________________________________________________________________________________ Commit: a6d5c6a04fe9408cdfd1f56f8dc3142661214eb8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a6d5c6a04fe9408cdfd1f56f8dc3142661214eb8 Author: Gleb Smirnoff (Sun 24 Mar 2024 16:13:23 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 10:20:53 GMT) icmp: hide icmp_bandlimit_uninit() under VIMAGE The uninitialization may be executed only on a kernel with VIMAGE. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44476 (cherry picked from commit 9d7f17d7467ed8c9740730a8db7a82e4768e5177) M sys/netinet/ip_icmp.c ____________________________________________________________________________________________________________ Commit: 0939f3a046533a2df1d2b10fd914c98755dacb0b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0939f3a046533a2df1d2b10fd914c98755dacb0b Author: Gleb Smirnoff (Sun 24 Mar 2024 16:13:23 GMT) Committer: Michael Tuexen (Wed 12 Feb 2025 10:15:53 GMT) icmp: do not store per-VNET identical array of strings We need per-VNET struct counter_rate, but we don't need per-VNET set of const char *. Also, identical word "response" can go into the format string instead of being stored 7 times. Reviewed by: kp, zlei, tuexen Differential Revision: https://reviews.freebsd.org/D44475 (cherry picked from commit 7142ab4790666022a2a3d85910e9cd8e241d9b87) M sys/netinet/ip_icmp.c ____________________________________________________________________________________________________________ Commit: 28ac62860b5925214015bef77481b3f6696a4a88 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=28ac62860b5925214015bef77481b3f6696a4a88 Author: Jose Luis Duran (Wed 5 Feb 2025 19:50:21 GMT) Committer: Jose Luis Duran (Wed 12 Feb 2025 01:41:52 GMT) mtree: Add missing libxo/encoder path Reviewed by: imp Approved by: emaste (mentor) Fixes: d1a0d267b78b ("Upgrade libxo to 0.4.5.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48836 (cherry picked from commit d10deaea12adb73a698d907a148f081c402d5dd6) M etc/mtree/BSD.debug.dist ____________________________________________________________________________________________________________ Commit: ceab30bfe243793bc34420ab885b066dd45b23a1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ceab30bfe243793bc34420ab885b066dd45b23a1 Author: Jose Luis Duran (Tue 4 Feb 2025 14:47:24 GMT) Committer: Jose Luis Duran (Wed 12 Feb 2025 01:41:18 GMT) mk: Move vm stack test debug symbols Avoid the creation of a /usr/tests/sys/vm/stack/.debug directory by placing sys/vm/stack test debug symbols under /usr/lib/debug. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48796 (cherry picked from commit 88d448ec815c1fda27be94846f88ccd96251febd) (cherry picked from commit 955f974a1a37cf3ae8b241327b1fef74c8932855) M ObsoleteFiles.inc M share/mk/bsd.lib.mk ____________________________________________________________________________________________________________ Commit: 65b71a21fc78eb7012b9a83bc84458288f9c197e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=65b71a21fc78eb7012b9a83bc84458288f9c197e Author: Jose Luis Duran (Tue 4 Feb 2025 14:15:37 GMT) Committer: Jose Luis Duran (Wed 12 Feb 2025 01:39:41 GMT) libopencsd: Remove extra slashes Remove extra slashes that end up in the metalog. These double slashes can produce an invalid specification file if there are subdirectories down the hierarchy when sorted. For example, consider the following metalog excerpt: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Apparently missing the ./base/aaa directory in the specification. Luckily here are no subdirectories. Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48779 (cherry picked from commit bccaf0262dcab84be49c42cc6b7a81c279c44b62) M lib/libopencsd/Makefile ____________________________________________________________________________________________________________ Commit: 11391f2fa39d6bb3f61ebaf0a2470d7fd0f421e0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=11391f2fa39d6bb3f61ebaf0a2470d7fd0f421e0 Author: Jose Luis Duran (Tue 4 Feb 2025 14:15:12 GMT) Committer: Jose Luis Duran (Wed 12 Feb 2025 01:38:56 GMT) csu tests: Remove extra slash Remove an extra slash that ends up in the metalog. This double slash can produce an invalid specification file if there are subdirectories down the hierarchy when sorted. For example, consider the following metalog excerpt: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Apparently missing the ./base/aaa directory in the specification. Luckily here are no subdirectories. Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48778 (cherry picked from commit 841856570e7b623c4f1283939936ffa005d2fcf4) M lib/csu/tests/dso/Makefile ____________________________________________________________________________________________________________ Commit: 6fc8d02b59dd7c343a2ab681e57c13c27c6425f7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6fc8d02b59dd7c343a2ab681e57c13c27c6425f7 Author: Jose Luis Duran (Tue 4 Feb 2025 14:07:00 GMT) Committer: Jose Luis Duran (Wed 12 Feb 2025 01:38:47 GMT) nanobsd: Always define the partition index Print the desired partition index together with the starting LBA and the size. Otherwise, when only one code partition is desired, the configuration partition (/cfg) may not end up in the third slice, thus breaking the scripts that expect it there. This was the previous approach, changed in 587c054bea0f ("nanobsd: Use gpart and create code image before full disk image"). Fix it by printing the index as the last column to reduce the chances of breaking current overrides, and using it as the gpart index. PR: 262098 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262098 ) Reviewed by: imp Approved by: emaste (mentor) Fixes: 587c054bea0f ("nanobsd: Use gpart and create code image before full disk image") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47835 (cherry picked from commit dc4b36b96333f2ab05f3c454f0df2e0a0d4d451d) M tools/tools/nanobsd/legacy.sh ____________________________________________________________________________________________________________ Commit: c204fdb1c859847ff972acdcadf6002759038e11 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c204fdb1c859847ff972acdcadf6002759038e11 Author: Juraj Lutter (Fri 8 Nov 2024 13:38:19 GMT) Committer: Juraj Lutter (Tue 11 Feb 2025 13:48:14 GMT) periodic: set _localbase for periodic scripts from within periodic.conf Set _localbase variable from within /etc/defaults/periodic.conf for use by periodic scripts. This fixes e5d7100c09, no other functional changes intended. Reported by: gahr, otis Reviewed by: markj, gahr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47486 (cherry picked from commit c8b89c11a1181e900acb638cfde7a55e92553175) M usr.sbin/periodic/periodic.conf M usr.sbin/periodic/periodic.sh ____________________________________________________________________________________________________________ Commit: a32cc87cc0a0dae1984665bd9e0727c1eeac6c96 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a32cc87cc0a0dae1984665bd9e0727c1eeac6c96 Author: Kevin Bowling (Sat 8 Feb 2025 23:49:46 GMT) Committer: Kevin Bowling (Tue 11 Feb 2025 00:52:16 GMT) net: if_media for 100BASE-BX d82c3e81: net: if_media for 100BASE-BX Renumber 1000BASE-BX and add 100BASE-BX sequentially I added this 1000BASE-BX in 78c63ed260fa20b3500aedfe41dc0dcae9593f51 but did not connect it to any code yet, appologize for the churn. 7835a4ad: net: if_media fix syntax/build Fixes: d82c3e815a5f ("net: if_media for 100BASE-BX") (cherry picked from commit d82c3e815a5fc0069562b69145ad695f9aa183f9) (cherry picked from commit 7835a4ad6948290c92ea55c7be34ae72f4e2b0bd) M sys/net/ieee8023ad_lacp.c M sys/net/if_media.h ____________________________________________________________________________________________________________ Commit: d9c36c812b5bb03759bc0b3f4a3cb0e16ea5d98d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d9c36c812b5bb03759bc0b3f4a3cb0e16ea5d98d Author: Gordon Bergling (Wed 5 Feb 2025 10:31:12 GMT) Committer: Gordon Bergling (Mon 10 Feb 2025 06:56:05 GMT) mlx4ib(4): Fix some typos in device messages - s/availible/available/ (cherry picked from commit 84e3ffac12a8dcfeae0a5e0b25afe447ff2d5fa8) M sys/dev/mlx4/mlx4_core/mlx4_cmd.c ____________________________________________________________________________________________________________ Commit: 8984d070d6669669754ba1f66c7acd6d7dca1d2a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8984d070d6669669754ba1f66c7acd6d7dca1d2a Author: Colin Percival (Tue 4 Feb 2025 00:10:47 GMT) Committer: Colin Percival (Sun 9 Feb 2025 21:16:25 GMT) release: Chase location of pkg repo databases pkg used to store copies of upstream repository databases in /var/db/pkg/repo-*.sqlite. About a year ago this was moved to /var/db/pkg/repos/*/, resulting in FreeBSD cloud images no longer having those (unhelpful since they'll be long out of date before the cloud images are launched) databases removed. Remove the correct location, and hope that future pkg updates don't break the base system again. Sponsored by: Amazon (cherry picked from commit 078e8b34b13d6d0663661542eeac9007806fccdc) M release/tools/ec2.conf M release/tools/vagrant.conf ____________________________________________________________________________________________________________ Commit: 55c3167e51e90ae7c5983246ddb3d5eda400391b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=55c3167e51e90ae7c5983246ddb3d5eda400391b Author: Gleb Smirnoff (Tue 20 Feb 2024 22:37:45 GMT) Committer: Zhenlei Huang (Sun 9 Feb 2025 16:39:02 GMT) tests/sigsys: initialize parameter passed to sysctlbyname() (cherry picked from commit e53b83a849e3a34772d0a0ed26eb0cb4aeeec71d) (cherry picked from commit e4e6423ef3d2a787583d88a87a11748217602759) M tests/sys/kern/sigsys.c ____________________________________________________________________________________________________________ Commit: ca3c2d28623a91f290133c86396cf90926b02b1b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ca3c2d28623a91f290133c86396cf90926b02b1b Author: Ed Maste (Mon 20 Jan 2025 13:21:51 GMT) Committer: Ed Maste (Fri 7 Feb 2025 15:59:52 GMT) jls.8: Reference correct manpage for libxo options PR: 284135 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284135 ) Sponsored by: The FreeBSD Foundation (cherry picked from commit 90670e0e275c6e36fc7e14368fc4e3e7f1d3671d) (cherry picked from commit 707adc335e946d052ddc17d1878edbb4933b0ce3) M usr.sbin/jls/jls.8 ____________________________________________________________________________________________________________ Commit: 02cd05b637b273f32a8d7f2cd7ad78cf4b9794f5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=02cd05b637b273f32a8d7f2cd7ad78cf4b9794f5 Author: Ed Maste (Mon 3 Feb 2025 12:51:18 GMT) Committer: Ed Maste (Fri 7 Feb 2025 15:57:35 GMT) blocklistd: Remove obsolete network class reference This was a comment in a configuration example. Reported by: bapt Reviewed by: bapt, jlduran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48810 (cherry picked from commit 513c4e20790a24526cb1c2f5a4725971a09d928a) (cherry picked from commit 5a7daf019918ba14ee665798b266efb0f6b2bbb4) M contrib/blacklist/bin/blacklistd.conf.5 ____________________________________________________________________________________________________________ Commit: 6f87402a02f0801942fe8f0d9a8f7f3e04dfbb01 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6f87402a02f0801942fe8f0d9a8f7f3e04dfbb01 Author: Kirk McKusick (Tue 28 Jan 2025 01:39:45 GMT) Committer: Kirk McKusick (Fri 7 Feb 2025 00:27:15 GMT) Defer the January 19, 2038 date limit in UFS1 filesystems to February 7, 2106 Standardize the definition of a UFS dinode. Differential Revision: https://reviews.freebsd.org/D48472 (cherry picked from commit 1111a44301da39d7b7459c784230e1405e8980f8) (cherry picked from commit aa90fbed151de512ab6e59f75df009533a15751f) (cherry picked from commit 256389eaf158acaf67f0530764be8af68edee78c) (cherry picked from commit 6cd973d903c8f214d84daf91eb75047631bf1618) (cherry picked from commit e1ebda4458bbaf7d85fb803e20f3afc5441f24d9) M lib/libufs/inode.c M lib/libufs/libufs.h M sbin/dump/traverse.c M sbin/fsck_ffs/fsck.h M sbin/fsck_ffs/inode.c M sbin/newfs/mkfs.c M sbin/quotacheck/quotacheck.c M share/man/man7/ffs.7 M stand/libsa/ufs.c M sys/ufs/ffs/ffs_alloc.c M sys/ufs/ffs/ffs_extern.h M sys/ufs/ffs/ffs_subr.c M sys/ufs/ffs/ffs_vfsops.c M sys/ufs/ufs/dinode.h M sys/ufs/ufs/inode.h M usr.sbin/makefs/ffs.c M usr.sbin/makefs/ffs/ufs_inode.h M usr.sbin/quot/quot.c ____________________________________________________________________________________________________________ Commit: 645ddc8048354b591d18330a512ad12da8d7190e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=645ddc8048354b591d18330a512ad12da8d7190e Author: Colin Percival (Fri 7 Feb 2025 00:00:00 GMT) Committer: Colin Percival (Fri 7 Feb 2025 00:00:00 GMT) Post-13.5-branch updates Rename stable/13 to -STABLE Bump __FreeBSD_version Approved by: re (implicit) Sponsored by: Amazon M sys/conf/newvers.sh M sys/sys/param.h ____________________________________________________________________________________________________________ Commit: fe6e275dc6f7527961ceaf7ce2912a29cdbb00b3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fe6e275dc6f7527961ceaf7ce2912a29cdbb00b3 Author: Bjoern A. Zeeb (Fri 20 Dec 2024 14:23:50 GMT) Committer: Bjoern A. Zeeb (Thu 6 Feb 2025 20:49:51 GMT) LinuxKPI 802.11 / rtw88: make packets flow again In 886653492945f we added checks for packets to only go out if the station is known to the firmware (amongst others) as there are implications in drivers. Unfortunately rtw88 does not support the mac80211 (*sta_state)() KPI but only the fallback (*sta_add/remove)() in which case the station is only added to firmware when going from AUTH to ASSOC. That means we had no chance to get authenticated anymore. PR: 283142, 274382 Fixes: 886653492945f (make sure we can send DISASSOC or DEAUTH frames) Tested by: imb protected-networks.net, oleg.nauman gmail.com Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48161 (cherry picked from commit 2372f8cc640c2f4ab82831e6ac0e27ab6c18321a) M sys/compat/linuxkpi/common/src/linux_80211.c ____________________________________________________________________________________________________________ Commit: 6b81815307b00d37b81f71d68a51f67c72a2edb0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6b81815307b00d37b81f71d68a51f67c72a2edb0 Author: Zhenlei Huang (Tue 4 Feb 2025 15:04:59 GMT) Committer: Zhenlei Huang (Thu 6 Feb 2025 19:06:42 GMT) ifnet: Detach BPF descriptors on interface vmove event When an interface is moving to/from a vnet jail, it may still have BPF descriptors attached. The userland (e.g. tcpdump) does not get noticed that the interface is departing and still opens BPF descriptors thus may result in leaking sensitive traffic (e.g. an interface is moved back to parent jail but a user is still sniffing traffic over it in the child jail). Detach BPF descriptors so that the userland will be signaled. Reviewed by: ae MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45727 (cherry picked from commit 1ed9b381d4701fc9f66741256e93b96e22273217) ifnet: Fix build without BPF The newly introduced function bpf_ifdetach() is only available when device bpf is enabled. Fixes: 1ed9b381d470 ifnet: Detach BPF descriptors on interface vmove event (cherry picked from commit d8413a1c3ba235a79ae6b8cc35767a861855c7e2) (cherry picked from commit 2e4eaf3c13d2b5aa76f9759e51e35faf29d56993) M sys/net/bpf.c M sys/net/bpf.h M sys/net/if.c ____________________________________________________________________________________________________________ Commit: e0b2b8fa16a13abb1ea8326c6ff311d0d94108db URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e0b2b8fa16a13abb1ea8326c6ff311d0d94108db Author: Zhenlei Huang (Tue 4 Feb 2025 15:04:59 GMT) Committer: Zhenlei Huang (Thu 6 Feb 2025 18:59:58 GMT) ifnet: Make if_detach_internal() and if_vmove() void if_detach_internal() never fail since change [1]. As a consequence, also does its caller if_vmove(). While here, remove a stall comment. No functional change intended. This reverts commit c7bab2a7ca9a6dae79f970c6730a19b65a1ed86e. [1] a779388f8bb3 if: Protect V_ifnet in vnet_if_return() Reviewed by: glebius MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48820 (cherry picked from commit bb0348a17974d83671becbd32ea0e4bd2ea61906) (cherry picked from commit 700880a13566193b853f75c87ba5c37d395f6a1e) M sys/net/if.c ____________________________________________________________________________________________________________ Commit: 19142d2a9600589d57df3b1a983b51b43065c0c1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=19142d2a9600589d57df3b1a983b51b43065c0c1 Author: Zhenlei Huang (Mon 3 Feb 2025 12:13:19 GMT) Committer: Zhenlei Huang (Thu 6 Feb 2025 18:49:48 GMT) bpf: Fix potential race conditions There're two possible race conditions, 1. Concurrent bpfattach() and bpf_setif(), i.e., BIOCSETIF ioctl, 2. Concurrent bpfdetach() and bpf_setif(). For the first case, userland may see BPF interface attached but it has not been in the attached interfaces list `bpf_iflist` yet. Well it will eventually be so this case does not matter. For the second one, bpf_setif() may reference `dead_bpf_if` and the kernel will panic (spotted by change [1], without the change we will end up silently corrupted memory). A simple fix could be that, we add additional check for `dead_bpf_if` in the function `bpf_setif()`. But that requires to extend protection of global lock (BPF_LOCK), i.e., BPF_LOCK should also protect the assignment of `ifp->if_bpf`. That simple fix works but is apparently not a good design. Since the attached interfaces list `bpf_iflist` is the single source of truth, we look through it rather than check against the interface's side, aka `ifp->if_bpf`. This change has performance regression, that the cost of BPF interface attach operation (BIOCSETIF ioctl) goes back from O(1) to O(N) (where N is the number of BPF interfaces). Well we normally have sane amounts of interfaces, an O(N) should be affordable. [1] 7a974a649848 bpf: Make dead_bpf_if const Fixes: 16d878cc99ef Fix the following bpf(4) race condition ... MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D45725 (cherry picked from commit 7def047a1ae93b3b10bd57ed1bd28e861f94b596) (cherry picked from commit 56c93859038ff3de9041834fc798b20dc213621b) M sys/net/bpf.c ____________________________________________________________________________________________________________ Commit: 5b0a5d8c1ea33ae7afb56d6c452df7e90ed54e9e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5b0a5d8c1ea33ae7afb56d6c452df7e90ed54e9e Author: Zhenlei Huang (Thu 30 Jan 2025 18:20:41 GMT) Committer: Zhenlei Huang (Thu 6 Feb 2025 16:08:53 GMT) sysctl: Teach sysctl to attach and run itself in a jail This allows the parent jail to retrieve or set kernel state when child does not have sysctl(8) installed (e.g. light weighted OCI containers or slim jails). This is especially useful when manipulating jail prison or vnet sysctls. For example, `sysctl -j foo -Ja` or `sysctl -j foo net.fibs=2`. Reviewed by: dfr (previous version), markj MFC after: 1 week Relnotes: yes Differential Revision: https://reviews.freebsd.org/D48618 (cherry picked from commit 08aa7128dea4d14811ae4a0225d7c678869cfe62) (cherry picked from commit 8d5d7e2ba3a685a9ebe7aa578c6b76adf8fe4c2e) M sbin/sysctl/Makefile M sbin/sysctl/sysctl.8 M sbin/sysctl/sysctl.c ____________________________________________________________________________________________________________ Commit: 73a516c6527c84701921c329d4f08da44522ccc4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=73a516c6527c84701921c329d4f08da44522ccc4 Author: Zhenlei Huang (Thu 30 Jan 2025 18:20:41 GMT) Committer: Zhenlei Huang (Thu 6 Feb 2025 16:08:52 GMT) sysctl: Refactor function parsefile() Let the caller open the file and pass in the file handler. This can benefit an upcoming change so that we will have cleaner logic. No functional change intended. Suggested by: markj MFC after: 1 week (cherry picked from commit 6193855fc76c591ffabe6168cd674e6ec0dafa8e) (cherry picked from commit 4ef48d172bb11f01174fff871d69623eed59d626) M sbin/sysctl/sysctl.c ____________________________________________________________________________________________________________ Commit: fa9926a62ae3ec9764b3c0e2a9856b78aa5fe780 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fa9926a62ae3ec9764b3c0e2a9856b78aa5fe780 Author: Zhenlei Huang (Wed 29 Jan 2025 10:00:07 GMT) Committer: Zhenlei Huang (Thu 6 Feb 2025 16:08:52 GMT) ip6addrctl(8): Teach ip6addrctl to attach and run itself in a jail This will make it easier to manage address selection policies of vnet jails, especially for those light weighted OCI containers or slim jails. Requested by: dfr Reviewed by: dfr, markj MFC after: 1 week Relnotes: yes Differential Revision: https://reviews.freebsd.org/D48679 (cherry picked from commit 6dcdd79a251b5e62ff9ce562ad451e92dec39408) (cherry picked from commit b709f7b38cc4e99fa5cfef6613773a6848ed31c6) M usr.sbin/ip6addrctl/Makefile M usr.sbin/ip6addrctl/ip6addrctl.8 M usr.sbin/ip6addrctl/ip6addrctl.c ____________________________________________________________________________________________________________ Commit: fd28738611234b5f65967d3f69235a107f64a726 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fd28738611234b5f65967d3f69235a107f64a726 Author: Zhenlei Huang (Wed 29 Jan 2025 10:00:07 GMT) Committer: Zhenlei Huang (Thu 6 Feb 2025 16:08:52 GMT) ip6addrctl(8): Strictly check the number of arguments The additional arguments are useless but may tempt user a wrong usage. Reviewed by: dfr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48701 (cherry picked from commit 13ce55b66fad2b2b4054a89a1a906f58dc33683b) (cherry picked from commit 99bcb54d8d9138480001a262f080b7e8b0c24f58) M usr.sbin/ip6addrctl/ip6addrctl.c ____________________________________________________________________________________________________________ Commit: 00db5c7152e858aa010feb0f6c981d0cfd5f40ea URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=00db5c7152e858aa010feb0f6c981d0cfd5f40ea Author: Colin Percival (Wed 29 Jan 2025 19:38:18 GMT) Committer: Colin Percival (Thu 6 Feb 2025 04:16:23 GMT) vmimage.subr: Redirect etcupdate log to stdout While we're here, send the etcupdate log from generating base.txz to stdout instead of /dev/null (see e972e408d19a) as well. Reviewed by: emaste, gordon, jrtc27 MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D48719 (cherry picked from commit ace4637ee0c666c6f5a1c664f8956f7302234edd) M release/Makefile M release/tools/vmimage.subr ____________________________________________________________________________________________________________ Commit: dc66be9b625829dde2972a16e65af4424a1f629f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dc66be9b625829dde2972a16e65af4424a1f629f Author: Michael Tuexen (Thu 9 Jan 2025 05:27:05 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:49:29 GMT) TCP BBR: remove dead code No functional change intended. Reviewed by: Peter Lei, rrs (earlier version) CID: 1523802 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48341 (cherry picked from commit e7fbf52a3e38c4bc4249e6541fe7e42ecc119656) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 3cf7769f1f180ac310c34e6389ee645c5928d808 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3cf7769f1f180ac310c34e6389ee645c5928d808 Author: Michael Tuexen (Wed 8 Jan 2025 22:15:54 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:48:07 GMT) TCP RACK: don't log an uninitialized value reduce is uninitialized, if the code path for logging is reached via goto old_method;. Reviewed by: rrs, Peter Lei CID: 1557359 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48346 (cherry picked from commit 4c89d59e0cdac4d83fb5841aefae9214545b2273) M sys/netinet/tcp_stacks/rack.c ____________________________________________________________________________________________________________ Commit: 88844461a71597a3b57f747cc17b12c5582aa36d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=88844461a71597a3b57f747cc17b12c5582aa36d Author: Michael Tuexen (Mon 6 Jan 2025 20:25:58 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:42:09 GMT) TCP BBR: remove dead code No functional change intended. Reviewed by: rrs CID: 1523808 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48338 (cherry picked from commit 061727efe1e355fb2fde1b05e92718543d05bfe7) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 7edc7c8f6f975ee437124534bbd59ee4ba42b66d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7edc7c8f6f975ee437124534bbd59ee4ba42b66d Author: Michael Tuexen (Mon 6 Jan 2025 19:40:33 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:41:04 GMT) TCP BBR: remove dead code bw is unsigned and not zero. So it cannot be smaller than 1. No functional change intended. Reviewed by: rrs, cc CID: 1523791 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48323 (cherry picked from commit c28fefe1dc44b69743dd18d038440da38a2867a7) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 9698788212e8f772885098a511fafe7fc5d4e4df URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9698788212e8f772885098a511fafe7fc5d4e4df Author: Michael Tuexen (Mon 6 Jan 2025 19:35:11 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:39:50 GMT) TCP RACK: fix TCP fast open Do not jump to a place in the code, which requires several variables to be set (segsize, minseg, idle, len, sb_offset), which is not true. To avoid using these variables, start the HPTS timer explicitly. This fix only applies to the client side using TCP fast open. Approved by: rrs CID: 1523766 CID: 1523770 CID: 1523786 CID: 1523801 CID: 1523809 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48322 (cherry picked from commit bb9525f30214e8b6c53c6cccd9e8f02e8f8e8c42) M sys/netinet/tcp_stacks/rack.c ____________________________________________________________________________________________________________ Commit: 264b7dd11fa13858843eb11e8e33849effdf529a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=264b7dd11fa13858843eb11e8e33849effdf529a Author: Michael Tuexen (Sat 4 Jan 2025 20:08:43 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:36:13 GMT) TCP BBR: remove code which is not needed rc_bbr_substate is a 3-bit unsigned int, so it can't be larger than or equal to 8. The wrap around already happens. No functional change intended. Reviewed by: rrs CID: 1523795 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48320 (cherry picked from commit 4bce1a19fcfac0c9f22c11278daa510546ccd3f2) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 4f5788dfca2be357dd3ac7b27493bf08d4351e63 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4f5788dfca2be357dd3ac7b27493bf08d4351e63 Author: Michael Tuexen (Sat 4 Jan 2025 14:25:01 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:35:00 GMT) TCP BBR: simplify expression There is no need to check partially for bbr->r_ctl.crte being NULL, since this can't be true in this path. No functional change intended. Reviewed by: rrs CID: 1523810 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48312 (cherry picked from commit 305c40dc552f9c150eacce95c181798031368cd9) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: ed530aaa4722b0b7bacc25735699f3603a613318 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ed530aaa4722b0b7bacc25735699f3603a613318 Author: Michael Tuexen (Fri 3 Jan 2025 18:44:43 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:31:38 GMT) TCP BBR: fix integer overflow Use 64-bit arithmetic. Reviewed by: rrs CID: 1523806 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48302 (cherry picked from commit 88766e7af52bbde32b14ad48fb76798a3ba4650c) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 0d93b08b494225969358c1af8ed65e99b137aed8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0d93b08b494225969358c1af8ed65e99b137aed8 Author: Michael Tuexen (Fri 3 Jan 2025 13:22:25 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:30:35 GMT) TCP BBR: simplify expression rsm cannot be NULL, when calling bbr_update_bbr_info(). So no need to check partially for it. No functional change intended. Reviewed by: rrs CID: 1523803 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48293 (cherry picked from commit 4173a3a009a42c47f1ec2d1cbfb99347aaf195da) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 0450ed7766dea376c5559801cf711d435f67a3db URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0450ed7766dea376c5559801cf711d435f67a3db Author: Michael Tuexen (Fri 3 Jan 2025 13:20:19 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:28:35 GMT) TCP RACK: remove un-needed assignment No functional change intended. Reviewed by: rrs CID: 1523768 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48292 (cherry picked from commit deb4252e9e7c8d2eca9be6333caa434061f3f594) M sys/netinet/tcp_stacks/rack.c ____________________________________________________________________________________________________________ Commit: f5203188413a0165e77ab41b70d55d8239256aa0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f5203188413a0165e77ab41b70d55d8239256aa0 Author: Michael Tuexen (Thu 2 Jan 2025 15:17:05 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:23:02 GMT) TCP BBR: do not log an uninitialized value Reviewed by: rrs CID: 1523789 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48281 (cherry picked from commit c7e81cc04369dd7bdd00519109efe9d75f53375c) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: c8828fec054096216574882b8bcc85d2548cbbd6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c8828fec054096216574882b8bcc85d2548cbbd6 Author: Michael Tuexen (Wed 1 Jan 2025 17:39:23 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:17:38 GMT) TCP BBR: remove code which is never executed USEC_2_TICKS() returns at least 1. Reviewed by: rrs CID: 1523775 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D4827 (cherry picked from commit 1781324db2bc22a971a33c5a063036b2775055c6) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 699d5634661da034ba6a97b7cb4e2fab41d84779 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=699d5634661da034ba6a97b7cb4e2fab41d84779 Author: Michael Tuexen (Tue 31 Dec 2024 21:03:13 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:16:23 GMT) TCP BBR: fix condition when sending a tail loss probe Reviewed by: rrs CID: 1523793 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48274 (cherry picked from commit 5ec914e06c96ff40bf0e6567359c0de039b59ed2) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 7db5c08dc637bb5e1fa8491f3a27214806cd6f1a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7db5c08dc637bb5e1fa8491f3a27214806cd6f1a Author: Michael Tuexen (Tue 31 Dec 2024 20:51:58 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:15:00 GMT) TCP RACK: add comment Indicate that the missing of the break is intentionally. Reviewed by: rrs CID: 1523782 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48273 (cherry picked from commit 0ce13b1d580f05f96e3d85afb0824f672cb0c7a2) M sys/netinet/tcp_stacks/rack.c ____________________________________________________________________________________________________________ Commit: 1d39f58d735c64e5878f4bfb1ec53397bd5008c8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1d39f58d735c64e5878f4bfb1ec53397bd5008c8 Author: Michael Tuexen (Tue 31 Dec 2024 16:29:04 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 20:13:25 GMT) TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE Actually implement the IPPROTO_TCP-level socket option TCP_BBR_USEDEL_RATE. Reviewed by: rrs CID: 1523813 CID: 1523814 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48261 (cherry picked from commit b47dcb4b1ff16e6af2e07798f6fe06580b4eddf0) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 92d87203c00e5b47f5505702b2a86fae3c1cf063 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=92d87203c00e5b47f5505702b2a86fae3c1cf063 Author: Michael Tuexen (Tue 31 Dec 2024 16:22:03 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 19:34:37 GMT) TCP RACK, BBR: cleanup of ctf_process_inbound_raw() Instead of dealing with ifp == NULL, which should never happen, assume that this is not true. Use KASSERT to make this clear. No functional change intended. Reviewed by: glebius, rrs CID: 1523767 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48258 (cherry picked from commit 4940584bbf0b809130f6ac1a7a0c6b00d373af1e) M sys/netinet/tcp_stacks/rack_bbr_common.c ____________________________________________________________________________________________________________ Commit: 60682a028156289bbcc69de20198151c44fa5265 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=60682a028156289bbcc69de20198151c44fa5265 Author: Michael Tuexen (Mon 30 Dec 2024 15:02:43 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 19:28:20 GMT) TCP RACK, BBR: ensure return value is always ininitialized Do not return an uninitialized value from ctf_do_queued_segments() in case no packets are actually processed (all are skipped). Reviewed by: rrs CID: 1523774 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48217 (cherry picked from commit b5739c8b12226c791bc8e7a4ac6e48965333509a) M sys/netinet/tcp_stacks/rack_bbr_common.c ____________________________________________________________________________________________________________ Commit: ac863fd8298cc1d58a88c0a668845b2c87c140b8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ac863fd8298cc1d58a88c0a668845b2c87c140b8 Author: Michael Tuexen (Mon 30 Dec 2024 14:57:11 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 19:22:20 GMT) TCP BBR: remove assignments without effect No functional change intended. Reviewed by: rrs CID: 1523772 CID: 1523777 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48215 (cherry picked from commit 895347fc10c5b06bddadcc2937fdcf298c7e1114) M sys/netinet/tcp_stacks/bbr.c ____________________________________________________________________________________________________________ Commit: 6bcc3ae6d61d2a4d972bbd839016ab63c6394935 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6bcc3ae6d61d2a4d972bbd839016ab63c6394935 Author: Michael Tuexen (Wed 11 Dec 2024 18:47:11 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 18:41:44 GMT) icmp.4: improve icmplim and add icmplim_jitter description Reviewed by: cc, bcr Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48025 (cherry picked from commit eba715c544ea89c6b402c55e03b388b77030b997) M share/man/man4/icmp.4 ____________________________________________________________________________________________________________ Commit: cb9ee81985f2951b94294a87b203181401125769 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cb9ee81985f2951b94294a87b203181401125769 Author: Michael Tuexen (Tue 5 Nov 2024 08:52:42 GMT) Committer: Michael Tuexen (Wed 5 Feb 2025 17:57:51 GMT) tcp: fix the initial CWND when a SYN retransmission happened According to RFC 3390 the CWND should be set to one MSS if the SYN or SYN-ACK has been retransmitted. This is handled in the code by setting CWND to 1 and cc_conn_init() translates this to MSS. Unfortunately, cc_cong_signal() was overwriting the special value of 1 in case of a lost SYN, and therefore the initial CWND was not as it was supposed to be. Fix this by not overwriting the special value of 1. Reviewed by: cc, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D47439 (cherry picked from commit 625835c8b5e897e54a1a023788a3a9c3b16631c9) M sys/netinet/tcp_timer.c ____________________________________________________________________________________________________________ Commit: eefd3fe08d3d0d95670021d7dedd33ae5ed836c0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eefd3fe08d3d0d95670021d7dedd33ae5ed836c0 Author: Ed Maste (Mon 12 Dec 2022 21:07:26 GMT) Committer: Ed Maste (Tue 4 Feb 2025 13:36:37 GMT) gvinum: Emit deprecation notice upon drive tasting Reviewed by: phk, jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38607 (cherry picked from commit 127b443124d1e720b246ad381648c436c3d240de) (cherry picked from commit 22d06df419e0fdf7670e96d4ba88e33933cab6da) M sys/geom/vinum/geom_vinum_events.c ____________________________________________________________________________________________________________ Commit: 3b936c9d3b56b99cf4286b1980ac506582602acd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3b936c9d3b56b99cf4286b1980ac506582602acd Author: Alexander Ziaee (Sat 14 Dec 2024 23:02:55 GMT) Committer: Alexander Ziaee (Tue 4 Feb 2025 00:40:54 GMT) bsdinstall/zfsboot: Remove unused global variable In an AMA session on the FreeBSD Discord, it was revealed that no logic remains calling GPART_BOOTCODE_PARTONLY. It was removed in aa2a0e0fc311 for FreeBSD 12. git grep shows no other references. No functional change intended. MFC after: 2 weeks Fixes: aa2a0e0fc311 (Enable new UEFI+GELI support) Reported by: Antranig Vartanian Reviewed by: emaste, mhorne Approved by: emaste, mhorne (src) Approved by: mhorne, carlavilla (mentors) Differential Revision: https://reviews.freebsd.org/D48086 (cherry picked from commit 347eb42dbcb352f3266e716a2101898fe054bdba) M usr.sbin/bsdinstall/scripts/zfsboot ____________________________________________________________________________________________________________ Commit: 29f77be0d844aa7e9b26fed8b550e12ad504b4d2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=29f77be0d844aa7e9b26fed8b550e12ad504b4d2 Author: Zhenlei Huang (Mon 3 Feb 2025 16:28:37 GMT) Committer: Zhenlei Huang (Mon 3 Feb 2025 16:28:37 GMT) ng_sppp: Build only on i386 and amd64 This module depends on sppp(4) which is only enabled on i386 and amd64. This is a direct commit to stable/13 as ng_sppp(4) no longer exists in -current and stable/14. M share/man/man4/Makefile M sys/modules/netgraph/Makefile ____________________________________________________________________________________________________________ Commit: c59932350657220fa06dcbe62d1d876cb202746e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c59932350657220fa06dcbe62d1d876cb202746e Author: Zhenlei Huang (Mon 3 Feb 2025 16:28:37 GMT) Committer: Zhenlei Huang (Mon 3 Feb 2025 16:28:37 GMT) Install sppp man page only on i386 and amd64 The sppp(4) module is built only on i386 and amd64. This is a direct commit to stable/13 as sppp.4 no longer exists in -current and stable/14. M share/man/man4/Makefile ____________________________________________________________________________________________________________ Commit: 0cc5ddd0b9f20666b6f7362f4f469962b148b832 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0cc5ddd0b9f20666b6f7362f4f469962b148b832 Author: Zhenlei Huang (Thu 30 Jan 2025 15:59:35 GMT) Committer: Zhenlei Huang (Mon 3 Feb 2025 12:27:05 GMT) vnet: Fix style nits MFC after: 3 days (cherry picked from commit 903c7cdac5b5b4b720aba7a48abffb48b2588c77) (cherry picked from commit ceda6f83b119ab5c86478bedeefe8c0270691897) M sys/net/vnet.c ____________________________________________________________________________________________________________ Commit: 67e952ebaaad2f3db00c05b1fe23afdf95c32166 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=67e952ebaaad2f3db00c05b1fe23afdf95c32166 Author: Zhenlei Huang (Mon 27 Jan 2025 15:54:43 GMT) Committer: Zhenlei Huang (Mon 3 Feb 2025 12:27:05 GMT) if_vxlan(4): Prefer SYSCTL_INT over TUNABLE_INT This driver does not need to retrieve those tunable during early boot. Meanwhile SYSCTL_INT can provide rich info such as description. Also `sysctl net.link.vxlan.[legacy_port|reuse_port]` can report the current settings. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48621 (cherry picked from commit 92632371b360010709fad60146f1aee0b8b99776) (cherry picked from commit 7d2a5c78a714732f3494c7d8668b36368ed6bc39) M sys/net/if_vxlan.c ____________________________________________________________________________________________________________ Commit: 7a6319ece24f2c672ca074c1266364ac018b3ef2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7a6319ece24f2c672ca074c1266364ac018b3ef2 Author: Zhenlei Huang (Fri 24 Jan 2025 09:37:24 GMT) Committer: Zhenlei Huang (Mon 3 Feb 2025 12:27:05 GMT) if_vxlan(4): Use static initializers MFC after: 1 week (cherry picked from commit 5e0dbbc238e2e935c68e293314a90f2ce6e6ef16) (cherry picked from commit e2b6e11583eb13ee09a7cb0babc2a1d8f3bd952a) M sys/net/if_vxlan.c ____________________________________________________________________________________________________________ Commit: ab72295c6584035094a6e5e90deada0bf2e608c5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ab72295c6584035094a6e5e90deada0bf2e608c5 Author: Zhenlei Huang (Sat 25 Jan 2025 10:31:55 GMT) Committer: Zhenlei Huang (Mon 3 Feb 2025 12:27:05 GMT) ip6addrctl(8): Use static initializer MFC after: 1 week (cherry picked from commit 7bb9ba61d35703c8a819c3745b8a2b1feb56923d) (cherry picked from commit db9074ea54c095d22eb0dec681eae163079dd41f) M usr.sbin/ip6addrctl/ip6addrctl.c ____________________________________________________________________________________________________________ Commit: d9753f86679d0659137b5ee38b1df31cf509f640 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d9753f86679d0659137b5ee38b1df31cf509f640 Author: Jose Luis Duran (Fri 24 Jan 2025 23:10:05 GMT) Committer: Jose Luis Duran (Sat 1 Feb 2025 03:33:22 GMT) mtree: TESTSBASE directory always starts with a / Remove the extra forward slash ("/"), otherwise the mtree specification file will have the double slash and will not be parsed by makefs when attempting to build NanoBSD with NO_ROOT privileges. Fixes: 07670b30fa43 ("Create /usr/tests *.debug file directory hierarchy") Reviewed by: emaste Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D47722 (cherry picked from commit 01ff67f4bdf5959a719a6511a855f6a60c0e3a93) M Makefile.inc1 M etc/Makefile ____________________________________________________________________________________________________________ Commit: 9e3c356f11a92ed9fa9f029391c5e613f295c0d8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9e3c356f11a92ed9fa9f029391c5e613f295c0d8 Author: John Baldwin (Thu 23 Jan 2025 15:28:27 GMT) Committer: John Baldwin (Fri 31 Jan 2025 21:34:58 GMT) ccdconfig.8: Refer to graid(8) and zfs(8) instead of gvinum(8) Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D48536 (cherry picked from commit 86116ab256c476191e2fc1fffd79f94382960362) (cherry picked from commit 8432ddac21b3da5fa45b4f934e90e80deaa9cabf) M sbin/ccdconfig/ccdconfig.8 ____________________________________________________________________________________________________________ Commit: 8126ed28bda6b1b93b2e9a59db4a22e2dc115597 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8126ed28bda6b1b93b2e9a59db4a22e2dc115597 Author: John Baldwin (Thu 23 Jan 2025 15:27:44 GMT) Committer: John Baldwin (Fri 31 Jan 2025 21:33:26 GMT) gvinum.8: Update deprecation warning to note that this is removed in 15.0 Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48592 (cherry picked from commit 916f6e6dd3a95145c70e1c2c55467dd4979a0118) M sbin/gvinum/gvinum.8 ____________________________________________________________________________________________________________ Commit: 094f44ea03589a64a831627ae10980697cc66423 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=094f44ea03589a64a831627ae10980697cc66423 Author: Joseph Mingrone (Mon 23 Sep 2024 20:23:25 BST) Committer: Joseph Mingrone (Wed 29 Jan 2025 19:29:29 GMT) tcpdump: Update to 4.99.5 Reviewed by: kp (changes related to pf) Sponsored by: The FreeBSD Foundation (cherry picked from commit 0a7e5f1f02aad2ff5fff1c60f44c6975fd07e1d9) (cherry picked from commit d72f87c0fd1418bdb814594ea8fc76a202f7d5c6) M contrib/tcpdump/CHANGES M contrib/tcpdump/CMakeLists.txt M contrib/tcpdump/CONTRIBUTING.md M contrib/tcpdump/CREDITS M contrib/tcpdump/INSTALL.md M contrib/tcpdump/Makefile.in M contrib/tcpdump/VERSION M contrib/tcpdump/addrtoname.c M contrib/tcpdump/addrtostr.c M contrib/tcpdump/af.c A contrib/tcpdump/autogen.sh M contrib/tcpdump/bpf_dump.c M contrib/tcpdump/checksum.c M contrib/tcpdump/cmake/Modules/FindCRYPTO.cmake M contrib/tcpdump/cmakeconfig.h.in M contrib/tcpdump/config.guess M contrib/tcpdump/config.h.in M contrib/tcpdump/config.sub M contrib/tcpdump/configure M contrib/tcpdump/configure.ac M contrib/tcpdump/cpack.c M contrib/tcpdump/diag-control.h D contrib/tcpdump/doc/README.Win32.md A contrib/tcpdump/doc/README.haiku.md M contrib/tcpdump/doc/README.solaris.md M contrib/tcpdump/extract.h M contrib/tcpdump/ftmacros.h M contrib/tcpdump/funcattrs.h M contrib/tcpdump/gmpls.c M contrib/tcpdump/in_cksum.c M contrib/tcpdump/install-sh A contrib/tcpdump/instrument-functions.c M contrib/tcpdump/interface.h M contrib/tcpdump/ip.h M contrib/tcpdump/ipproto.c M contrib/tcpdump/l2vpn.c M contrib/tcpdump/machdep.c M contrib/tcpdump/makemib M contrib/tcpdump/mib.h M contrib/tcpdump/missing/datalinks.c M contrib/tcpdump/missing/dlnames.c M contrib/tcpdump/missing/getopt_long.c M contrib/tcpdump/missing/getservent.c M contrib/tcpdump/missing/snprintf.c M contrib/tcpdump/missing/strlcat.c M contrib/tcpdump/missing/strlcpy.c M contrib/tcpdump/missing/strsep.c M contrib/tcpdump/mkdep M contrib/tcpdump/nameser.h M contrib/tcpdump/netdissect-alloc.c M contrib/tcpdump/netdissect.c M contrib/tcpdump/netdissect.h M contrib/tcpdump/nlpid.c M contrib/tcpdump/ntp.c M contrib/tcpdump/oui.c M contrib/tcpdump/parsenfsfh.c M contrib/tcpdump/pflog.h M contrib/tcpdump/print-802_11.c M contrib/tcpdump/print-802_15_4.c M contrib/tcpdump/print-ah.c M contrib/tcpdump/print-ahcp.c M contrib/tcpdump/print-aodv.c M contrib/tcpdump/print-aoe.c M contrib/tcpdump/print-ap1394.c M contrib/tcpdump/print-arcnet.c M contrib/tcpdump/print-arista.c M contrib/tcpdump/print-arp.c M contrib/tcpdump/print-ascii.c M contrib/tcpdump/print-atalk.c M contrib/tcpdump/print-atm.c M contrib/tcpdump/print-babel.c M contrib/tcpdump/print-bcm-li.c M contrib/tcpdump/print-beep.c M contrib/tcpdump/print-bfd.c M contrib/tcpdump/print-bgp.c M contrib/tcpdump/print-bootp.c M contrib/tcpdump/print-brcmtag.c M contrib/tcpdump/print-bt.c M contrib/tcpdump/print-calm-fast.c M contrib/tcpdump/print-carp.c M contrib/tcpdump/print-cdp.c M contrib/tcpdump/print-cfm.c M contrib/tcpdump/print-chdlc.c M contrib/tcpdump/print-cip.c M contrib/tcpdump/print-cnfp.c M contrib/tcpdump/print-dccp.c M contrib/tcpdump/print-decnet.c M contrib/tcpdump/print-dhcp6.c M contrib/tcpdump/print-domain.c M contrib/tcpdump/print-dsa.c M contrib/tcpdump/print-dtp.c M contrib/tcpdump/print-dvmrp.c M contrib/tcpdump/print-eap.c M contrib/tcpdump/print-egp.c M contrib/tcpdump/print-eigrp.c M contrib/tcpdump/print-enc.c M contrib/tcpdump/print-esp.c M contrib/tcpdump/print-ether.c M contrib/tcpdump/print-fddi.c M contrib/tcpdump/print-forces.c M contrib/tcpdump/print-fr.c M contrib/tcpdump/print-frag6.c M contrib/tcpdump/print-ftp.c M contrib/tcpdump/print-geneve.c M contrib/tcpdump/print-geonet.c M contrib/tcpdump/print-gre.c M contrib/tcpdump/print-hncp.c M contrib/tcpdump/print-hsrp.c M contrib/tcpdump/print-http.c M contrib/tcpdump/print-icmp.c M contrib/tcpdump/print-icmp6.c M contrib/tcpdump/print-igmp.c M contrib/tcpdump/print-igrp.c M contrib/tcpdump/print-ip-demux.c M contrib/tcpdump/print-ip.c M contrib/tcpdump/print-ip6.c M contrib/tcpdump/print-ip6opts.c M contrib/tcpdump/print-ipcomp.c M contrib/tcpdump/print-ipfc.c M contrib/tcpdump/print-ipnet.c M contrib/tcpdump/print-ipoib.c M contrib/tcpdump/print-ipx.c M contrib/tcpdump/print-isakmp.c M contrib/tcpdump/print-isoclns.c M contrib/tcpdump/print-juniper.c M contrib/tcpdump/print-krb.c M contrib/tcpdump/print-l2tp.c M contrib/tcpdump/print-lane.c M contrib/tcpdump/print-ldp.c M contrib/tcpdump/print-lisp.c M contrib/tcpdump/print-llc.c M contrib/tcpdump/print-lldp.c M contrib/tcpdump/print-lmp.c M contrib/tcpdump/print-loopback.c M contrib/tcpdump/print-lspping.c M contrib/tcpdump/print-lwapp.c M contrib/tcpdump/print-lwres.c M contrib/tcpdump/print-m3ua.c M contrib/tcpdump/print-macsec.c M contrib/tcpdump/print-mobile.c M contrib/tcpdump/print-mobility.c M contrib/tcpdump/print-mpcp.c M contrib/tcpdump/print-mpls.c M contrib/tcpdump/print-mptcp.c M contrib/tcpdump/print-msdp.c M contrib/tcpdump/print-msnlb.c M contrib/tcpdump/print-nflog.c M contrib/tcpdump/print-nfs.c M contrib/tcpdump/print-nsh.c M contrib/tcpdump/print-ntp.c M contrib/tcpdump/print-null.c M contrib/tcpdump/print-olsr.c M contrib/tcpdump/print-openflow-1.0.c M contrib/tcpdump/print-openflow-1.3.c M contrib/tcpdump/print-openflow.c M contrib/tcpdump/print-ospf.c M contrib/tcpdump/print-ospf6.c M contrib/tcpdump/print-otv.c M contrib/tcpdump/print-pflog.c M contrib/tcpdump/print-pgm.c M contrib/tcpdump/print-pim.c M contrib/tcpdump/print-pktap.c M contrib/tcpdump/print-ppi.c M contrib/tcpdump/print-ppp.c M contrib/tcpdump/print-pppoe.c M contrib/tcpdump/print-pptp.c M contrib/tcpdump/print-ptp.c M contrib/tcpdump/print-radius.c M contrib/tcpdump/print-raw.c M contrib/tcpdump/print-realtek.c M contrib/tcpdump/print-resp.c M contrib/tcpdump/print-rip.c M contrib/tcpdump/print-ripng.c M contrib/tcpdump/print-rpki-rtr.c M contrib/tcpdump/print-rsvp.c M contrib/tcpdump/print-rt6.c M contrib/tcpdump/print-rtsp.c M contrib/tcpdump/print-rx.c M contrib/tcpdump/print-sctp.c M contrib/tcpdump/print-sflow.c M contrib/tcpdump/print-sip.c M contrib/tcpdump/print-sl.c M contrib/tcpdump/print-sll.c M contrib/tcpdump/print-slow.c M contrib/tcpdump/print-smb.c M contrib/tcpdump/print-smtp.c M contrib/tcpdump/print-snmp.c M contrib/tcpdump/print-someip.c M contrib/tcpdump/print-ssh.c M contrib/tcpdump/print-stp.c M contrib/tcpdump/print-sunatm.c M contrib/tcpdump/print-sunrpc.c M contrib/tcpdump/print-symantec.c M contrib/tcpdump/print-syslog.c M contrib/tcpdump/print-tcp.c M contrib/tcpdump/print-telnet.c M contrib/tcpdump/print-tftp.c M contrib/tcpdump/print-timed.c M contrib/tcpdump/print-tipc.c M contrib/tcpdump/print-token.c M contrib/tcpdump/print-udld.c M contrib/tcpdump/print-udp.c M contrib/tcpdump/print-unsupported.c M contrib/tcpdump/print-usb.c M contrib/tcpdump/print-vjc.c M contrib/tcpdump/print-vqp.c M contrib/tcpdump/print-vrrp.c M contrib/tcpdump/print-vsock.c M contrib/tcpdump/print-vtp.c M contrib/tcpdump/print-vxlan-gpe.c M contrib/tcpdump/print-vxlan.c M contrib/tcpdump/print-wb.c M contrib/tcpdump/print-whois.c M contrib/tcpdump/print-zep.c M contrib/tcpdump/print-zephyr.c M contrib/tcpdump/print-zeromq.c M contrib/tcpdump/print.c M contrib/tcpdump/signature.c M contrib/tcpdump/smbutil.c M contrib/tcpdump/status-exit-codes.h M contrib/tcpdump/strtoaddr.c M contrib/tcpdump/tcp.h M contrib/tcpdump/tcpdump.1.in M contrib/tcpdump/tcpdump.c M contrib/tcpdump/udp.h M contrib/tcpdump/util-print.c M usr.sbin/tcpdump/tcpdump/config.h ____________________________________________________________________________________________________________ Commit: 68ddf72800f81ea725785848e9919a4a23acf411 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=68ddf72800f81ea725785848e9919a4a23acf411 Author: Joseph Mingrone (Sat 14 Sep 2024 18:09:34 BST) Committer: Joseph Mingrone (Wed 29 Jan 2025 19:29:29 GMT) libpcap: Update to 1.10.5 Reviewed by: kp (pflogd changes) Sponsored by: The FreeBSD Foundation (cherry picked from commit afdbf109c6a661a729938f68211054a0a50d38ac) (cherry picked from commit ecb75be376a3e18d3e4836b6ee07015264784694) (cherry picked from commit f0bcebe67ef6cf9f104535d6cd9f151c1b61dd6a) (cherry picked from commit 34aa6f2c2db5cc9655f201a1ef01adbb9fb484d5) M contrib/libpcap/CHANGES M contrib/libpcap/CMakeLists.txt M contrib/libpcap/CREDITS M contrib/libpcap/INSTALL.md M contrib/libpcap/Makefile.in M contrib/libpcap/TODO M contrib/libpcap/VERSION M contrib/libpcap/aclocal.m4 M contrib/libpcap/atmuni31.h A contrib/libpcap/autogen.sh M contrib/libpcap/bpf_dump.c M contrib/libpcap/bpf_filter.c M contrib/libpcap/bpf_image.c M contrib/libpcap/charconv.c M contrib/libpcap/cmake/Modules/Finddpdk.cmake M contrib/libpcap/cmakeconfig.h.in M contrib/libpcap/config.guess M contrib/libpcap/config.h.in M contrib/libpcap/config.sub M contrib/libpcap/configure M contrib/libpcap/configure.ac M contrib/libpcap/diag-control.h M contrib/libpcap/dlpisubs.c A contrib/libpcap/doc/README.haiku.md M contrib/libpcap/doc/README.hpux R100 contrib/libpcap/doc/README.Win32.md contrib/libpcap/doc/README.windows.md M contrib/libpcap/etherent.c M contrib/libpcap/extract.h M contrib/libpcap/fad-getad.c M contrib/libpcap/fad-gifc.c M contrib/libpcap/fad-glifc.c M contrib/libpcap/fmtutils.c M contrib/libpcap/fmtutils.h M contrib/libpcap/ftmacros.h M contrib/libpcap/gencode.c M contrib/libpcap/gencode.h M contrib/libpcap/grammar.y.in M contrib/libpcap/install-sh M contrib/libpcap/missing/asprintf.c M contrib/libpcap/missing/strlcat.c M contrib/libpcap/missing/strlcpy.c M contrib/libpcap/missing/strtok_r.c M contrib/libpcap/missing/win_asprintf.c M contrib/libpcap/mkdep M contrib/libpcap/msdos/makefile M contrib/libpcap/msdos/makefile.dj M contrib/libpcap/msdos/makefile.wc M contrib/libpcap/msdos/pktdrvr.c M contrib/libpcap/msdos/pktdrvr.h M contrib/libpcap/msdos/readme.dos M contrib/libpcap/nametoaddr.c M contrib/libpcap/nlpid.h M contrib/libpcap/optimize.c M contrib/libpcap/pcap-airpcap.c M contrib/libpcap/pcap-bpf.c M contrib/libpcap/pcap-bt-linux.c M contrib/libpcap/pcap-bt-monitor-linux.c M contrib/libpcap/pcap-common.c M contrib/libpcap/pcap-config.1 M contrib/libpcap/pcap-config.in M contrib/libpcap/pcap-dag.c M contrib/libpcap/pcap-dbus.c M contrib/libpcap/pcap-dlpi.c M contrib/libpcap/pcap-dos.c M contrib/libpcap/pcap-dpdk.c M contrib/libpcap/pcap-enet.c M contrib/libpcap/pcap-filter.manmisc.in A contrib/libpcap/pcap-haiku.c D contrib/libpcap/pcap-haiku.cpp M contrib/libpcap/pcap-int.h M contrib/libpcap/pcap-libdlpi.c M contrib/libpcap/pcap-linux.c M contrib/libpcap/pcap-netfilter-linux.c M contrib/libpcap/pcap-netmap.c M contrib/libpcap/pcap-new.c M contrib/libpcap/pcap-nit.c M contrib/libpcap/pcap-npf.c M contrib/libpcap/pcap-null.c M contrib/libpcap/pcap-pf.c M contrib/libpcap/pcap-rdmasniff.c D contrib/libpcap/pcap-rpcap-int.h M contrib/libpcap/pcap-rpcap.c M contrib/libpcap/pcap-savefile.manfile.in M contrib/libpcap/pcap-septel.c M contrib/libpcap/pcap-sita.c M contrib/libpcap/pcap-sita.html M contrib/libpcap/pcap-snf.c M contrib/libpcap/pcap-snit.c M contrib/libpcap/pcap-snoop.c M contrib/libpcap/pcap-tc.c M contrib/libpcap/pcap-tstamp.manmisc.in D contrib/libpcap/pcap-usb-linux-common.c M contrib/libpcap/pcap-usb-linux-common.h M contrib/libpcap/pcap-usb-linux.c M contrib/libpcap/pcap-util.c M contrib/libpcap/pcap-util.h M contrib/libpcap/pcap.3pcap.in M contrib/libpcap/pcap.c M contrib/libpcap/pcap/can_socketcan.h M contrib/libpcap/pcap/dlt.h M contrib/libpcap/pcap/funcattrs.h M contrib/libpcap/pcap/namedb.h M contrib/libpcap/pcap/nflog.h M contrib/libpcap/pcap/pcap-inttypes.h M contrib/libpcap/pcap/pcap.h M contrib/libpcap/pcap/sll.h M contrib/libpcap/pcap/socket.h M contrib/libpcap/pcap/usb.h M contrib/libpcap/pcap_activate.3pcap M contrib/libpcap/pcap_breakloop.3pcap M contrib/libpcap/pcap_compile.3pcap.in M contrib/libpcap/pcap_create.3pcap M contrib/libpcap/pcap_dump.3pcap M contrib/libpcap/pcap_findalldevs.3pcap M contrib/libpcap/pcap_init.3pcap M contrib/libpcap/pcap_lookupdev.3pcap M contrib/libpcap/pcap_lookupnet.3pcap M contrib/libpcap/pcap_loop.3pcap M contrib/libpcap/pcap_next_ex.3pcap M contrib/libpcap/pcap_offline_filter.3pcap M contrib/libpcap/pcap_open_live.3pcap M contrib/libpcap/pcap_open_offline.3pcap.in M contrib/libpcap/pcap_set_tstamp_precision.3pcap.in M contrib/libpcap/pcap_setnonblock.3pcap M contrib/libpcap/pcap_strerror.3pcap M contrib/libpcap/portability.h M contrib/libpcap/ppp.h M contrib/libpcap/rpcap-protocol.c M contrib/libpcap/rpcap-protocol.h M contrib/libpcap/rpcapd/CMakeLists.txt M contrib/libpcap/rpcapd/Makefile.in M contrib/libpcap/rpcapd/config_params.h M contrib/libpcap/rpcapd/daemon.c M contrib/libpcap/rpcapd/daemon.h M contrib/libpcap/rpcapd/fileconf.c M contrib/libpcap/rpcapd/log.c M contrib/libpcap/rpcapd/rpcapd-config.manfile.in M contrib/libpcap/rpcapd/rpcapd.c M contrib/libpcap/rpcapd/rpcapd.manadmin.in M contrib/libpcap/rpcapd/win32-svc.c M contrib/libpcap/savefile.c M contrib/libpcap/scanner.l M contrib/libpcap/sf-pcap.c M contrib/libpcap/sf-pcapng.c M contrib/libpcap/sockutils.c M contrib/libpcap/sockutils.h M contrib/libpcap/sslutils.c M contrib/libpcap/sslutils.h M contrib/libpcap/testprogs/Makefile.in M contrib/libpcap/testprogs/filtertest.c M contrib/libpcap/testprogs/findalldevstest-perf.c M contrib/libpcap/testprogs/findalldevstest.c M contrib/libpcap/testprogs/valgrindtest.c A contrib/libpcap/thread-local.h M contrib/pf/pflogd/pflogd.c M lib/libpcap/Makefile M lib/libpcap/config.h ____________________________________________________________________________________________________________ Commit: f68d1f3ef23f4a409535051d541e8e97f45eae3c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f68d1f3ef23f4a409535051d541e8e97f45eae3c Author: Guy Harris (Tue 3 Sep 2024 18:11:16 BST) Committer: Joseph Mingrone (Wed 29 Jan 2025 19:29:29 GMT) tcpdump: ppp: Use the buffer stack for the de-escaping buffer This both saves the buffer for freeing later and saves the packet pointer and snapend to be restored when packet processing is complete, even if an exception is thrown with longjmp. This means that the hex/ASCII printing in pretty_print_packet() processes the packet data as captured or read from the savefile, rather than as modified by the PPP printer, so that the bounds checking is correct. That fixes CVE-2024-2397, which was caused by an exception being thrown by the hex/ASCII printer (which should only happen if those routines are called by a packet printer, not if they're called for the -X/-x/-A flag), which jumps back to the setjmp() that surrounds the packet printer. Hilarity^Winfinite looping ensues. Also, restore ndo->ndo_packetp before calling the hex/ASCII printing routine, in case nd_pop_all_packet_info() didn't restore it. Reviewed by: emaste (cherry picked from commit f8860353d4f4c25bacdae5bc1cfb7a95edc9bfe0) M contrib/tcpdump/print-ppp.c M contrib/tcpdump/print.c ____________________________________________________________________________________________________________ Commit: e5258a079df39bc40ccfd96e107784f9252170ac URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e5258a079df39bc40ccfd96e107784f9252170ac Author: Joseph Mingrone (Wed 7 Jun 2023 03:21:27 BST) Committer: Joseph Mingrone (Wed 29 Jan 2025 19:29:29 GMT) tpcdump: Update to 4.99.4 Prior to this MFC, the stable/13 tcpdump was at version 4.9.3, which was released over five years ago. Several CVEs have been identified in that version. For a detailed list, see https://www.tcpdump.org/public-cve-list.txt. Reviewed by: kp (print-pf changes) Sponsored by: The FreeBSD Foundation (cherry picked from commit 1cdec2832d051ddcb1417f3f2601e6212aff2613) (cherry picked from commit ee67461e56828dd1f8de165947ba83f6d9148a87) (cherry picked from commit a75d93a74d55d371876f5444075de4ecd685297f) (cherry picked from commit 171a7bbfc04885150401ab64d96793373a8b2061) (cherry picked from commit 1ad8d2ee1f7dec1d747ec955a68fbbb362958315) (cherry picked from commit 7e0a7ef95fac1183854cab662bd9afa4647422d6) (cherry picked from commit 85247ee6a2ba1c2dd0053e9be9055efa4be1438e) Commit 1cdec2832d051ddcb1417f3f2601e6212aff2613 has been adapted for stable/13. Changes to usr.sbin/ndp/ndp_netlink.c have been omitted because 91fbe0819bb9 (ndp: convert ndp(8) to netlink) has not been MFCed. Commit ee67461e56828dd1f8de165947ba83f6d9148a87 has been adapted for stable/13. Most modifications were required because 4bf98559d9d6fa7c3571d26ed6f2b18823e3a30b was not MFCed to stable/13. Also incorporate a small change from 4848eb3af2a91b133c4b70cb9b71dd92ffec7f46 to fix the build. M contrib/tcpdump/CHANGES A contrib/tcpdump/CMakeLists.txt D contrib/tcpdump/CONTRIBUTING A contrib/tcpdump/CONTRIBUTING.md M contrib/tcpdump/CREDITS R069 contrib/tcpdump/INSTALL.txt contrib/tcpdump/INSTALL.md M contrib/tcpdump/LICENSE M contrib/tcpdump/Makefile.in D contrib/tcpdump/PLATFORMS D contrib/tcpdump/README M contrib/tcpdump/README.md M contrib/tcpdump/VERSION M contrib/tcpdump/addrtoname.c M contrib/tcpdump/addrtoname.h M contrib/tcpdump/addrtostr.c M contrib/tcpdump/af.c M contrib/tcpdump/af.h M contrib/tcpdump/ah.h M contrib/tcpdump/appletalk.h M contrib/tcpdump/ascii_strcasecmp.c M contrib/tcpdump/atime.awk M contrib/tcpdump/bpf_dump.c M contrib/tcpdump/chdlc.h M contrib/tcpdump/checksum.c A contrib/tcpdump/cmake/Modules/FindCRYPTO.cmake A contrib/tcpdump/cmake/Modules/FindPCAP.cmake A contrib/tcpdump/cmake/Modules/FindSMI.cmake A contrib/tcpdump/cmake_uninstall.cmake.in A contrib/tcpdump/cmakeconfig.h.in A contrib/tcpdump/compiler-tests.h M contrib/tcpdump/config.guess M contrib/tcpdump/config.h.in M contrib/tcpdump/config.sub M contrib/tcpdump/configure M contrib/tcpdump/configure.ac M contrib/tcpdump/cpack.c M contrib/tcpdump/cpack.h A contrib/tcpdump/diag-control.h A contrib/tcpdump/doc/README.NetBSD.md A contrib/tcpdump/doc/README.Win32.md A contrib/tcpdump/doc/README.aix.md A contrib/tcpdump/doc/README.solaris.md M contrib/tcpdump/ethertype.h M contrib/tcpdump/extract.h R076 contrib/tcpdump/ether.h contrib/tcpdump/fptype.c A contrib/tcpdump/fptype.h A contrib/tcpdump/ftmacros.h M contrib/tcpdump/funcattrs.h A contrib/tcpdump/getservent.h M contrib/tcpdump/gmpls.c D contrib/tcpdump/gmt2local.c D contrib/tcpdump/gmt2local.h M contrib/tcpdump/in_cksum.c M contrib/tcpdump/interface.h M contrib/tcpdump/ip.h M contrib/tcpdump/ip6.h M contrib/tcpdump/ipproto.c M contrib/tcpdump/ipproto.h M contrib/tcpdump/l2vpn.c M contrib/tcpdump/machdep.c M contrib/tcpdump/missing/datalinks.c M contrib/tcpdump/missing/dlnames.c M contrib/tcpdump/missing/getopt_long.c R096 contrib/tcpdump/getopt_long.h contrib/tcpdump/missing/getopt_long.h A contrib/tcpdump/missing/getservent.c A contrib/tcpdump/missing/pcap_dump_ftell.c M contrib/tcpdump/missing/snprintf.c M contrib/tcpdump/missing/strlcat.c M contrib/tcpdump/missing/strlcpy.c M contrib/tcpdump/missing/strsep.c M contrib/tcpdump/mkdep M contrib/tcpdump/mpls.h M contrib/tcpdump/nameser.h A contrib/tcpdump/netdissect-alloc.c A contrib/tcpdump/netdissect-alloc.h A contrib/tcpdump/netdissect-ctype.h M contrib/tcpdump/netdissect-stdinc.h M contrib/tcpdump/netdissect.c M contrib/tcpdump/netdissect.h M contrib/tcpdump/nfs.h M contrib/tcpdump/nfsfh.h M contrib/tcpdump/nlpid.c A contrib/tcpdump/ntp.c R052 contrib/tcpdump/vfprintf.c contrib/tcpdump/ntp.h M contrib/tcpdump/openflow.h M contrib/tcpdump/ospf.h M contrib/tcpdump/oui.c M contrib/tcpdump/oui.h M contrib/tcpdump/parsenfsfh.c D contrib/tcpdump/pcap_dump_ftell.c A contrib/tcpdump/pflog.h M contrib/tcpdump/ppp.h M contrib/tcpdump/print-802_11.c M contrib/tcpdump/print-802_15_4.c M contrib/tcpdump/print-ah.c M contrib/tcpdump/print-ahcp.c M contrib/tcpdump/print-aodv.c M contrib/tcpdump/print-aoe.c M contrib/tcpdump/print-ap1394.c M contrib/tcpdump/print-arcnet.c A contrib/tcpdump/print-arista.c M contrib/tcpdump/print-arp.c M contrib/tcpdump/print-ascii.c M contrib/tcpdump/print-atalk.c M contrib/tcpdump/print-atm.c M contrib/tcpdump/print-babel.c A contrib/tcpdump/print-bcm-li.c M contrib/tcpdump/print-beep.c M contrib/tcpdump/print-bfd.c M contrib/tcpdump/print-bgp.c M contrib/tcpdump/print-bootp.c A contrib/tcpdump/print-brcmtag.c M contrib/tcpdump/print-bt.c M contrib/tcpdump/print-calm-fast.c M contrib/tcpdump/print-carp.c M contrib/tcpdump/print-cdp.c M contrib/tcpdump/print-cfm.c M contrib/tcpdump/print-chdlc.c M contrib/tcpdump/print-cip.c M contrib/tcpdump/print-cnfp.c M contrib/tcpdump/print-dccp.c M contrib/tcpdump/print-decnet.c M contrib/tcpdump/print-dhcp6.c M contrib/tcpdump/print-domain.c A contrib/tcpdump/print-dsa.c M contrib/tcpdump/print-dtp.c M contrib/tcpdump/print-dvmrp.c M contrib/tcpdump/print-eap.c M contrib/tcpdump/print-egp.c M contrib/tcpdump/print-eigrp.c M contrib/tcpdump/print-enc.c M contrib/tcpdump/print-esp.c M contrib/tcpdump/print-ether.c M contrib/tcpdump/print-fddi.c M contrib/tcpdump/print-forces.c M contrib/tcpdump/print-fr.c M contrib/tcpdump/print-frag6.c M contrib/tcpdump/print-ftp.c M contrib/tcpdump/print-geneve.c M contrib/tcpdump/print-geonet.c M contrib/tcpdump/print-gre.c M contrib/tcpdump/print-hncp.c M contrib/tcpdump/print-hsrp.c M contrib/tcpdump/print-http.c M contrib/tcpdump/print-icmp.c M contrib/tcpdump/print-icmp6.c M contrib/tcpdump/print-igmp.c M contrib/tcpdump/print-igrp.c A contrib/tcpdump/print-ip-demux.c M contrib/tcpdump/print-ip.c M contrib/tcpdump/print-ip6.c M contrib/tcpdump/print-ip6opts.c M contrib/tcpdump/print-ipcomp.c M contrib/tcpdump/print-ipfc.c M contrib/tcpdump/print-ipnet.c A contrib/tcpdump/print-ipoib.c M contrib/tcpdump/print-ipx.c M contrib/tcpdump/print-isakmp.c M contrib/tcpdump/print-isoclns.c M contrib/tcpdump/print-juniper.c M contrib/tcpdump/print-krb.c M contrib/tcpdump/print-l2tp.c M contrib/tcpdump/print-lane.c M contrib/tcpdump/print-ldp.c M contrib/tcpdump/print-lisp.c M contrib/tcpdump/print-llc.c M contrib/tcpdump/print-lldp.c M contrib/tcpdump/print-lmp.c M contrib/tcpdump/print-loopback.c M contrib/tcpdump/print-lspping.c M contrib/tcpdump/print-lwapp.c M contrib/tcpdump/print-lwres.c M contrib/tcpdump/print-m3ua.c A contrib/tcpdump/print-macsec.c D contrib/tcpdump/print-medsa.c M contrib/tcpdump/print-mobile.c M contrib/tcpdump/print-mobility.c M contrib/tcpdump/print-mpcp.c M contrib/tcpdump/print-mpls.c M contrib/tcpdump/print-mptcp.c M contrib/tcpdump/print-msdp.c M contrib/tcpdump/print-msnlb.c M contrib/tcpdump/print-nflog.c M contrib/tcpdump/print-nfs.c M contrib/tcpdump/print-nsh.c M contrib/tcpdump/print-ntp.c M contrib/tcpdump/print-null.c M contrib/tcpdump/print-olsr.c M contrib/tcpdump/print-openflow-1.0.c A contrib/tcpdump/print-openflow-1.3.c M contrib/tcpdump/print-openflow.c M contrib/tcpdump/print-ospf.c M contrib/tcpdump/print-ospf6.c M contrib/tcpdump/print-otv.c M contrib/tcpdump/print-pflog.c M contrib/tcpdump/print-pfsync.c M contrib/tcpdump/print-pgm.c M contrib/tcpdump/print-pim.c M contrib/tcpdump/print-pktap.c M contrib/tcpdump/print-ppi.c M contrib/tcpdump/print-ppp.c M contrib/tcpdump/print-pppoe.c M contrib/tcpdump/print-pptp.c A contrib/tcpdump/print-ptp.c M contrib/tcpdump/print-radius.c M contrib/tcpdump/print-raw.c A contrib/tcpdump/print-realtek.c M contrib/tcpdump/print-resp.c M contrib/tcpdump/print-rip.c M contrib/tcpdump/print-ripng.c M contrib/tcpdump/print-rpki-rtr.c D contrib/tcpdump/print-rrcp.c M contrib/tcpdump/print-rsvp.c M contrib/tcpdump/print-rt6.c M contrib/tcpdump/print-rtsp.c M contrib/tcpdump/print-rx.c M contrib/tcpdump/print-sctp.c M contrib/tcpdump/print-sflow.c M contrib/tcpdump/print-sip.c M contrib/tcpdump/print-sl.c M contrib/tcpdump/print-sll.c M contrib/tcpdump/print-slow.c M contrib/tcpdump/print-smb.c M contrib/tcpdump/print-smtp.c M contrib/tcpdump/print-snmp.c A contrib/tcpdump/print-someip.c A contrib/tcpdump/print-ssh.c M contrib/tcpdump/print-stp.c M contrib/tcpdump/print-sunatm.c M contrib/tcpdump/print-sunrpc.c M contrib/tcpdump/print-symantec.c M contrib/tcpdump/print-syslog.c M contrib/tcpdump/print-tcp.c M contrib/tcpdump/print-telnet.c M contrib/tcpdump/print-tftp.c M contrib/tcpdump/print-timed.c M contrib/tcpdump/print-tipc.c M contrib/tcpdump/print-token.c M contrib/tcpdump/print-udld.c M contrib/tcpdump/print-udp.c A contrib/tcpdump/print-unsupported.c M contrib/tcpdump/print-usb.c M contrib/tcpdump/print-vjc.c M contrib/tcpdump/print-vqp.c M contrib/tcpdump/print-vrrp.c A contrib/tcpdump/print-vsock.c M contrib/tcpdump/print-vtp.c M contrib/tcpdump/print-vxlan-gpe.c M contrib/tcpdump/print-vxlan.c M contrib/tcpdump/print-wb.c A contrib/tcpdump/print-whois.c A contrib/tcpdump/print-zep.c M contrib/tcpdump/print-zephyr.c M contrib/tcpdump/print-zeromq.c M contrib/tcpdump/print.c M contrib/tcpdump/print.h M contrib/tcpdump/rpc_auth.h M contrib/tcpdump/rpc_msg.h D contrib/tcpdump/rpl.h D contrib/tcpdump/setsignal.c D contrib/tcpdump/setsignal.h M contrib/tcpdump/signature.c M contrib/tcpdump/slcompress.h M contrib/tcpdump/smb.h M contrib/tcpdump/smbutil.c A contrib/tcpdump/status-exit-codes.h M contrib/tcpdump/stime.awk M contrib/tcpdump/strtoaddr.c M contrib/tcpdump/tcp.h M contrib/tcpdump/tcpdump.1.in M contrib/tcpdump/tcpdump.c M contrib/tcpdump/timeval-operations.h M contrib/tcpdump/udp.h M contrib/tcpdump/util-print.c A contrib/tcpdump/varattrs.h M usr.sbin/ndp/Makefile M usr.sbin/ndp/ndp.c M usr.sbin/tcpdump/tcpdump/Makefile M usr.sbin/tcpdump/tcpdump/config.h ____________________________________________________________________________________________________________ Commit: 33c859c48732471ba9d331e4f758aebe819d604b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=33c859c48732471ba9d331e4f758aebe819d604b Author: Pierre Pronchery (Tue 9 May 2023 14:04:45 BST) Committer: Joseph Mingrone (Wed 29 Jan 2025 19:29:28 GMT) tcpdump: specify OpenSSL 1.1 APIs OPENSSL_API_COMPAT can be used to specify the OpenSSL API version in use for the purpose of hiding deprecated interfaces and enabling the appropriate deprecation notices. This change is a NFC while we're still using OpenSSL 1.1.1 but will avoid deprecation warnings upon the switch to OpenSSL 3.0. A future update should migrate to use the OpenSSL 3.0 APIs. PR: 271615 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271615 ) Reviewed by: emaste Event: Kitchener-Waterloo Hackathon 202305 Sponsored by: The FreeBSD Foundation (cherry picked from commit baef3a5b585f462d9256f3b5a771ab5508ef6fd2) M usr.sbin/tcpdump/tcpdump/Makefile ____________________________________________________________________________________________________________ Commit: e6efc827e47a5b3ddbaedc4aa9783ffeb986abc9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e6efc827e47a5b3ddbaedc4aa9783ffeb986abc9 Author: Joseph Mingrone (Fri 5 May 2023 14:56:10 BST) Committer: Joseph Mingrone (Wed 29 Jan 2025 19:29:28 GMT) libpcap: Update to 1.10.4 Sponsored by: The FreeBSD Foundation (cherry picked from commit dd744a896be358d6f001766188da6aed80e00378) (cherry picked from commit 270d20ce91c898c532ebaff76bb5b71c8544e928) (cherry picked from commit 67c802c948abf6955c3d8b53f4a41293a9caea24) (cherry picked from commit b1538e8fc488409113b833dd1c53aab1057b0568) M contrib/libpcap/CHANGES M contrib/libpcap/Makefile.in M contrib/libpcap/README.md M contrib/libpcap/VERSION M contrib/libpcap/aclocal.m4 M contrib/libpcap/config.guess M contrib/libpcap/config.sub M contrib/libpcap/configure M contrib/libpcap/configure.ac M contrib/libpcap/gencode.c M contrib/libpcap/mkdep M contrib/libpcap/msdos/makefile M contrib/libpcap/nametoaddr.c M contrib/libpcap/optimize.c M contrib/libpcap/pcap-bt-linux.c M contrib/libpcap/pcap-common.c M contrib/libpcap/pcap-libdlpi.c M contrib/libpcap/pcap-linux.c M contrib/libpcap/pcap-netfilter-linux.c M contrib/libpcap/pcap-npf.c M contrib/libpcap/pcap-sita.c M contrib/libpcap/pcap-sita.html M contrib/libpcap/pcap-snf.c M contrib/libpcap/pcap-usb-linux.c M contrib/libpcap/pcap/bpf.h M contrib/libpcap/pcap/dlt.h M contrib/libpcap/pcap/pcap.h M contrib/libpcap/rpcapd/Makefile.in M contrib/libpcap/rpcapd/org.tcpdump.rpcapd.plist M contrib/libpcap/rpcapd/rpcapd.manadmin.in M contrib/libpcap/sockutils.c M contrib/libpcap/testprogs/Makefile.in M lib/libpcap/Makefile.depend M lib/libpcap/Makefile.depend.options M lib/libpcap/config.h ____________________________________________________________________________________________________________ Commit: f904cde2ea104ca5b0a0af880a9094793fd8f4ef URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f904cde2ea104ca5b0a0af880a9094793fd8f4ef Author: Kajetan Staszkiewicz (Tue 18 Apr 2023 08:33:33 BST) Committer: Joseph Mingrone (Wed 29 Jan 2025 19:29:28 GMT) tcpdump: add missing pf reasons and actions Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D39586 (cherry picked from commit 56cd7716b63d84190e6308d50717ec8bbbdfe1c0) M contrib/tcpdump/print-pflog.c ____________________________________________________________________________________________________________ Commit: 7aedea8685359fa5e914a7341ef0ef33b8227d7c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7aedea8685359fa5e914a7341ef0ef33b8227d7c Author: Joseph Mingrone (Mon 13 Feb 2023 22:06:51 GMT) Committer: Joseph Mingrone (Wed 29 Jan 2025 19:29:28 GMT) libpcap: Update to 1.10.3 Prior to this MFC, the stable/13 libpcap was at version 1.9.1, which was released over five years ago. Several CVEs have been identified in that version. For a detailed list, see https://www.tcpdump.org/public-cve-list.txt. Reviewed by: kp (pf changes) Sponsored by: The FreeBSD Foundation (cherry picked from commit 6d1c946e916845d01062e146aad5395410da1e54) (cherry picked from commit 0c59e0b4e5817f139ce28486085b2f196351c7a3) (cherry picked from commit 512c553671bef26e93342d4ae1ec5f60d8ae112b) (cherry picked from commit 6f9cba8f8b5efd16249633e52483ea351876b67b) (cherry picked from commit 437f05885047c533cadf15b564729cfd0273d2fe) Commit 437f05885047c533cadf15b564729cfd0273d2fe has been adapted to only include the changes for the libpcap 1.10.3 update. M ObsoleteFiles.inc M contrib/libpcap/CHANGES M contrib/libpcap/CMakeLists.txt M contrib/libpcap/CONTRIBUTING.md M contrib/libpcap/CREDITS M contrib/libpcap/INSTALL.md M contrib/libpcap/Makefile-devel-adds M contrib/libpcap/Makefile.in M contrib/libpcap/README.md M contrib/libpcap/TODO M contrib/libpcap/VERSION D contrib/libpcap/Win32/Prj/wpcap.sln D contrib/libpcap/Win32/Prj/wpcap.vcxproj D contrib/libpcap/Win32/Prj/wpcap.vcxproj.filters M contrib/libpcap/aclocal.m4 M contrib/libpcap/atmuni31.h M contrib/libpcap/bpf_filter.c M contrib/libpcap/bpf_image.c A contrib/libpcap/charconv.c A contrib/libpcap/charconv.h A contrib/libpcap/cmake/Modules/FindAirPcap.cmake M contrib/libpcap/cmake/Modules/FindDAG.cmake M contrib/libpcap/cmake/Modules/FindPacket.cmake M contrib/libpcap/cmake/Modules/FindSNF.cmake A contrib/libpcap/cmake/Modules/Finddpdk.cmake M contrib/libpcap/cmakeconfig.h.in M contrib/libpcap/config.guess M contrib/libpcap/config.h.in M contrib/libpcap/config.sub M contrib/libpcap/configure M contrib/libpcap/configure.ac M contrib/libpcap/diag-control.h M contrib/libpcap/dlpisubs.c D contrib/libpcap/doc/DLT_ALLOCATE_HOWTO.md M contrib/libpcap/doc/README.Win32.md M contrib/libpcap/doc/README.aix M contrib/libpcap/doc/README.dag M contrib/libpcap/doc/README.hpux A contrib/libpcap/doc/README.linux D contrib/libpcap/doc/README.linux.md M contrib/libpcap/doc/README.septel M contrib/libpcap/doc/README.sita A contrib/libpcap/doc/README.solaris.md D contrib/libpcap/doc/README.tru64 M contrib/libpcap/etherent.c M contrib/libpcap/ethertype.h M contrib/libpcap/extract.h M contrib/libpcap/fad-getad.c M contrib/libpcap/fad-gifc.c M contrib/libpcap/fad-glifc.c M contrib/libpcap/fmtutils.c M contrib/libpcap/fmtutils.h M contrib/libpcap/ftmacros.h M contrib/libpcap/gencode.c M contrib/libpcap/gencode.h R081 contrib/libpcap/grammar.y contrib/libpcap/grammar.y.in M contrib/libpcap/ieee80211.h M contrib/libpcap/lbl/os-osf4.h M contrib/libpcap/lbl/os-osf5.h M contrib/libpcap/lbl/os-solaris2.h M contrib/libpcap/lbl/os-sunos4.h M contrib/libpcap/libpcap.pc.in M contrib/libpcap/missing/asprintf.c M contrib/libpcap/missing/getopt.c D contrib/libpcap/missing/snprintf.c M contrib/libpcap/missing/win_asprintf.c D contrib/libpcap/missing/win_snprintf.c M contrib/libpcap/mkdep M contrib/libpcap/msdos/readme.dos M contrib/libpcap/nametoaddr.c M contrib/libpcap/nomkdep M contrib/libpcap/optimize.c M contrib/libpcap/org.tcpdump.chmod_bpf.plist A contrib/libpcap/pcap-airpcap.c A contrib/libpcap/pcap-airpcap.h M contrib/libpcap/pcap-bpf.c M contrib/libpcap/pcap-bt-linux.c M contrib/libpcap/pcap-bt-monitor-linux.c M contrib/libpcap/pcap-common.c M contrib/libpcap/pcap-common.h M contrib/libpcap/pcap-config.1 M contrib/libpcap/pcap-config.in M contrib/libpcap/pcap-dag.c M contrib/libpcap/pcap-dbus.c M contrib/libpcap/pcap-dll.rc M contrib/libpcap/pcap-dlpi.c M contrib/libpcap/pcap-dos.c A contrib/libpcap/pcap-dpdk.c A contrib/libpcap/pcap-dpdk.h M contrib/libpcap/pcap-enet.c M contrib/libpcap/pcap-filter.manmisc.in A contrib/libpcap/pcap-haiku.cpp M contrib/libpcap/pcap-int.h M contrib/libpcap/pcap-libdlpi.c M contrib/libpcap/pcap-linktype.manmisc.in M contrib/libpcap/pcap-linux.c M contrib/libpcap/pcap-netfilter-linux.c M contrib/libpcap/pcap-netmap.c M contrib/libpcap/pcap-new.c M contrib/libpcap/pcap-nit.c M contrib/libpcap/pcap-npf.c M contrib/libpcap/pcap-pf.c M contrib/libpcap/pcap-rdmasniff.c M contrib/libpcap/pcap-rpcap.c M contrib/libpcap/pcap-savefile.manfile.in M contrib/libpcap/pcap-septel.c M contrib/libpcap/pcap-sita.c M contrib/libpcap/pcap-sita.html M contrib/libpcap/pcap-snf.c M contrib/libpcap/pcap-snit.c M contrib/libpcap/pcap-snoop.c M contrib/libpcap/pcap-tc.c M contrib/libpcap/pcap-tstamp.manmisc.in M contrib/libpcap/pcap-types.h A contrib/libpcap/pcap-usb-linux-common.c A contrib/libpcap/pcap-usb-linux-common.h M contrib/libpcap/pcap-usb-linux.c A contrib/libpcap/pcap-util.c A contrib/libpcap/pcap-util.h M contrib/libpcap/pcap.3pcap.in M contrib/libpcap/pcap.c M contrib/libpcap/pcap/bpf.h M contrib/libpcap/pcap/can_socketcan.h M contrib/libpcap/pcap/compiler-tests.h M contrib/libpcap/pcap/dlt.h M contrib/libpcap/pcap/funcattrs.h M contrib/libpcap/pcap/namedb.h M contrib/libpcap/pcap/pcap-inttypes.h M contrib/libpcap/pcap/pcap.h M contrib/libpcap/pcap/socket.h M contrib/libpcap/pcap_activate.3pcap M contrib/libpcap/pcap_breakloop.3pcap M contrib/libpcap/pcap_can_set_rfmon.3pcap M contrib/libpcap/pcap_close.3pcap M contrib/libpcap/pcap_compile.3pcap.in M contrib/libpcap/pcap_create.3pcap M contrib/libpcap/pcap_datalink.3pcap.in M contrib/libpcap/pcap_datalink_name_to_val.3pcap M contrib/libpcap/pcap_datalink_val_to_name.3pcap M contrib/libpcap/pcap_dump.3pcap M contrib/libpcap/pcap_dump_close.3pcap M contrib/libpcap/pcap_dump_file.3pcap M contrib/libpcap/pcap_dump_flush.3pcap M contrib/libpcap/pcap_dump_ftell.3pcap M contrib/libpcap/pcap_dump_open.3pcap.in M contrib/libpcap/pcap_file.3pcap M contrib/libpcap/pcap_fileno.3pcap M contrib/libpcap/pcap_findalldevs.3pcap M contrib/libpcap/pcap_freecode.3pcap M contrib/libpcap/pcap_get_required_select_timeout.3pcap M contrib/libpcap/pcap_get_selectable_fd.3pcap M contrib/libpcap/pcap_get_tstamp_precision.3pcap.in M contrib/libpcap/pcap_geterr.3pcap A contrib/libpcap/pcap_init.3pcap M contrib/libpcap/pcap_inject.3pcap M contrib/libpcap/pcap_is_swapped.3pcap M contrib/libpcap/pcap_lib_version.3pcap M contrib/libpcap/pcap_list_datalinks.3pcap.in M contrib/libpcap/pcap_list_tstamp_types.3pcap.in M contrib/libpcap/pcap_lookupdev.3pcap M contrib/libpcap/pcap_lookupnet.3pcap M contrib/libpcap/pcap_loop.3pcap M contrib/libpcap/pcap_major_version.3pcap M contrib/libpcap/pcap_next_ex.3pcap M contrib/libpcap/pcap_offline_filter.3pcap M contrib/libpcap/pcap_open_dead.3pcap.in M contrib/libpcap/pcap_open_live.3pcap M contrib/libpcap/pcap_open_offline.3pcap.in M contrib/libpcap/pcap_set_buffer_size.3pcap M contrib/libpcap/pcap_set_datalink.3pcap M contrib/libpcap/pcap_set_immediate_mode.3pcap.in M contrib/libpcap/pcap_set_promisc.3pcap M contrib/libpcap/pcap_set_protocol_linux.3pcap M contrib/libpcap/pcap_set_rfmon.3pcap M contrib/libpcap/pcap_set_snaplen.3pcap M contrib/libpcap/pcap_set_timeout.3pcap M contrib/libpcap/pcap_set_tstamp_precision.3pcap.in M contrib/libpcap/pcap_set_tstamp_type.3pcap.in M contrib/libpcap/pcap_setdirection.3pcap M contrib/libpcap/pcap_setfilter.3pcap M contrib/libpcap/pcap_setnonblock.3pcap M contrib/libpcap/pcap_snapshot.3pcap M contrib/libpcap/pcap_stats.3pcap M contrib/libpcap/pcap_statustostr.3pcap M contrib/libpcap/pcap_strerror.3pcap M contrib/libpcap/pcap_tstamp_type_name_to_val.3pcap M contrib/libpcap/pcap_tstamp_type_val_to_name.3pcap A contrib/libpcap/pflog.h M contrib/libpcap/portability.h M contrib/libpcap/rpcap-protocol.c M contrib/libpcap/rpcap-protocol.h M contrib/libpcap/rpcapd/CMakeLists.txt M contrib/libpcap/rpcapd/Makefile.in M contrib/libpcap/rpcapd/daemon.c M contrib/libpcap/rpcapd/daemon.h M contrib/libpcap/rpcapd/fileconf.c M contrib/libpcap/rpcapd/log.c M contrib/libpcap/rpcapd/org.tcpdump.rpcapd.plist M contrib/libpcap/rpcapd/rpcapd-config.manfile.in M contrib/libpcap/rpcapd/rpcapd.c M contrib/libpcap/rpcapd/rpcapd.manadmin.in M contrib/libpcap/rpcapd/win32-svc.c M contrib/libpcap/rpcapd/win32-svc.h M contrib/libpcap/savefile.c M contrib/libpcap/scanner.l M contrib/libpcap/sf-pcap.c M contrib/libpcap/sf-pcapng.c M contrib/libpcap/sockutils.c M contrib/libpcap/sockutils.h A contrib/libpcap/sslutils.c A contrib/libpcap/sslutils.h M contrib/libpcap/testprogs/CMakeLists.txt M contrib/libpcap/testprogs/Makefile.in M contrib/libpcap/testprogs/can_set_rfmon_test.c M contrib/libpcap/testprogs/capturetest.c M contrib/libpcap/testprogs/filtertest.c A contrib/libpcap/testprogs/findalldevstest-perf.c M contrib/libpcap/testprogs/findalldevstest.c A contrib/libpcap/testprogs/fuzz/CMakeLists.txt A contrib/libpcap/testprogs/fuzz/fuzz_both.c A contrib/libpcap/testprogs/fuzz/fuzz_both.options A contrib/libpcap/testprogs/fuzz/fuzz_filter.c A contrib/libpcap/testprogs/fuzz/fuzz_filter.options A contrib/libpcap/testprogs/fuzz/fuzz_pcap.c A contrib/libpcap/testprogs/fuzz/fuzz_pcap.options A contrib/libpcap/testprogs/fuzz/onefile.c A contrib/libpcap/testprogs/nonblocktest.c M contrib/libpcap/testprogs/opentest.c M contrib/libpcap/testprogs/reactivatetest.c M contrib/libpcap/testprogs/selpolltest.c M contrib/libpcap/testprogs/threadsignaltest.c M contrib/libpcap/testprogs/valgrindtest.c A contrib/libpcap/testprogs/visopts.py A contrib/libpcap/testprogs/writecaptest.c A contrib/libpcap/tests/pcap-invalid-version-1.pcap A contrib/libpcap/tests/pcap-invalid-version-2.pcap A contrib/libpcap/tests/pcapng-invalid-vers-1.pcapng A contrib/libpcap/tests/pcapng-invalid-vers-2.pcapng M contrib/pf/pflogd/pflogd.c M contrib/tcpdump/interface.h M lib/libpcap/Makefile M sys/net/dlt.h ____________________________________________________________________________________________________________ Commit: 73e80499b948269f83ee95cc2a310cc04ae092d3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=73e80499b948269f83ee95cc2a310cc04ae092d3 Author: Gordon Bergling (Sun 26 Jan 2025 12:08:23 GMT) Committer: Gordon Bergling (Wed 29 Jan 2025 05:59:19 GMT) ath(4): Fix a typo in a source code comment - s/isnt/isn’t/ (cherry picked from commit 6fbf8502a5004a99847bda57b4875b567c7ca018) M sys/dev/ath/if_ath.c ____________________________________________________________________________________________________________ Commit: 59e4c0204165b09131d56ef3e7b6946f59514ad8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=59e4c0204165b09131d56ef3e7b6946f59514ad8 Author: Gordon Bergling (Sun 26 Jan 2025 12:06:55 GMT) Committer: Gordon Bergling (Wed 29 Jan 2025 05:59:07 GMT) bootptest: Fix a typo in a source code comment - s/tralier/trailer/ (cherry picked from commit 5da0eee3d842bd0bef2c95553e75e462cda27ee6) M libexec/bootpd/tools/bootptest/print-bootp.c ____________________________________________________________________________________________________________ Commit: 3dc41ab651d5a960e3e6547f261d2e75da2708d7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3dc41ab651d5a960e3e6547f261d2e75da2708d7 Author: Gordon Bergling (Sun 26 Jan 2025 12:10:14 GMT) Committer: Gordon Bergling (Wed 29 Jan 2025 05:58:56 GMT) net80211: Fix a typo in a source code comment - s/isnt/isn’t/ (cherry picked from commit abcbde5d68f1fb6fa21fe2c24e04901a53f15798) M sys/net80211/ieee80211_sta.c ____________________________________________________________________________________________________________ Commit: 0f1f6d18d722834bc90b701dbcf4d924f2075310 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0f1f6d18d722834bc90b701dbcf4d924f2075310 Author: Rick Macklem (Tue 14 Jan 2025 22:11:06 GMT) Committer: Rick Macklem (Tue 28 Jan 2025 22:43:21 GMT) fs: Add new VFCF_xxx flags for va_filerev Richard Kojedzinszky reported a problem via email, where the Linux NFSv4.2 client did not detect a change in a directory on a FreeBSD NFSv4.2 server. Adding support for the NFSv4.2 change_attr_type attribute seems to have fixed the problem. This requires that the server file system indicate if it increments va_filerev by one, since that file attribute is used for the NFSv4.2 change attribute. Fuse requires an indication that va_filerev is based on ctime. This patch adds VFCF_FILEREVINC and VFCF_FILEREVCT to indicate this. A future patch to the NFS server will use these flags. (cherry picked from commit 1cd455f39d886f27c33f7726f79fc4cc566da7b3) M sys/sys/mount.h M sys/ufs/ffs/ffs_vfsops.c ____________________________________________________________________________________________________________ Commit: 17e935f1f327d7d4464e53f4f3d2347a51623f82 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=17e935f1f327d7d4464e53f4f3d2347a51623f82 Author: Mark Johnston (Tue 28 Jan 2025 14:23:06 GMT) Committer: Mark Johnston (Tue 28 Jan 2025 16:07:26 GMT) etcupdate: Restrict access to the conflicts directory In the window during conflict resolution, copies of installed files with conflicts are added here with the default mode. Restrict access. PR: 277470 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277470 ) Reviewed by: philip, jhb, emaste Differential Revision: https://reviews.freebsd.org/D48576 (cherry picked from commit c43ae7ab4bf89c2b274c1cbefe663c456e9211d1) M usr.sbin/etcupdate/etcupdate.sh ____________________________________________________________________________________________________________ Commit: 477403117f06ce5b1de006925fc35d1fbec8dc76 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=477403117f06ce5b1de006925fc35d1fbec8dc76 Author: Zhenlei Huang (Sat 25 Jan 2025 17:59:33 GMT) Committer: Zhenlei Huang (Tue 28 Jan 2025 15:26:49 GMT) kern_sysctl: Fix printing function name in the re-use sysctl leaf warning The helper function sysctl_warn_reuse() is intended to print the name of the caller rather than that of itself. PR: 221853 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=221853 ) Fixes: 4ae2ade11426 Enhance debugibility of sysctl leaf re-use warnings MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48645 (cherry picked from commit faa845aab6113190ba8c75a171b2cca8673a6214) (cherry picked from commit 719fb5a37731f6e69f2ba2b67fb3e19f2f007100) M sys/kern/kern_sysctl.c ____________________________________________________________________________________________________________ Commit: 20374abf0ce8228972f54795bf7ac6266be190ef URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=20374abf0ce8228972f54795bf7ac6266be190ef Author: Zhenlei Huang (Tue 21 Jan 2025 15:02:13 GMT) Committer: Zhenlei Huang (Tue 28 Jan 2025 15:26:49 GMT) if_vxlan(4): Invoke vxlan_stop event handler only when the interface is configured It is harmless but pointless to invoke vxlan_stop event handler when the interface was not previously configured. This change will also prevent an assert panic from t4_vxlan_stop_handler(). Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48494 (cherry picked from commit 960c5bb0f6bf44aeb09fa14fd0f82c2e82ebe2e2) (cherry picked from commit aa79996e605735dcd9b1bf83d6affefa404530d1) M sys/net/if_vxlan.c ____________________________________________________________________________________________________________ Commit: 118a280569d3baaee11d1766bf87fbb93cf0a6d0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=118a280569d3baaee11d1766bf87fbb93cf0a6d0 Author: Olivier Certner (Mon 27 Jan 2025 20:49:48 GMT) Committer: Olivier Certner (Mon 27 Jan 2025 21:12:16 GMT) atomics: Constify loads: mips I had forgotten that mips had been removed starting from stable/14, and didn't compile stable/13 on this architecture... Consequently, this is a direct commit to stable/13, irrelevant to other branches. It fixes the compile error observed there only, caused by the MFC of additional constification commits, including SMR and the sanitizers. Reported by: Jenkins M sys/mips/include/atomic.h ____________________________________________________________________________________________________________ Commit: cb162f6595789590c79a1a5da144cb6595e71b3d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cb162f6595789590c79a1a5da144cb6595e71b3d Author: Zhenlei Huang (Fri 22 Sep 2023 11:05:02 BST) Committer: Zhenlei Huang (Mon 27 Jan 2025 18:32:59 GMT) pf: Convert PF_DEFAULT_TO_DROP into a vnet loader tunable 'net.pf.default_to_drop' 7f7ef494f11d introduced a compile time option PF_DEFAULT_TO_DROP to make the pf(4) default rule to drop. While this change exposes a vnet loader tunable 'net.pf.default_to_drop' so that users can change the default rule without re-compiling the pf(4) module. This change is similiar to that for IPFW [1]. 1. 5f17ebf94db5 Convert IPFW_DEFAULT_TO_ACCEPT into a loader tunable 'net.inet.ip.fw.default_to_accept' Reviewed by: #network, kp MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D39866 (cherry picked from commit c531c1d1462c45f7ce5de4f9913226801f3073bd) (cherry picked from commit 3965be101c434437ce8819250e9e6b3e5c3d702e) M share/man/man4/pf.4 M sys/netpfil/pf/pf_ioctl.c ____________________________________________________________________________________________________________ Commit: 353cf44d828c0b43ad34dab7ab4572186087a331 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=353cf44d828c0b43ad34dab7ab4572186087a331 Author: Zhenlei Huang (Sat 9 Sep 2023 09:10:32 BST) Committer: Zhenlei Huang (Mon 27 Jan 2025 18:32:59 GMT) carp: Explicitly mark tunnable net.inet.carp.allow with CTLFLAG_NOFETCH With recent change 110113bc086f, a vnet tunable can be initialized when there is a corresponding kernel environment variable unless it is marked with the flag CTLFLAG_NOFETCH. The initialization may happen during early boot(linker preload), at that time vnet0 has not been created. The hander carp_allow_sysctl() for the tunable net.inet.carp.allow requires vnet, thus invoking it during early boot will cause kernel panic. The tunnable is initialized by vnet sysinit routine ipcarp_sysinit() so let's just mark it with flag CTLFLAG_NOFETCH. No functional change intended. Fixes: 110113bc086f sysctl(9): Enable vnet sysctl variables to be loader tunable MFC after: 2 week Differential Revision: https://reviews.freebsd.org/D41525 (cherry picked from commit 242fa308f3c3def32b2e61e0b78c11b3697e4492) (cherry picked from commit d67b1748ea34ad6f66072694fd8b623ab0ea72b1) M sys/netinet/ip_carp.c ____________________________________________________________________________________________________________ Commit: d2a999c2e0a0dbceb6d2b0a434b7de5bc88afe97 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d2a999c2e0a0dbceb6d2b0a434b7de5bc88afe97 Author: Zhenlei Huang (Sat 9 Sep 2023 09:06:23 BST) Committer: Zhenlei Huang (Mon 27 Jan 2025 18:32:59 GMT) sysctl(9): Enable vnet sysctl variables to be loader tunable Complete phase two of 3da1cf1e88f8. In 3da1cf1e88f8, the meaning of the flag CTLFLAG_TUN is extended to automatically check if there is a kernel environment variable which shall initialize the SYSCTL during early boot. It works for all SYSCTL types both statically and dynamically created ones, except for the SYSCTLs which belong to VNETs. This change extends the meaning further, to allow it also works for the SYSCTLs which belong to VNETs. A typical usage is ``` VNET_DEFINE_STATIC(int, foo) = 0; SYSCTL_INT(_net, OID_AUTO, foo, CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(foo), 0, "Description of the foo loader tunable"); ``` Note that the implementation has a limitation. It behaves the same way as that of non-vnet loader tunables. That is, after the kernel or modules being initialized, any changes (e.g. via kenv) to kernel environment variable will not affect the corresponding vnet variable of subsequently created VNETs. To overcome it, we can use TUNABLE_XXX_FETCH to fetch the kernel environment variable into those vnet variables during vnet constructing. This change will fix the following SYSCTLs those belong to VNETs and have CTLFLAG_TUN flag: ``` net.add_addr_allfibs net.bpf.optimize_writers net.inet.tcp.fastopen.ccache_buckets net.link.bridge.inherit_mac net.link.bridge.ipfw_arp net.link.bridge.log_stp net.link.bridge.pfil_bridge net.link.bridge.pfil_local_phys net.link.bridge.pfil_member net.link.bridge.pfil_onlyip net.link.lagg.default_use_flowid net.link.lagg.default_use_numa net.link.lagg.default_flowid_shift net.link.lagg.lacp.debug net.link.lagg.lacp.default_strict_mode ``` Although the following vnet SYSCTLs have CTLFLAG_TUN flag, theirs values are re-fetched via TUNABLE_XXX_FETCH, thus are not affected by this change. ``` net.inet.ip.reass_hashsize net.inet.tcp.hostcache.cachelimit net.inet.tcp.hostcache.hashsize net.inet.tcp.hostcache.bucketlimit net.inet.tcp.syncache.bucketlimit net.inet.tcp.syncache.cachelimit net.inet.tcp.syncache.hashsize net.key.spdcache.maxentries net.key.spdcache.threshold ``` In memoriam: hselasky Discussed with: hselasky, glebius Fixes: 3da1cf1e88f8 Extend the meaning of the CTLFLAG_TUN flag ... MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D39638 (cherry picked from commit 110113bc086f5df1a9b6547edb1ab0cec698c55c) (cherry picked from commit 894efae09de43a38b0ff667c4b7195dc377640e4) M sys/kern/kern_linker.c M sys/kern/kern_sysctl.c M sys/kern/link_elf.c M sys/kern/link_elf_obj.c M sys/kern/linker_if.m ____________________________________________________________________________________________________________ Commit: fb4bc4c325eca15247a2e21ded0a70f92ec15488 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fb4bc4c325eca15247a2e21ded0a70f92ec15488 Author: Olivier Certner (Mon 20 Jan 2025 14:38:42 GMT) Committer: Olivier Certner (Mon 27 Jan 2025 18:17:17 GMT) smr: Load to accept pointers to const pointers Pointers passed to the smr_entered_load() and smr_serialized_load() macros are in the end used as arguments to atomic_load_*ptr(), so convert them to the now acceptable 'const uintptr_t *' ones (instead of 'uintptr_tr *'), making these macros accept pointers to constant pointers. Reviewed by: kib MFC after: 4 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48497 (cherry picked from commit 1ac0afaa962bc847294d5e6bf1e749b7ffa78cfd) M sys/sys/smr_types.h ____________________________________________________________________________________________________________ Commit: 213406054e46b50d5df6d28b01a0a3410132b322 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=213406054e46b50d5df6d28b01a0a3410132b322 Author: Olivier Certner (Mon 20 Jan 2025 14:28:37 GMT) Committer: Olivier Certner (Mon 27 Jan 2025 18:17:17 GMT) atomics: Constify loads: Remove now superfluous uses of DECONST() No functional change (intended). Reviewed by: kib MFC after: 4 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48497 (cherry picked from commit 9b7157c690723279d448fc7ea9c1f9374ad4511a) During MFC, the change to: 'sys/compat/linuxkpi/common/include/linux/seqlock.h' was elided as lkpi_seqprop_sequence() has never been MFCed to stable/13. M sys/sys/atomic_san.h M sys/sys/seqc.h ____________________________________________________________________________________________________________ Commit: eb6edafe8f484a69ff074018e5b93e481787923e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eb6edafe8f484a69ff074018e5b93e481787923e Author: Olivier Certner (Mon 20 Jan 2025 13:53:35 GMT) Committer: Olivier Certner (Mon 27 Jan 2025 18:17:17 GMT) atomics: atomic_load_consume_ptr(): Accept pointers to const Now that all directly-implemented loads (with acquire semantics or not) accept pointers to const, ensure that atomic_load_consume_ptr(), built on atomic_load_acq_ptr(), does so too, in the common atomics header as well as *SAN interceptors. Reviewed by: kib Fixes: 5e9a82e898d5 ("atomics: Constify loads") MFC after: 4 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48497 (cherry picked from commit 8dd436fca1149ec7e56f6f06abde50a2e8796ad6) M sys/sys/atomic_common.h M sys/sys/atomic_san.h ____________________________________________________________________________________________________________ Commit: ced9fa71eaf95a27d5672c3419d7d9ca6c189168 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ced9fa71eaf95a27d5672c3419d7d9ca6c189168 Author: Olivier Certner (Mon 20 Jan 2025 12:53:13 GMT) Committer: Olivier Certner (Mon 27 Jan 2025 18:17:16 GMT) atomics: Constify loads: riscv: Convert missed atomic_load_acq_64() Reviewed by: kib Fixes: 5e9a82e898d5 ("atomics: Constify loads") MFC after: 4 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48497 (cherry picked from commit 5bd31ad86adb5255e40e7d8ecfddd9e49c7004af) M sys/riscv/include/atomic.h ____________________________________________________________________________________________________________ Commit: 4463da0fa365b8ec484068d8d2a58bf0c88317d9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4463da0fa365b8ec484068d8d2a58bf0c88317d9 Author: Mark Johnston (Wed 28 Aug 2024 20:25:11 BST) Committer: Olivier Certner (Mon 27 Jan 2025 18:17:16 GMT) atomic: Fix the cast in the atomic_load_consume() interceptor As in commit c7a7e997d25d0, we should permit loading from a pointer to uintptr_t. Note that the other atomic_*_ptr() interfaces currently require casting regardless, only those defined in atomic_common.h try to be generic. Reported by: jrtc27 MFC after: 1 week (cherry picked from commit cb91dc50950ffdfd49337e844e231b69b8b5c634) M sys/sys/atomic_san.h ____________________________________________________________________________________________________________ Commit: 176599b58779b0062b50a5813654eefa5ec78869 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=176599b58779b0062b50a5813654eefa5ec78869 Author: Mark Johnston (Wed 28 Aug 2024 19:51:06 BST) Committer: Olivier Certner (Mon 27 Jan 2025 18:17:11 GMT) atomic: Avoid casting the return value of atomic_load_ptr to void * Otherwise a cast is needed to load a uintptr_t value. Fixes: e1f4d623779d ("rangelocks: remove unneeded cast of the atomic_load_ptr() result") MFC after: 1 week (cherry picked from commit c7a7e997d25d0b33769252d002b16839c864c83d) M sys/sys/atomic_san.h ____________________________________________________________________________________________________________ Commit: 1c465e52920848dec6a76f0672fa209db7d5e5b5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1c465e52920848dec6a76f0672fa209db7d5e5b5 Author: Kristof Provost (Mon 20 Jan 2025 13:24:48 GMT) Committer: Kristof Provost (Mon 27 Jan 2025 09:04:31 GMT) netinet: enter epoch in garp_rexmit() garp_rexmit() is a callback, so is not in net_epoch, which arprequest_internal() expects. Enter and exit the net_epoch. PR: 284073 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284073 ) MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 38fdcca05d09b4d5426a253d3c484f9481a73ac2) M sys/netinet/if_ether.c ____________________________________________________________________________________________________________ Commit: 6a356edd4fc3c8d7959fcc6a2447c7193d830392 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6a356edd4fc3c8d7959fcc6a2447c7193d830392 Author: Kirk McKusick (Thu 16 Jan 2025 18:43:48 GMT) Committer: Kirk McKusick (Sat 25 Jan 2025 21:10:20 GMT) Fix backward compatibility with UFS1 filesystems created before June 2002 See the Pahabricator review for more details. Reviewed-by: kib Tested-by: Peter Holm Differential-Revision: https://reviews.freebsd.org/D48472 (cherry picked from commit 661ca921e8cd56b17fc6615bc7e596e56e0e7c31) M sbin/growfs/debug.c M sys/ufs/ffs/ffs_extern.h M sys/ufs/ffs/ffs_snapshot.c M sys/ufs/ffs/ffs_softdep.c M sys/ufs/ffs/ffs_subr.c M sys/ufs/ffs/ffs_vfsops.c M sys/ufs/ffs/fs.h ____________________________________________________________________________________________________________ Commit: 47560d54be59f89e1768e7b4d81f5c599a9c59ef URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=47560d54be59f89e1768e7b4d81f5c599a9c59ef Author: Zhenlei Huang (Thu 23 Jan 2025 07:24:15 GMT) Committer: Zhenlei Huang (Sat 25 Jan 2025 11:56:41 GMT) sysctl: Fix usage() and SYNOPSIS section of man page I forgot to update the usage() and SYNOPSIS section of man page when adding the two options -J and -V. While here, fix the options sort order in SYNOPSIS section. Fixes: 5ec83c660aca sysctl: Add flags to filter jail prison and vnet variables MFC after: 1 day (cherry picked from commit 0ee3e29e1d9ee3ed22441c0d580d2d1e57a1d9e3) (cherry picked from commit 1d890d546b064f2c7753b949f5dbf00d79cde292) M sbin/sysctl/sysctl.8 M sbin/sysctl/sysctl.c ____________________________________________________________________________________________________________ Commit: 98983f3c9dec93285609c6ec5a615d6159b4ab65 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=98983f3c9dec93285609c6ec5a615d6159b4ab65 Author: Warner Losh (Fri 17 Jan 2025 21:06:32 GMT) Committer: Warner Losh (Fri 24 Jan 2025 22:34:47 GMT) cam: Add 3e/3 as a fatal code We see this error: (da4:mps0:0:3:0): SCSI sense: HARDWARE FAILURE asc:3e,3 (Logical unit failed self-test) for drives that have failed. Our vendor tells us there's no recovery from that state, though we can still grab logs from the drives and run their diagnostics. Drives in this state need to bascially be remanufactured because some part of them has failed. The prior default behavior is to retry, and retrying takes a long time to work out. Instead, short-circuit the retries and fail right away. I selected ENXIO because no I/O to LBAs is possible for drives in this state (both my experience and per vendor). Some googling suggests that other vendors behave identically, but it was inconclusive. Should this be too pessimistic, we can adjust in the future. Also, this is with some aging drives in our fleet, and if we have more than one drive in this state, our systems take so long to get to mountroot that the watchdog fires sometimes. Adding this patch makes them boot reliably again. MFC After: 1 week Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D48505 (cherry picked from commit a8b49e7c66292852339481536f039719e7914200) M sys/cam/scsi/scsi_all.c ____________________________________________________________________________________________________________ Commit: 13639d5f710b9a578543ac86efd03cbba546666c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=13639d5f710b9a578543ac86efd03cbba546666c Author: Colin Percival (Fri 24 Jan 2025 05:21:00 GMT) Committer: Colin Percival (Fri 24 Jan 2025 05:21:00 GMT) 13.5: Update stable/13 to -PRERELEASE This marks the start of the FreeBSD 13.5 release cycle; the stable/13 tree is now in "code slush". Developers are encouraged to prioritize fixing bugs (and/or merging bug fixes from HEAD) over new features at this time. Commit approval from re@ is not required but if new features introduce problems they may be removed from the release. Approved by: re (implicit) Sponsored by: Amazon M sys/conf/newvers.sh M usr.bin/yacc/config.h ____________________________________________________________________________________________________________ Commit: f68403f807a53687478291fe4cc6352a5ef14e2b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f68403f807a53687478291fe4cc6352a5ef14e2b Author: Alexander Ziaee (Tue 21 Jan 2025 19:55:27 GMT) Committer: Alexander Ziaee (Fri 24 Jan 2025 03:43:12 GMT) kldstat.8: Polish options + Align and alphabetize options + -q: s/Only/Quietly/ for search + Tag SPDX MFC after: 3 days Reviewed by: gbe, carlavilla, mhorne Approved by: carlavilla, mhorne (mentors) Differential Revision: https://reviews.freebsd.org/D48325 (cherry picked from commit 8d5d97372361aadb3d6cdfc5f5d1f8edcaa825aa) M sbin/kldstat/kldstat.8 ____________________________________________________________________________________________________________ Commit: 968abc191ea145040f4c2105755d11b63ecb2427 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=968abc191ea145040f4c2105755d11b63ecb2427 Author: Rick Macklem (Fri 10 Jan 2025 03:54:41 GMT) Committer: Rick Macklem (Fri 24 Jan 2025 02:30:22 GMT) nfscl: Fix a crash when a readdir entry has nul in it Commit 026cdaa3b3a9 added a check for a nul or "/" in a file name in a readdir reply. Unfortunately, the minimal testing done on it did not detect a bug that can cause the client to crash. This patch fixes the code so that it does not crash. Note that a NFS server will not normally return a file name in a readdir reply that has a nul or "/" in it, so the crash is unlikely. PR: 283965 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283965 ) (cherry picked from commit f9f0a1d61c7b97c705246c747baec385e0592966) M sys/fs/nfsclient/nfs_clrpcops.c ____________________________________________________________________________________________________________ Commit: 544ad91ef9f67430b955ce43456b6ffc97ab4c80 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=544ad91ef9f67430b955ce43456b6ffc97ab4c80 Author: Kirk McKusick (Wed 15 Jan 2025 21:08:42 GMT) Committer: Kirk McKusick (Fri 24 Jan 2025 01:20:50 GMT) Use ffs_sbget() to replace open-coded superblock reload. No functional change intended. Tested-by: Peter Holm (cherry picked from commit c18a6c15f4152029b6d1d0f64aa1ff36faceb9b2) M sys/ufs/ffs/ffs_vfsops.c ____________________________________________________________________________________________________________ Commit: 7b95d2a40219ddaf187dbc087e1f9a0615b70b60 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7b95d2a40219ddaf187dbc087e1f9a0615b70b60 Author: Mark Johnston (Sun 19 Jan 2025 23:25:09 GMT) Committer: Mark Johnston (Thu 23 Jan 2025 13:58:36 GMT) pkgbase: Fix OSVERSION specification when creating a repo -o OSVERSION= needs to appear before the "repo" verb, otherwise it has no effect. In this case, recent pkg-devel fails to create the repo, saying that ABI cannot be specified without OSVERSION. Reviewed by: kevans, manu MFC after: 2 weeks Fixes: 188fe88ec50e ("pkgbase: force OSVERSION") Differential Revision: https://reviews.freebsd.org/D48518 (cherry picked from commit f9097705fb1c8d9c1f8946d1c1897d606bdbd517) M Makefile.inc1 ____________________________________________________________________________________________________________ Commit: 69e2004d843452bffdebdf164ab5346b1b81a9e6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=69e2004d843452bffdebdf164ab5346b1b81a9e6 Author: Alexander Motin (Sat 23 Sep 2023 17:13:46 BST) Committer: Zhenlei Huang (Thu 23 Jan 2025 11:09:34 GMT) kern_sysctl: Make name2oid() non-destructive to the name It is not the first time I see it panicking while trying to modify const memory. Lets make it safer and easier to use. While there, mark few functions using it also const. MFC after: 10 days (cherry picked from commit f80babf906b7be51b2a031ef26525893c7bf4e31) (cherry picked from commit 1a1a1728e0bec6e5b978e6c5c7433ca91596b389) M sys/kern/kern_sysctl.c ____________________________________________________________________________________________________________ Commit: c44335b1a3137628f1b5c657c11aff1a95329085 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c44335b1a3137628f1b5c657c11aff1a95329085 Author: Doug Moore (Tue 27 Sep 2022 22:17:55 BST) Committer: Zhenlei Huang (Thu 23 Jan 2025 11:09:18 GMT) name2oid: use find_oidname In name2oid, use sysctl _find_oidname instead of re-implementing it. Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36765 (cherry picked from commit 9f6f9007b98fc407a1b064c4492697e27954191a) M sys/kern/kern_sysctl.c ____________________________________________________________________________________________________________ Commit: 09cbd68e4e4728dbac768937b35ad09995c20fea URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=09cbd68e4e4728dbac768937b35ad09995c20fea Author: Zhenlei Huang (Tue 29 Oct 2024 11:26:11 GMT) Committer: Zhenlei Huang (Thu 23 Jan 2025 09:47:10 GMT) sysctl: Add flags to filter jail prison and vnet variables So users do not have to contact the source code to tell whether a variable is a jail prison / vnet one or not. Reviewed by: cy (previous version), markj, jamie (for #jails) MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D47107 (cherry picked from commit 5ec83c660acaf30c1d6b9417dbd8c80dfa9d56ac) M sbin/sysctl/sysctl.8 M sbin/sysctl/sysctl.c ____________________________________________________________________________________________________________ Commit: bb14579988c5d82a272578e77ea719603b237fb3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bb14579988c5d82a272578e77ea719603b237fb3 Author: Kirk McKusick (Sun 12 Jan 2025 21:51:24 GMT) Committer: Kirk McKusick (Thu 23 Jan 2025 06:44:17 GMT) Eliminate unneeded variables and computations. No functional change. (cherry picked from commit df48361e7792f9a9e6371f95c1228d4af2808d2a) M sys/ufs/ffs/ffs_suspend.c ____________________________________________________________________________________________________________ Commit: ecf605de97b702ef09c64ee51c5a70f427ae0bfa URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ecf605de97b702ef09c64ee51c5a70f427ae0bfa Author: Vladimir Kondratyev (Sun 22 Dec 2024 03:16:11 GMT) Committer: Ed Maste (Tue 21 Jan 2025 12:33:47 GMT) hid: Correctly handle signed/unsigned quantities in kernel HID parser. Wrong signedness of usage value results in inverted range check in hmt(4) driver that allows out of bound array access leading to panic. Reported by: many Sponsored by: Future Crew, LLC Obtained from: NetBSD NetBSD PR: kern/53605 PR: 274014, 282592 (cherry picked from commit 38b67578fb4bbf568f7012ca3921a4d15cfe7c5d) (cherry picked from commit 1dda3a6ed9c51adc908fee4db5917b1232fa932c) M sys/dev/hid/hid.c M sys/dev/hid/hid.h ____________________________________________________________________________________________________________ Commit: edc19f8d0fd03c21cd24cbd0e2e004713bb112f6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=edc19f8d0fd03c21cd24cbd0e2e004713bb112f6 Author: Andrey V. Elsukov (Sat 11 Jan 2025 08:25:50 GMT) Committer: Andrey V. Elsukov (Tue 21 Jan 2025 11:45:57 GMT) netlink: restore the ability to delete PINNED routes route(8) had such ability before migration to netlink. To be able to delete PINNED routes we pass RTM_F_FORCE to rib_del_route_px() when userland uses RTF_PINNED flag with RTM_DELETE command. This is hackish way for route(8) tool, that third-party software usually doesn't use. PR: 279988 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279988 ) Tested by: franco at opnsense org Discussed with: glebius Differential Revision: https://reviews.freebsd.org/D46301 (cherry picked from commit 3ce003c8b6151f7764b7934de11c789d6b84ee5c) M sys/netlink/route/rt.c ____________________________________________________________________________________________________________ Commit: e98f79cc71a35c25a83788f8ac9ba3375baaf149 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e98f79cc71a35c25a83788f8ac9ba3375baaf149 Author: Andrey V. Elsukov (Thu 12 Dec 2024 12:57:45 GMT) Committer: Andrey V. Elsukov (Tue 21 Jan 2025 11:45:09 GMT) ipfw: use only needed TCP flags for state tracking This fixes stateful firewall failures after adding TH_AE flag into TH_FLAGS. Reported by: ronald Fixes: 347dd05 (cherry picked from commit 9ea8d692f4cb552902b9e8394260d7f3cf4aefb0) M sys/netpfil/ipfw/ip_fw_dynamic.c ____________________________________________________________________________________________________________ Commit: 1486bb0bfcacafe5dd1c2f3add7b92e57f7e1ff2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1486bb0bfcacafe5dd1c2f3add7b92e57f7e1ff2 Author: Alan Somers (Tue 31 Dec 2024 20:41:01 GMT) Committer: Alan Somers (Mon 20 Jan 2025 22:41:52 GMT) Fix lib/libc/nss/getgr_test with large numbers of groups These tests create a linked list with one entry for every group on the running system. On a system with about 30,000 groups, the test took 69 seconds to run, and crashed Kyua with the below error: kyua: E: string or blob too big (sqlite op: sqlite3_bind_blob) (sqlite db: /root/.kyua/store/results.usr_tests.20241231-203317-570235.db). Fix the test by limiting it to operating on the first 1024 groups. Apply the same change to getpw_test and getserv_test too, which are vulnerable to the same problem. Sponsored by: ConnectWise Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D48275 (cherry picked from commit d11904b350214943dedb64c7121d4602799d7afd) M lib/libc/tests/nss/getgr_test.c M lib/libc/tests/nss/getpw_test.c M lib/libc/tests/nss/getserv_test.c ____________________________________________________________________________________________________________ Commit: e8a272048a0fc9f558c7788dd06b0159b56c4585 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e8a272048a0fc9f558c7788dd06b0159b56c4585 Author: Alan Somers (Mon 23 Dec 2024 20:26:11 GMT) Committer: Alan Somers (Mon 20 Jan 2025 22:36:27 GMT) fusefs: fix a memory leak Fix a leak of a fuse_ticket structure. The leak mostly affected NFS-exported fuse file systems, and was triggered by a failure during FUSE_LOOKUP. Sponsored by: ConnectWise (cherry picked from commit 969d1aa4dbfcbccd8de965f7761203208bf04e46) M sys/fs/fuse/fuse_vfsops.c M tests/sys/fs/fusefs/nfs.cc ____________________________________________________________________________________________________________ Commit: 039609b04d63f2e597d70fec66915a766834e81c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=039609b04d63f2e597d70fec66915a766834e81c Author: CismonX (Sat 2 Nov 2024 20:19:15 GMT) Committer: Alan Somers (Mon 20 Jan 2025 22:34:18 GMT) fusefs: ignore FUSE_NO_OPEN(DIR)_SUPPORT flags The FUSE_NO_OPEN_SUPPORT and FUSE_NO_OPENDIR_SUPPORT flags are only meant to indicate kernel features, and should be ignored if they appear in the FUSE_INIT reply flags. Also fix the corresponding test cases. Reviewed by: Alan Somers Signed-off-by: CismonX Pull Request: https://github.com/freebsd/freebsd-src/pull/1509 (cherry picked from commit f0f596bd955e5b48c55db502e79fc652ac8970d3) M sys/fs/fuse/fuse_file.c M sys/fs/fuse/fuse_internal.c M sys/fs/fuse/fuse_ipc.h M sys/fs/fuse/fuse_vnops.c M tests/sys/fs/fusefs/open.cc M tests/sys/fs/fusefs/opendir.cc ____________________________________________________________________________________________________________ Commit: 4ded81daacec72e16da6cdb64bde8edd4a8fe0e4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4ded81daacec72e16da6cdb64bde8edd4a8fe0e4 Author: Alan Somers (Tue 17 Dec 2024 20:10:57 GMT) Committer: Alan Somers (Mon 20 Jan 2025 22:33:53 GMT) namei: add more detail about LOCKSHARED's behavior [skip ci] Sponsored by: ConnectWise Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D48125 (cherry picked from commit 22bb70a6b3bb7799276ab480e40665b7d6e4ce25) M share/man/man9/namei.9 ____________________________________________________________________________________________________________ Commit: 2b4a45992a043459ab0d63410059822a2efb6045 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2b4a45992a043459ab0d63410059822a2efb6045 Author: Alan Somers (Fri 13 Dec 2024 14:00:20 GMT) Committer: Alan Somers (Mon 20 Jan 2025 22:31:29 GMT) fusefs: FUSE_NOTIFY_INVAL_* must busy the mountpoint Unusually, the FUSE_NOTIFY_INVAL_INODE and FUSE_NOTIFY_INVAL_ENTRY messages are fully asynchronous. The server sends them to the kernel unsolicited. That means that unlike every other fuse message coming from the server, these two arrive to a potentially unbusied mountpoint. So they must explicitly busy it. Otherwise a page fault could result if the mountpoint were being unmounted. Reported by: JSML4ThWwBID69YC@protonmail.com (cherry picked from commit 989998529387b4d98dfaa6c499ad88b006f78de8) M sys/fs/fuse/fuse_device.c ____________________________________________________________________________________________________________ Commit: 1bcf8494d934bda897ca52e8dbbebec55e940e68 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1bcf8494d934bda897ca52e8dbbebec55e940e68 Author: Alan Somers (Mon 28 Oct 2024 15:14:06 GMT) Committer: Alan Somers (Mon 20 Jan 2025 22:30:57 GMT) ktls.4: note that security/gnutls now supports ktls [skip ci] PR: 278083 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278083 ) Sponsored by: ConnectWise Reviewed by: diizzy Differential Revision: https://reviews.freebsd.org/D47310 (cherry picked from commit 7200d90644ba61d63e6fec33855bba5d3b7eb7bd) ktls.4: note that there are multiple openssl ports with KTLS knobs [skip ci] Reported by: "Herbert J. Skuhra" Sponsored by: ConnectWise (cherry picked from commit 1e4da42a36d5cf44bacf0e261626b69a4761f0cc) M share/man/man4/ktls.4 ____________________________________________________________________________________________________________ Commit: 06b782abaafe56674fc2be847dea4ab28c1cddf0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=06b782abaafe56674fc2be847dea4ab28c1cddf0 Author: Claudiu (Sun 13 Oct 2024 21:00:42 BST) Committer: Alan Somers (Mon 20 Jan 2025 22:27:26 GMT) tmpfs: remove duplicate flags check in tmpfs_rmdir Reviewed By: asomers Differential Revision: https://reviews.freebsd.org/D47100 (cherry picked from commit ec22e705c266ff629cc5ec47b84f67ba02b7b924) M sys/fs/tmpfs/tmpfs_vnops.c ____________________________________________________________________________________________________________ Commit: e758e5512005abdc30285e95e39f98c01ae12d85 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e758e5512005abdc30285e95e39f98c01ae12d85 Author: Alan Somers (Sun 8 Sep 2024 21:42:38 BST) Committer: Alan Somers (Mon 20 Jan 2025 22:16:11 GMT) nfscl: fix uninitialized memory in nfsv4_loadattr When processing an RPC response that did not include any Owner attribute, nfsv4_loadattr would return na_uid and na_gid uninitialized. The uninitialized values could then make their way into the NFS attribute cache via nfscl_loadattrcache. PR: 281279 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281279 ) Reported by: KMSAN Reviewed by: rmacklem Sponsored by: Axcient (cherry picked from commit 44328abfb7aca8150b07b83ff502c9185677e3fb) M sys/fs/nfs/nfs_commonsubs.c ____________________________________________________________________________________________________________ Commit: faec43a79bf9a43ac3e2bc3e1de244dd31868dd3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=faec43a79bf9a43ac3e2bc3e1de244dd31868dd3 Author: Kristof Provost (Mon 20 Jan 2025 07:11:14 GMT) Committer: Kristof Provost (Mon 20 Jan 2025 16:17:10 GMT) pf: avoid use-after-free on reassembly Ensure we update the mbuf pointer returned by pf_normalize_ip() or pf_normalize_ip6() even if they fail. Otherwise we'd risk using a freed mbuf. PR: 283705 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283705 ) Reported by: Yichen Chai , Zhuo Ying Jiang Li Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 5d28f4cab8d5919aba1365e885a91a96c0655b59) M sys/netpfil/pf/pf.c ____________________________________________________________________________________________________________ Commit: 8883e8de05598e475d2ac129dfefd734e06908ab URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8883e8de05598e475d2ac129dfefd734e06908ab Author: Ed Maste (Wed 15 Jan 2025 21:44:31 GMT) Committer: Ed Maste (Mon 20 Jan 2025 14:30:43 GMT) munmap.2: Remove EINVAL for negative len len is unsigned (it is size_t), so cannot be negative. Sponsored by: The FreeBSD Foundation (cherry picked from commit fab411c4fd5224e3dd44e0eb288d60b27480e2d1) (cherry picked from commit e2cbfa1f5045019d34eb0091db7755c151ea06d5) M lib/libc/sys/munmap.2 ____________________________________________________________________________________________________________ Commit: a52b922c05a46f594fa604e1af3f17f046aba955 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a52b922c05a46f594fa604e1af3f17f046aba955 Author: Ed Maste (Wed 15 Jan 2025 16:52:58 GMT) Committer: Ed Maste (Mon 20 Jan 2025 14:30:43 GMT) munmap.2: Unaligned addresses do not return error We previously claimed that non-page-aligned addresses would return EINVAL, but the address is in fact rounded down to the page boundary. Reported by: Harald Eilertsen Reviewed by: brooks Sponsored by: The FreeBSD Foundation Fixes: dabee6fecc67 ("kern_descrip.c: add fdshare()/fdcopy()") Differential Revision: https://reviews.freebsd.org/D48465 (cherry picked from commit 9e36aaf0c24cf158e83c69c1d2312c000c3c36f3) (cherry picked from commit 61c50909354ace6f07d0b2113f10965f4546e0ed) M lib/libc/sys/munmap.2 ____________________________________________________________________________________________________________ Commit: 8ed2e663712c3749b10af7968a646b9e81b6bcea URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8ed2e663712c3749b10af7968a646b9e81b6bcea Author: Gleb Smirnoff (Sat 11 Jan 2025 05:08:02 GMT) Committer: Ed Maste (Mon 20 Jan 2025 14:28:54 GMT) libbsnmp: avoid division by zero with empty password PR: 283909 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283909 ) (cherry picked from commit 4dc1820a16b9b6108e0ff8a0265c08c67fa34146) (cherry picked from commit c4cae8cbc337eaf824774fcba88018e42fa31efa) M contrib/bsnmp/lib/snmpclient.c ____________________________________________________________________________________________________________ Commit: d6fbd34acbbc90ae106fc1fa08d83d5f25d59039 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d6fbd34acbbc90ae106fc1fa08d83d5f25d59039 Author: Gleb Smirnoff (Sat 11 Jan 2025 05:08:02 GMT) Committer: Ed Maste (Mon 20 Jan 2025 14:28:54 GMT) libbsnmptools: avoid uninitialized snmptoolctx->passwd with empty password The removed check left snmptoolctx->passwd pointer to uninitialized memory. Always calling strlcpy(3) would guarantee that with empty password it will point to empty string. Submitted by: markj PR: 283909 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283909 ) (cherry picked from commit 3999a860d6e899de98b1025317d2d0ef1f83255f) (cherry picked from commit 0bfbd30663b68a851ebf24667d121c6891c86827) M usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c ____________________________________________________________________________________________________________ Commit: eeecaa064c8d4ba0f4a17739527ef285ee56fd36 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eeecaa064c8d4ba0f4a17739527ef285ee56fd36 Author: Edward Tomasz Napierala (Wed 21 Jul 2021 10:18:15 BST) Committer: Zhenlei Huang (Mon 20 Jan 2025 12:39:27 GMT) cam: clear stack-allocated CCB in the target layer Note that, as pointed out by scottl@, this code should really look a bit different, in that the stack allocations should be replaced with dynamic allocation, and the periph creation should be moved to a context where one can use M_WAITOK. See the review for more details. For now let's go with a minimal fix until we're done with UMA CCBs. Reviewed By: mav, imp Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D30298 (cherry picked from commit 616a676a0535eca78ce6b02a6226d0bcb69d7d4e) M sys/cam/ctl/scsi_ctl.c M sys/cam/scsi/scsi_targ_bh.c M sys/cam/scsi/scsi_target.c ____________________________________________________________________________________________________________ Commit: cdd9dd5ac768675c1e67b6aa33f8f1c0ae56534a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cdd9dd5ac768675c1e67b6aa33f8f1c0ae56534a Author: Edward Tomasz Napierala (Sun 16 May 2021 10:28:04 BST) Committer: Zhenlei Huang (Mon 20 Jan 2025 12:39:27 GMT) cam: add missing zeroing of a stack-allocated CCB. This could cause a panic at boot. Reported By: Shawn Webb Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. (cherry picked from commit 0f206cc91279e630ad9e733eb6e330b7dbe6c70e) M sys/cam/ata/ata_xpt.c M sys/cam/scsi/scsi_xpt.c ____________________________________________________________________________________________________________ Commit: ee2a1bc81a1782f197053c53cf84b4933e545e47 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ee2a1bc81a1782f197053c53cf84b4933e545e47 Author: Edward Tomasz Napierala (Sat 10 Apr 2021 11:25:22 BST) Committer: Zhenlei Huang (Mon 20 Jan 2025 12:39:26 GMT) cam: make sure to clear even more CCBs allocated on the stack This is my second pass, this time over all of CAM except for the SCSI target bits. There should be no functional changes. Reviewed By: imp Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D29549 (cherry picked from commit ec5325dbca629d65179f14f68bbcdb9c014f1523) M sys/cam/ata/ata_da.c M sys/cam/ata/ata_xpt.c M sys/cam/mmc/mmc_da.c M sys/cam/mmc/mmc_xpt.c M sys/cam/nvme/nvme_xpt.c M sys/cam/scsi/scsi_cd.c M sys/cam/scsi/scsi_enc_ses.c M sys/cam/scsi/scsi_sa.c M sys/cam/scsi/scsi_xpt.c ____________________________________________________________________________________________________________ Commit: 23b90ad00a2a00e4c4fa25b996de79266ae152a6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=23b90ad00a2a00e4c4fa25b996de79266ae152a6 Author: Edward Tomasz Napierala (Tue 30 Mar 2021 19:15:11 BST) Committer: Zhenlei Huang (Mon 20 Jan 2025 12:39:26 GMT) cam: make sure to clear CCBs allocated on the stack This is required for small CCBs support, where we need to track whether the CCB was allocated from an UMA zone or not. There are no (intended) functional changes with the current source. Reviewed By: imp Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D29484 (cherry picked from commit 076686fe0703b906a05c9869609dd550bd4ed7ac) M sys/cam/cam_periph.c M sys/cam/cam_xpt.c M sys/cam/scsi/scsi_da.c M sys/cam/scsi/scsi_xpt.c ____________________________________________________________________________________________________________ Commit: 25695358d03b4c60344df5b7dead04085350448d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=25695358d03b4c60344df5b7dead04085350448d Author: Zhenlei Huang (Wed 15 Jan 2025 04:32:31 GMT) Committer: Zhenlei Huang (Mon 20 Jan 2025 12:39:26 GMT) pvscsi: Explicitly mask out CTS_SAS_VALID_SPEED bit This driver prefers connection speed over sas port speed. On stable/13 branch the stack-allocated CCB is not cleared thus the cam layer may report weird speed on boot. ``` da0: Fixed Direct Access SPC-4 SCSI device da0: 4294967.295MB/s transfers ``` -current and stable/14 have the change [1] which clears stack-allocated CCB thus are not affected, but I want -current and stable/14 to have this fix in to reduce drift between branches. 1. ec5325dbca62 cam: make sure to clear even more CCBs allocated on the stack Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48438 (cherry picked from commit 7befd68335a0b34405b6293f30cc47cabc46ab06) (cherry picked from commit 5094faf5dfa860f238f636457563bc0d89013c7a) M sys/dev/vmware/pvscsi/pvscsi.c ____________________________________________________________________________________________________________ Commit: 2d6dcb4f97f89376189f39b700459c72fe7a2678 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2d6dcb4f97f89376189f39b700459c72fe7a2678 Author: Philip Paeps (Fri 17 Jan 2025 01:33:46 GMT) Committer: Philip Paeps (Mon 20 Jan 2025 00:26:07 GMT) contrib/tzdata: import tzdata 2025a Changes: https://github.com/eggert/tz/blob/2025a/NEWS (cherry picked from commit 46226b0162ba03986b1de2c790804b37dd8e64d6) M contrib/tzdata/Makefile M contrib/tzdata/NEWS M contrib/tzdata/antarctica M contrib/tzdata/asia M contrib/tzdata/australasia M contrib/tzdata/checknow.awk M contrib/tzdata/checktab.awk M contrib/tzdata/etcetera M contrib/tzdata/europe M contrib/tzdata/factory M contrib/tzdata/leap-seconds.list M contrib/tzdata/leapseconds M contrib/tzdata/northamerica M contrib/tzdata/southamerica M contrib/tzdata/theory.html M contrib/tzdata/version M contrib/tzdata/zone.tab M contrib/tzdata/zone1970.tab M contrib/tzdata/zonenow.tab ____________________________________________________________________________________________________________ Commit: 2611bae42b7d471bcf2c4826bf2ae37c27f983a8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2611bae42b7d471bcf2c4826bf2ae37c27f983a8 Author: Dimitry Andric (Thu 16 Jan 2025 20:04:36 GMT) Committer: Dimitry Andric (Sun 19 Jan 2025 11:06:03 GMT) Merge llvm-project release/19.x llvmorg-19.1.7-0-gcd708029e0b2 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.7-0-gcd708029e0b2, a.k.a. 19.1.7 release. PR: 280562 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280562 ) MFC after: 3 days (cherry picked from commit 6c05f3a74f30934ee60919cc97e16ec69b542b06) M contrib/llvm-project/clang/lib/Driver/Driver.cpp M contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp M contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp M contrib/llvm-project/clang/lib/Sema/SemaDeclCXX.cpp M contrib/llvm-project/compiler-rt/lib/lsan/lsan_interceptors.cpp M contrib/llvm-project/libcxx/include/__config M contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h M contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp M contrib/llvm-project/llvm/lib/MC/WasmObjectWriter.cpp M contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp M contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp M contrib/llvm-project/llvm/lib/Target/RISCV/RISCVInstrInfo.cpp M contrib/llvm-project/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td M contrib/llvm-project/llvm/lib/Target/RISCV/RISCVInstrInfoXCV.td M contrib/llvm-project/llvm/lib/Target/RISCV/RISCVInstrInfoXSf.td M contrib/llvm-project/llvm/lib/Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp M contrib/llvm-project/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp M contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp M lib/clang/include/VCSVersion.inc M lib/clang/include/clang/Basic/Version.inc M lib/clang/include/lld/Common/Version.inc M lib/clang/include/lldb/Version/Version.inc M lib/clang/include/llvm/Config/config.h M lib/clang/include/llvm/Config/llvm-config.h M lib/clang/include/llvm/Support/VCSRevision.h ____________________________________________________________________________________________________________ Commit: 9e659ecfb231819c5426c992885367032a8c4e94 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9e659ecfb231819c5426c992885367032a8c4e94 Author: Stephen Hurd (Sun 1 Dec 2024 17:34:40 GMT) Committer: Stephen Hurd (Sat 18 Jan 2025 20:19:16 GMT) Expose POSIX functions incorporated into C23 C23 has incoporated a small number of POSIX functions, so these should be exposed for C23, regardless of POSIX. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D47856 (cherry picked from commit 59677aecb67bbedcfa2ee5d7d2b189193cdc4af7) M include/string.h M include/time.h ____________________________________________________________________________________________________________ Commit: 45d1cff2bfc679aee4d7f8ae8cc827bc163fbd08 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=45d1cff2bfc679aee4d7f8ae8cc827bc163fbd08 Author: Gleb Smirnoff (Mon 13 Jan 2025 18:08:51 GMT) Committer: Eugene Grosbein (Fri 17 Jan 2025 19:44:36 GMT) sockets: virtualize kern.ipc.soacceptqueue PR: 219655 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219655 ) Differential Revision: https://reviews.freebsd.org/D48314 (cherry picked from commit 4155be454c46bc1ab725aca5c6969b064b74be38) M sys/kern/uipc_socket.c ____________________________________________________________________________________________________________ Commit: 08384f613cd808e31fa3ae3dd86fa078b49d3f4b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=08384f613cd808e31fa3ae3dd86fa078b49d3f4b Author: Gleb Smirnoff (Mon 13 Jan 2025 18:08:58 GMT) Committer: Eugene Grosbein (Fri 17 Jan 2025 19:41:51 GMT) sockets: virtualize kern.ipc.numopensockets To avoid breaking POLA on the host machine it reports the same value as before. In a VNET jail it now reports number of sockets in this jail. PR: 219655 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219655 ) Differential Revision: https://reviews.freebsd.org/D48315 (cherry picked from commit 59498e099cc055da7afca8266087b7668be6d7cb) M sys/kern/uipc_socket.c ____________________________________________________________________________________________________________ Commit: 9c348f73a8568769b1a746efd9ccbca2f4ef7252 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9c348f73a8568769b1a746efd9ccbca2f4ef7252 Author: Mark Johnston (Mon 23 Dec 2024 19:06:11 GMT) Committer: Mark Johnston (Fri 17 Jan 2025 18:48:19 GMT) sed tests: Add a regression test for the c function Based on the test case from PR 271817 by Mohamed Akram. PR: 271817 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271817 ) MFC after: 2 weeks (cherry picked from commit 003818aca4cdda47adef808a56d48003aa514029) M usr.bin/sed/tests/sed2_test.sh ____________________________________________________________________________________________________________ Commit: 5ea64bfc9a6f8582b952580c7cdf754e7ab4a078 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5ea64bfc9a6f8582b952580c7cdf754e7ab4a078 Author: Valeriy Ushakov (Tue 17 Dec 2024 22:27:01 GMT) Committer: Mark Johnston (Fri 17 Jan 2025 18:48:01 GMT) sed: The change ("c") command should start a new cycle. The "c" command should start the next cycle as clarified in POSIX 2024. This is also consistent with historical and gnu sed behavior. This patch is from OpenBSD by way of NetBSD with a tweak to the man page date by me. Confirmed the test case in the bug now works. PR: 271817 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271817 ) Obtained from: NetBSD (1.39 uwe), OpenBSD (1.39 millert) Sponsored by: Netflix (cherry picked from commit a2d78713171cf138b5ae50d61f82df1af7574c95) M usr.bin/sed/process.c M usr.bin/sed/sed.1 ____________________________________________________________________________________________________________ Commit: 550dede8754a1ddbf3e44894b20cb74c48111ccf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=550dede8754a1ddbf3e44894b20cb74c48111ccf Author: Edward Tomasz Napierala (Wed 13 Nov 2024 10:00:38 GMT) Committer: Mark Johnston (Fri 17 Jan 2025 18:47:03 GMT) Fix "vrefact: wrong use count 0" with DRM Bump the vnode use count, not its hold count. This fixes a panic triggered by fstatat(..., AT_EMPTY_PATH) on DRM device nodes, which happens to be what glxinfo(1) from Ubuntu Jammy is doing. PR: kern/274538 Reviewed By: kib (earlier version), olce Differential Revision: https://reviews.freebsd.org/D47391 (cherry picked from commit fc595a6b76642dfdfdb8e6f9b9bbc734e95fb59c) M sys/compat/linuxkpi/common/src/linux_compat.c ____________________________________________________________________________________________________________ Commit: e2d4c5de27ac6788e61818924e1ba092a47f17d9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e2d4c5de27ac6788e61818924e1ba092a47f17d9 Author: Olivier Certner (Fri 17 Jan 2025 17:21:08 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 17:21:08 GMT) UPDATING: Remove tarfs reference that slipped through Forgot to add my modifications to UPDATING to the git index (should have made it in the previous commit). Differential Revision: https://reviews.freebsd.org/D48093 M UPDATING ____________________________________________________________________________________________________________ Commit: 4d93d6559697a5c3690dc5892f52a3f577337d05 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4d93d6559697a5c3690dc5892f52a3f577337d05 Author: Mark Johnston (Wed 15 Jan 2025 18:20:50 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 17:14:28 GMT) RELNOTES: Document recent file handle layout changes Reviewed by: olce, rmacklem, imp, emaste Differential Revision: https://reviews.freebsd.org/D48093 (cherry picked from commit e0b7a9b6bee16f4855b392c0941e76b7fef777a0) This commit has been adapted for stable/13 (references of the relevant commits and the date have been changed) and the commits that actually have been MFCed so far (mentions of tarfs and tmpfs have been removed). M RELNOTES M UPDATING ____________________________________________________________________________________________________________ Commit: acdc59f0924aaddfa321741af05e08d2a6715d1a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=acdc59f0924aaddfa321741af05e08d2a6715d1a Author: Olivier Certner (Fri 6 Dec 2024 16:37:56 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 13:59:53 GMT) ext2fs: 'struct ufid': Re-order fields and unpack Re-ordering the fields suppresses the trailing padding which was causing the structure to overflow 'struct fid'. While here, re-indent in a more visually pleasing way. Reviewed by: rmacklem, emaste, markj Approved by: markj (mentor) MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D47955 (cherry picked from commit 8ae6247aa966989412bd75fc7c26728690b9e944) Sponsored by: The FreeBSD Foundation M sys/fs/ext2fs/inode.h ____________________________________________________________________________________________________________ Commit: ee931cf4a49c90487c938fa14b856401582a045c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ee931cf4a49c90487c938fa14b856401582a045c Author: Rick Macklem (Fri 6 Dec 2024 02:05:06 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 13:59:44 GMT) ext2fs: Fix the size of struct ufid and add a static assert File system specific *fid structures are copied into the generic struct fid defined in sys/mount.h. As such, they cannot be larger than struct fid. This patch packed the structure and checks via a __Static_assert(). Reviewed by: markj MFC after: 2 weeks (cherry picked from commit bfc8e3308bee23d0f7836d57f32ed8d47da02627) M sys/fs/ext2fs/ext2_vnops.c M sys/fs/ext2fs/inode.h ____________________________________________________________________________________________________________ Commit: 1bf531bcd791794a39511359fbab612944a9e7b2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1bf531bcd791794a39511359fbab612944a9e7b2 Author: Mark Johnston (Tue 14 Jan 2025 14:19:24 GMT) Committer: Mark Johnston (Fri 17 Jan 2025 13:40:49 GMT) audit: Fix short-circuiting in syscallenter() syscallenter() has a slow path to handle syscall auditing and dtrace syscall tracing. It uses AUDIT_SYSCALL_ENTER() to check whether to take the slow path, but this macro also has side effects: it writes the audit log entry. When systrace (dtrace syscall tracing) is enabled, this would get short-circuited, and we end up not writing audit log entries. Introduce a pure macro to check whether auditing is enabled, use it in syscallenter() instead of AUDIT_SYSCALL_ENTER(). Reviewed by: kib Reported by: Joe Duin Fixes: 2f7292437d0c ("Merge audit and systrace checks") MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48448 (cherry picked from commit f78fe930854cac6eed55859b45e0a7b5d87189d6) M sys/kern/subr_syscall.c M sys/security/audit/audit.h ____________________________________________________________________________________________________________ Commit: 0e17cf06297555a34485111360caf06c213179af URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0e17cf06297555a34485111360caf06c213179af Author: Olivier Certner (Fri 17 Jan 2025 13:33:42 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 13:35:38 GMT) cred: proc_set_cred(): Fix debug build On stable/13, the 'cr_ref' field of 'struct ucred' is of type 'u_int', contrary to stable/14 and main where it is of type 'long'. This is a direct commit to stable/13. Reported by: Jenkins Fixes: b3d437832ffa ("cred: proc_set_cred(), proc_unset_cred(): Update user's process count") M sys/kern/kern_prot.c ____________________________________________________________________________________________________________ Commit: 6f43ca650d64d3d217fff9a4881f0cbea9f7efd0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6f43ca650d64d3d217fff9a4881f0cbea9f7efd0 Author: Olivier Certner (Thu 12 Dec 2024 21:37:14 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:55 GMT) libprocstat: ZFS support: Makefile: Tidy up a bit Regroup assignments tweaking preprocessor defines/undefs, and separately those about include directories. Re-order include directories a bit more logically, and remove redundant ones. Separate logical groups by blank lines. Build artifacts have been verified to stay the same when produced with an external LLVM 18 toolchain. MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48070 (cherry picked from commit 618c97b87b7124cdfb10d2f33a213c3302c8a98b) M lib/libprocstat/zfs/Makefile ____________________________________________________________________________________________________________ Commit: 273fec0483025b72a4d86ed5f26f8189f1dc58d2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=273fec0483025b72a4d86ed5f26f8189f1dc58d2 Author: Mark Johnston (Tue 17 Dec 2024 14:05:00 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:55 GMT) atomic: Update interceptor function signatures after commit 5e9a82e898d5 Fixes: 5e9a82e898d5 ("atomics: Constify loads") (cherry picked from commit fa5f4c10a8ce457bc1c4276933fd7dd34d75f6d6) M sys/kern/subr_asan.c M sys/kern/subr_csan.c M sys/sys/atomic_san.h ____________________________________________________________________________________________________________ Commit: 5cf27105df1ec5e7e5c7627de978fbcb8e0671dd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5cf27105df1ec5e7e5c7627de978fbcb8e0671dd Author: Mark Johnston (Tue 17 Dec 2024 00:12:11 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:54 GMT) queue: Fix STAILQ_SWAP The debug assertions added in commit 34740937f7a4 do not hold for a window in STAILQ_SWAP, so check whether the queues are empty directly. Reported by: ler Fixes: 34740937f7a4 ("queue: New debug macros for STAILQ") (cherry picked from commit da2c88dfcf4f425e6e0a58d6df3a7c8e88d8df92) M sys/sys/queue.h ____________________________________________________________________________________________________________ Commit: 1cf5ab87c87ed72ee572971f33b68e5ddd595433 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1cf5ab87c87ed72ee572971f33b68e5ddd595433 Author: Olivier Certner (Mon 16 Dec 2024 19:12:14 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:54 GMT) atomics: Constify loads: Fix powerpc build Fixes: 5e9a82e898d5 ("atomics: Constify loads") Sponsored by: The FreeBSD Foundation (cherry picked from commit a9722e5ae8519a9a28e950dbd8d489178e9bc27e) M sys/kern/subr_atomic64.c ____________________________________________________________________________________________________________ Commit: b2d46346d89bd712dc28946c3ba6c27ea3b20bc9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b2d46346d89bd712dc28946c3ba6c27ea3b20bc9 Author: Olivier Certner (Mon 16 Dec 2024 15:38:26 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:54 GMT) proc_set_cred(): Fix compilation of GENERIC-NODEBUG Approved by: mark (mentor) Fixes: d2be7ed63aff ("cred: proc_set_cred(), proc_unset_cred(): Update user's process count") (cherry picked from commit 675708aa402a06d9ced98c8a12d9ef29625d3c66) M sys/kern/kern_prot.c ____________________________________________________________________________________________________________ Commit: 05d0bce0e808c118b80334a4d6df071ef0b4999a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=05d0bce0e808c118b80334a4d6df071ef0b4999a Author: Olivier Certner (Mon 16 Dec 2024 17:58:50 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:54 GMT) atomic(9): Update manpage after constifying atomic loads MFC after: 5 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 32c45723fa53d384e19ce52aec15972e73305a8c) M share/man/man9/atomic.9 ____________________________________________________________________________________________________________ Commit: b6a3bda9bc2eebbc7630ec7a9ccb27ca923ef596 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b6a3bda9bc2eebbc7630ec7a9ccb27ca923ef596 Author: Olivier Certner (Mon 9 Dec 2024 16:13:09 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:53 GMT) x86 atomics: Remove unused WANT_FUNCTIONS This macro has not been in use since commit "inline atomics and allow tied modules to inline locks" (r335873, f4b3640475cec929). Reviewed by: markj, kib, emaste, imp MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48061 (cherry picked from commit fa368cc86cebe7185b3a99d4f6083033da377eee) M sys/amd64/include/atomic.h M sys/i386/include/atomic.h ____________________________________________________________________________________________________________ Commit: afeec66ce393f6d4e18907934db8f96821e37394 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=afeec66ce393f6d4e18907934db8f96821e37394 Author: Olivier Certner (Mon 2 Dec 2024 15:06:29 GMT) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:53 GMT) syscallsubr.h: Header inclusions: Explicit , sort is currently brought in by other headers but some of its type definition are directly used in this header, so it should appear explicitly. It is necessary as lots of prototypes in there use types it defines ( wouldn't be enough). Additionally, and need constants from , so just include instead of . Sort header inclusions as per style(9). No functional change (intended). Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47881 (cherry picked from commit 8cdb0458e12e6fac577cfb2277e7e85d3c21fa09) M sys/sys/syscallsubr.h ____________________________________________________________________________________________________________ Commit: f872814e2d7a8841411569fc707b028463c7656b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f872814e2d7a8841411569fc707b028463c7656b Author: Olivier Certner (Fri 2 Aug 2024 16:57:51 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:53 GMT) cred: proc_set_cred(), proc_unset_cred(): Update user's process count As a process really changes credentials at the moment proc_set_cred() or proc_unset_cred() is called, these functions are the proper locations to perform the update of the new and old real users' process count (using chgproccnt()). Before this change, change_ruid() instead would perform that update, although it operates only on a passed credential which is a priori not tied to the calling process (or not to any process at all). This was arguably a flaw of commit b1fc0ec1a7a49ded, r77183, based on its commit message, and in particular the portion "(...) In each case, the call now acts on a credential not a process (...)". Fixing this makes using change_ruid() more natural when building candidate credentials that in the end are not applied to a process, e.g., because of some intervening privilege check. Also, it removes a hack around this unwanted process count change in unionfs. We also introduce the new proc_set_cred_enforce_proc_lim() so that callers can respect the per-user process limit, and will use it for the upcoming setcred(). We plan to change all callers of proc_set_cred() to call this new function instead at some point. In the meantime, both proc_set_cred() and the new function will coexist. As detailed in some proc_set_cred_enforce_proc_lim()'s comment, checking against the process limit is currently flawed as the kernel doesn't really maintain the number of processes per UID (besides RLIMIT_NPROC, this in fact also applies to RLIMIT_KQUEUES, RLIMIT_NPTS, RLIMIT_SBSIZE and RLIMIT_SWAP). The applied limit is currently that of the old real UID. Root (or a process granted with PRIV_PROC_LIMIT) is not subject to this limit. Approved by: markj (mentor) Fixes: b1fc0ec1a7a49ded MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46923 (cherry picked from commit d2be7ed63affd8af5fe6203002b7cc3cbe7f7891) Additional changes for this MFC: 1. was added as an include in , as some of its types are necessary whether the header is included by the kernel or userland. Some later -CURRENT commits added it, but are not planned to be MFCed (mac_do(4) series, which doesn't exist in stable/13). 2. A number of files in 'lib/libprocstat' that include (indirectly) with _KERNEL defined were patched to include beforehand, so that 'bool', which is part of the new signature for proc_set_cred*(), is defined when is processed ( does not define it when _KERNEL is defined). M lib/libprocstat/msdosfs.c M lib/libprocstat/smbfs.c M lib/libprocstat/udf.c M lib/libprocstat/zfs.c M sys/fs/unionfs/union_subr.c M sys/kern/kern_exit.c M sys/kern/kern_fork.c M sys/kern/kern_prot.c M sys/sys/ucred.h ____________________________________________________________________________________________________________ Commit: 5c09fafd8398181a149c0457d56c5b7c2518b370 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5c09fafd8398181a149c0457d56c5b7c2518b370 Author: Olivier Certner (Thu 1 Aug 2024 11:19:52 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:53 GMT) cred: proc_set_cred(): Remove obsolete comments These have been obsoleted since they were first written (in commit "cred: add proc_set_cred helper", daf63fd2f9a8d040, r280130) by some subsequent commits ("proc: refactor clearing credentials into proc_unset_cred", 5a90435ccfed8e1e, r361448; "cred: distribute reference count per thread", 1724c563e62fa800, r361993). No functional change. Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46922 (cherry picked from commit 07c9edac7bcd75095724ff3c91d0aeec792a4f26) M sys/kern/kern_prot.c ____________________________________________________________________________________________________________ Commit: 927d7d57793abc0acab85aaf453e42775755793f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=927d7d57793abc0acab85aaf453e42775755793f Author: Olivier Certner (Tue 8 Oct 2024 13:30:03 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:53 GMT) mountd(8): Allow to pass {NGROUPS_MAX} + 1 groups NGROUPS_MAX is just the minimum maximum of the number of allowed supplementary groups. The actual runtime value may be greater. Allow more groups to be specified accordingly (now that, a few commits ago, nmount(2) has been changed similarly). To this end, we just allocate once and for all a static array called 'tmp_groups' big enough to hold {NGROUPS_MAX} + 1 groups (the maximum number of supplementary groups plus the effective GID, which we store in a variable named 'tngroups_max' to avoid confusion with the kernel variable 'ngroups_max' holding only the maximum number of *supplementary* groups) in main() and use this temporary space in get_exportlist_one(), do_opt() and parsecred(). Doing so in passing fixes a (benign) memory leak in case "-maproot" and/or "-mapall" were specified multiple times and the first option comprised more than SMALLNGROUPS. parsecred() does not use 'cr_smallgrps' anymore, but we have kept 'cr_smallgrps'/SMALLNGROUPS as 'struct expcred' is also included in 'struct exportlist' and 'struct grouplist', and thus this preallocated field still results in an optimization for the common case of small number of groups (although its real impact is probably negligible and arguably was not worth the trouble). While here, in do_mount(), remove some unnecessary groups array allocation and copying. Reviewed by: rmacklem (older version) Approved by: markj (mentor) MFC after: 2 weeks Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47016 (cherry picked from commit e87848a8150ed75da29d99a7d0c0bba6cc5129b8) M usr.sbin/mountd/mountd.c ____________________________________________________________________________________________________________ Commit: f8e47b137a80ca4c3e8d932d1b4b8f89c3d02942 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f8e47b137a80ca4c3e8d932d1b4b8f89c3d02942 Author: Olivier Certner (Tue 8 Oct 2024 11:06:55 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:52 GMT) mountd(8): parsecred(): Re-order operations for clarity No functional change (intended). Reviewed by: rmacklem (older version) Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47015 (cherry picked from commit a20d50245f280be404cb8e3b5c9d570ded9594b9) M usr.sbin/mountd/mountd.c ____________________________________________________________________________________________________________ Commit: 111c7322f71ec653447fd79382ae75c6b11605cd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=111c7322f71ec653447fd79382ae75c6b11605cd Author: Olivier Certner (Tue 8 Oct 2024 10:44:06 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:52 GMT) mountd(8): parsecred(): Remove comment on non-existent bug 'name' can never be NULL, as it is equal to 'names' and 'namelist', which was passed by do_cred() only if the actual parameter wasn't NULL. Reviewed by: rmacklem Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47014 (cherry picked from commit 0b011b5cddb5b17cf5b8f50ff580f3eb4abaeeef) M usr.sbin/mountd/mountd.c ____________________________________________________________________________________________________________ Commit: 46f0ef933d288c151accc95cc4717cf6abada83d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=46f0ef933d288c151accc95cc4717cf6abada83d Author: Olivier Certner (Tue 8 Oct 2024 10:39:08 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:52 GMT) nmount(2), NFS: Accept 'ngroups_max + 1' groups in "export" credentials There is no technical reason to limit that to NGROUPS_MAX, which is off by one and just our minimum maximum value. Reviewed by: rmacklem Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47013 (cherry picked from commit 84337218786b13f0ebfa834d28de41dce02bc937) M sys/kern/vfs_mount.c ____________________________________________________________________________________________________________ Commit: 043e259e41d3f17f3c9415db0135ad82cb532f1f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=043e259e41d3f17f3c9415db0135ad82cb532f1f Author: Olivier Certner (Thu 3 Oct 2024 15:49:40 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:52 GMT) mountd(8): parsecred(): Groups limit: NGROUPS_MAX => NGROUPS_MAX + 1 Lift this unnecessary limitation. Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46921 (cherry picked from commit 7f7f3b6cafac6e8ab993a14386e34991224f86f3) M usr.sbin/mountd/mountd.c ____________________________________________________________________________________________________________ Commit: 70d657d7380c1c5c056508d4c122e691ed104042 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=70d657d7380c1c5c056508d4c122e691ed104042 Author: Olivier Certner (Tue 8 Oct 2024 10:34:44 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:51 GMT) exports(5): -maproot, -mapall: Explain the fallback on no group Reviewed by: rmacklem (older version) Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47012 (cherry picked from commit 2ef608de90629df37c29043afc638f8ff99ecfc4) M usr.sbin/mountd/exports.5 ____________________________________________________________________________________________________________ Commit: 29a0511b184d6d59c6b0fee72dd6f48e6b8d0081 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=29a0511b184d6d59c6b0fee72dd6f48e6b8d0081 Author: Olivier Certner (Tue 8 Oct 2024 10:21:17 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:51 GMT) mountd(8): parsecred(): Fallback to "nogroup" or GID_NOGROUP In the 'uid:gid:gid:...' case (for '-maproot' or '-mapall'), if no GID is specified at all (i.e., input is of the form 'uid:', with the colon at the end), mountd(8) would pass credentials with an empty array of groups to the kernel. For security reasons, we have put in place a kernel fallback a while ago, which is to use the single group GID_NOGROUP (see commits cfbe7a62dc62 ("nfs, rpc: Ensure kernel credentials have at least one group") and 5169d4307eb9 ("nfs: Fallback to GID_NOGROUP on no groups")). Here, as we are in userland, we first try to find the GID number corresponding to "nogroup", and only then fall back to GID_NOGROUP, as nfsuserd(8) does. Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47011 (cherry picked from commit bdc259ef382f76b1821d4356049d5b856c42901a) M usr.sbin/mountd/mountd.c ____________________________________________________________________________________________________________ Commit: 0c0cd622f2797214e76d19bd45bbbfaa4dd21cf4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0c0cd622f2797214e76d19bd45bbbfaa4dd21cf4 Author: Olivier Certner (Thu 26 Sep 2024 18:00:26 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:51 GMT) mountd(8): parsecred(): Remove "duplicate compression" No functional change (intended). This code dates back to 4.4BSD, became wrong after some getgrouplist() (nssswitch-related) change in 2007, was fixed only in 2020 and since then underwent cosmetic changes. It is likely that in fact it never served any useful purpose in FreeBSD, except perhaps at the very beginning. It's most probably not the case today: NFS credentials are normally only used to check for file accesses, whose group is checked against all groups of a credentials indiscriminately (except for the real GID). Consequently, having a single duplicate, which the code would actually remove only if in the first supplementary group slot, doesn't change behavior. Moreover, we are going to regain one slot in a subsequent commit. Discussed with: rmacklem Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46920 (cherry picked from commit f2d2318fafbb16c8a7773fe20c724c986f424fa2) M usr.sbin/mountd/mountd.c ____________________________________________________________________________________________________________ Commit: 73c073d99157d587a5c50b61d63264882dec6ac5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=73c073d99157d587a5c50b61d63264882dec6ac5 Author: Olivier Certner (Thu 26 Sep 2024 17:16:16 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:51 GMT) mountd(8): parsecred(): uid:gid:... loop: Simplify a bit No functional change intended. Reviewed by: rmacklem (older version) Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46919 (cherry picked from commit ae22a4bb7437019e34fc593e101a6ac14c9d7959) M usr.sbin/mountd/mountd.c ____________________________________________________________________________________________________________ Commit: 5f7586197e84caa22013bbdb7bef1f5c5ac6c4ca URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5f7586197e84caa22013bbdb7bef1f5c5ac6c4ca Author: Olivier Certner (Tue 16 Jul 2024 21:32:19 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:51 GMT) cred: crget(): Compute initial 'cr_agroups' with nitems() No functional change (intended). Reviewed by: mhorne, emaste Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46910 (cherry picked from commit f5b46856918cc6cc3ea49e3ab95163d318563ece) M sys/kern/kern_prot.c ____________________________________________________________________________________________________________ Commit: fbac48f4b460f03def43165c80c6082b6c3c4d2c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fbac48f4b460f03def43165c80c6082b6c3c4d2c Author: Olivier Certner (Thu 4 Jul 2024 15:08:20 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:50 GMT) MAC: mac_policy.h: Declare common MAC sysctl and jail parameters' nodes Do this only when the headers for these functionalities were included prior to this one. Indeed, if they need to be included, style(9) mandates they should have been so before this one. Remove the common MAC sysctl declaration from , as it is now redundant (all its includers also include ). Remove local such declarations from all policies' files. Reviewed by: jamie Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46903 (cherry picked from commit db33c6f3ae9d1231087710068ee4ea5398aacca7) The original changes in 'sys/security/mac_grantbylabel/mac_grantbylabel.c' were removed as MAC/grantbylabel has not been MFCed. M sys/security/mac/mac_internal.h M sys/security/mac/mac_policy.h M sys/security/mac_biba/mac_biba.c M sys/security/mac_bsdextended/mac_bsdextended.c M sys/security/mac_ifoff/mac_ifoff.c M sys/security/mac_lomac/mac_lomac.c M sys/security/mac_mls/mac_mls.c M sys/security/mac_ntpd/mac_ntpd.c M sys/security/mac_partition/mac_partition.c M sys/security/mac_portacl/mac_portacl.c M sys/security/mac_priority/mac_priority.c M sys/security/mac_seeotheruids/mac_seeotheruids.c M sys/security/mac_stub/mac_stub.c M sys/security/mac_test/mac_test.c M sys/security/mac_veriexec/mac_veriexec.c ____________________________________________________________________________________________________________ Commit: 4c2602473d127604dd643815622d5cd39f90ec54 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4c2602473d127604dd643815622d5cd39f90ec54 Author: Olivier Certner (Thu 4 Jul 2024 10:50:04 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:50 GMT) jail.h: New SYSCTL_JAIL_PARAM_DECL() Like SYSCTL_DECL(), additionally prepending the well-known jail parameters' sysctl prefix. Reviewed by: jamie Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46902 (cherry picked from commit f7bda491ef05717fb4fe6c89083485599db951b8) M sys/sys/jail.h ____________________________________________________________________________________________________________ Commit: f30f1a14f772cb31e745b779936db6a6b301b4c0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f30f1a14f772cb31e745b779936db6a6b301b4c0 Author: Olivier Certner (Thu 4 Jul 2024 10:05:44 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:50 GMT) jail.h: New SYSCTL_JAIL_PARAM_SYS_SUBNODE() Same as SYSCTL_JAIL_PARAM_SYS_NODE() but allowing another level of hierarchy. To be used with MAC policies, so that they can have their own node under "security.jail.param.mac". Reviewed by: jamie Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46901 (cherry picked from commit 9f8020e65ba8f2398bf79505037b75670340e5fa) M sys/sys/jail.h ____________________________________________________________________________________________________________ Commit: 386c6749bde5453eac9183b93a2aaf7f2bfe6192 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=386c6749bde5453eac9183b93a2aaf7f2bfe6192 Author: Olivier Certner (Thu 4 Jul 2024 10:01:10 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:50 GMT) jail.h: Fix whitespace in the param macros declaration block Reviewed by: jamie Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46900 (cherry picked from commit f8fe6bc73bbbced506a02ed88783c0c0bb9b49e4) M sys/sys/jail.h ____________________________________________________________________________________________________________ Commit: ae2383c0dd16e06991a0462758107e0489ec53a7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ae2383c0dd16e06991a0462758107e0489ec53a7 Author: Olivier Certner (Wed 3 Jul 2024 15:30:19 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:49 GMT) MAC: Define a common 'mac' node for MAC's jail parameters To be used by MAC/do. Reviewed by: jamie Approved by: markj (mentor) MFC after: 5 days Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46899 (cherry picked from commit 5041b20503dbb442cc9ebd0a6e4db26905102c72) M sys/security/mac/mac_framework.c ____________________________________________________________________________________________________________ Commit: b9c8344a391aaed715d1230abd958fd7bc465f65 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b9c8344a391aaed715d1230abd958fd7bc465f65 Author: Olivier Certner (Wed 3 Jul 2024 15:23:38 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:49 GMT) MAC: 'kernel_mac_support' module: Make an outdated comment more generic No functional change. Reviewed by: jamie Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46898 (cherry picked from commit 90678c892d7b3a90339b7fc19fde16c64fe3cb70) M sys/security/mac/mac_framework.c ____________________________________________________________________________________________________________ Commit: c05d82c461e7314823698a59f3781e0f6b7ab7b0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c05d82c461e7314823698a59f3781e0f6b7ab7b0 Author: Olivier Certner (Mon 29 Jul 2024 15:21:52 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:49 GMT) MAC: mac.h: Fix missing includes/typedefs This fixes inclusion from userspace, and also kernel inclusion for source files not including explicitly nor implicitly . Reviewed by: jamie Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46896 (cherry picked from commit 5140ccf2268b0e771c89e46f46c60e1fee7637c3) M sys/sys/mac.h ____________________________________________________________________________________________________________ Commit: 229e81dd12fd7dca2077c143ff50742e8600bf36 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=229e81dd12fd7dca2077c143ff50742e8600bf36 Author: Olivier Certner (Mon 8 Jul 2024 17:15:49 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:49 GMT) queue: New debug macros for STAILQ The new STAILQ_ASSERT_EMPTY() macro allows callers to assert that some STAILQ is empty. It leverages the new QMD_STAILQ_CHECK_EMPTY() internal macro. QMD_STAILQ_CHECK_EMPTY() is a check for empty STAILQ, where heads's 'stqh_last' field must point to the 'stqh_first' one. Use it in STAILQ_ASSERT_EMPTY(). QMD_STAILQ_CHECK_TAIL() checks that the tail pointed by 'head' does not have a next element. It is similar to the already existing QMD_TAILQ_CHECK_TAIL(), but without the superfluous 'field' argument and clearer documentation. Use it in STAILQ_INSERT_TAIL(). Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46889 (cherry picked from commit 34740937f7a46c7475bb57e804701ba8830bf6ed) M sys/sys/queue.h ____________________________________________________________________________________________________________ Commit: a8be157c098d675e2d1419174edf3b1474fa075b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a8be157c098d675e2d1419174edf3b1474fa075b Author: Olivier Certner (Fri 19 Jul 2024 16:23:45 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:48 GMT) refcount: Constify refcount_load() Reviewed by: markj Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46888 (cherry picked from commit 9dc5b3dbb063f55543ff8a0619eee2e294fb7dc5) M sys/sys/refcount.h ____________________________________________________________________________________________________________ Commit: e6e9e70e51d987c54535b8714dc040fae68ac148 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e6e9e70e51d987c54535b8714dc040fae68ac148 Author: Olivier Certner (Fri 19 Jul 2024 16:23:19 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:48 GMT) atomics: Constify loads In order to match reality, allow using these functions with pointers on const objects, and bring us closer to C11. Remove the '+' modifier in the atomic_load_acq_64_i586()'s inline asm statement's constraint for '*p' (the value to load). CMPXCHG8B always writes back some value, even when the value exchange does not happen in which case what was read is written back. atomic_load_acq_64_i586() further takes care of the operation atomically writing back the same value that was read in any case. All in all, this makes the inline asm's write back undetectable by any other code, whether executing on other CPUs or code on the same CPU before and after the call to atomic_load_acq_64_i586(), except for the fact that CMPXCHG8B will trigger a #GP(0) if the memory address is part of a read-only mapping. This unfortunate property is however out of scope of the C abstract machine, and in particular independent of whether the 'uint64_t' pointed to is declared 'const' or not. Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46887 (cherry picked from commit 5e9a82e898d55816c366cfa3ffbca84f02569fe5) M sys/amd64/include/atomic.h M sys/arm/include/atomic-v6.h M sys/arm64/include/atomic.h M sys/i386/include/atomic.h M sys/powerpc/include/atomic.h M sys/riscv/include/atomic.h M sys/sys/_atomic64e.h M sys/sys/_atomic_subword.h M sys/sys/atomic_common.h ____________________________________________________________________________________________________________ Commit: 08eab7b3eb49034add710863760acc8406649eed URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=08eab7b3eb49034add710863760acc8406649eed Author: Olivier Certner (Mon 1 Jul 2024 18:10:47 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:48 GMT) osd: Constify signature of osd_register() This makes it clear that 'methods' (if not NULL) points to an array that won't be modified. Internally, this array is indeed copied into the given OSD type's larger array of all methods for all slots. Reviewed by: jamie Approved by: markj (mentor) MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46886 (cherry picked from commit 4a26b63145a5e18610aa9050262e3b4f75aa7117) M share/man/man9/osd.9 M sys/kern/kern_osd.c M sys/sys/osd.h ____________________________________________________________________________________________________________ Commit: 1c22ba23b015024fc473d5fd8ab45d29dd72a580 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1c22ba23b015024fc473d5fd8ab45d29dd72a580 Author: Ruslan Bukin (Wed 22 May 2024 16:07:27 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:48 GMT) riscv: Implement atomic operations Implement atomic_load_acq_16, atomic_store_rel_16. These are needed by bhyve(8) PCIe bus emulation code. Group 16-bit atomic functions similarly to 32 and 64-bit. Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D45228 (cherry picked from commit 2183004e14a863d65ca9192df1bea2625e3fdfb3) M sys/riscv/include/atomic.h ____________________________________________________________________________________________________________ Commit: 2d03e9cf8e2ee39da7dc01471e09f9895ccd304e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2d03e9cf8e2ee39da7dc01471e09f9895ccd304e Author: Stephen J. Kiernan (Thu 4 Apr 2024 01:12:57 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:47 GMT) Add function to OSD to get values without taking the lock. There are some cases of OSD use where the value is only initialized once at a point where successive access of the value can be done so safely without the need to take the lock. Reviewed by: markj Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44631 (cherry picked from commit 56b274213024957cea378d27393304ae5cc8ded9) M sys/kern/kern_osd.c M sys/sys/osd.h ____________________________________________________________________________________________________________ Commit: 4078a7051ab146d146e88720fac85ca164af2d4a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4078a7051ab146d146e88720fac85ca164af2d4a Author: Olivier Certner (Mon 25 Sep 2023 09:48:49 BST) Committer: Olivier Certner (Fri 17 Jan 2025 12:24:43 GMT) Open-code proc_set_cred_init() This function is to be called only when initializing a new process (so, 'proc0' and at fork), and not in any other circumstances. Setting the process' 'p_ucred' field to the result of crcowget() on the original credentials is the only thing it does, hiding the fact that the process' 'p_ucred' field is crushed by the call. Moreover, most of the code it executes is already encapsulated in crcowget(). To prevent misuse and improve code readability, just remove this function and replace it with a direct assignment to 'p_ucred'. Reviewed by: markj (earlier version), kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42255 (cherry picked from commit 92541c12bc25c59333d7f3b0721b6b16aaff3644) M sys/kern/init_main.c M sys/kern/kern_fork.c M sys/kern/kern_prot.c M sys/sys/ucred.h ____________________________________________________________________________________________________________ Commit: 635c2b82f60e7417746a03d4d22c7fafd08f7e7c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=635c2b82f60e7417746a03d4d22c7fafd08f7e7c Author: Leonid Evdokimov (Thu 2 Jan 2025 09:30:06 GMT) Committer: Kristof Provost (Thu 16 Jan 2025 08:42:04 GMT) pf tests: check cleared time when zeroing stats for table addresses Verify that we reset the cleared time when we zero an address' counters in a table. PR: 282877, 282984 Reviewed by: kp MFC after: 2 weeks Signed-off-by: Leonid Evdokimov Differential Revision: https://reviews.freebsd.org/D48242 (cherry picked from commit 0749d8134300b8e3c956e161890ab496247d2542) M tests/sys/netpfil/pf/table.sh ____________________________________________________________________________________________________________ Commit: 519121f5ea03c93da8f0600555c138df4a1c5e0a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=519121f5ea03c93da8f0600555c138df4a1c5e0a Author: Alexander Motin (Wed 8 Jan 2025 18:23:26 GMT) Committer: Alexander Motin (Wed 15 Jan 2025 02:49:23 GMT) isp: Fix abort issue introduced by previous commit Aborting ATIO while its CTIOs are in progress makes impossible to handle their completions, making them stuck forever. Detect this case by checking ctcnt counter and if so instead of aborting just mark the ATIO as dead to block any new CTIOs. It is not perfect since the task id can not be reused for some more time, but not as bad as the task stuck forever. MFC after: 1 week (cherry picked from commit 2c48a8f161c91bf7020122697d064a25287097a3) M sys/dev/isp/isp_freebsd.c M sys/dev/isp/isp_freebsd.h ____________________________________________________________________________________________________________ Commit: f81286d192304bba45697ec157c73a8e44ff57eb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f81286d192304bba45697ec157c73a8e44ff57eb Author: Ed Maste (Mon 23 Dec 2024 15:54:32 GMT) Committer: Ed Maste (Wed 15 Jan 2025 02:35:28 GMT) makefs: Exit with error if writing cd image fails Obtained from: OpenBSD c8f48d9b1ea9 Sponsored by: The FreeBSD Foundation (cherry picked from commit b45f84cc6213854ead00a4bfc7973332eda65676) (cherry picked from commit afb7a85e52c323aca544f0d235b67123bf87d342) M usr.sbin/makefs/cd9660.c ____________________________________________________________________________________________________________ Commit: 79778b7aafc829e6f67cbf0d50a51836e69dc784 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=79778b7aafc829e6f67cbf0d50a51836e69dc784 Author: Ed Maste (Mon 30 Dec 2024 15:01:06 GMT) Committer: Ed Maste (Wed 15 Jan 2025 02:33:30 GMT) makefs: Fix cd9660 duplicate directory names Previously we could create cd9660 images with duplicate short (level 2) names. cd9660_level2_convert_filename used a 30-character limit (for files and directories), not including the '.' separator. cd9660_rename_filename used a 31-character limit, including the '.'. Directory names 31 characters or longer (without '.') were shortened to 30 characters, and if a collision occurred cd9660_rename_filename uniquified them starting with the 31st character. Unfortunately the directory record's name_len was already set, so the unique part of the name was stripped off. Directories are up to 31 d-characters (i.e., A-Z 0-9 and _); there is no provision for a '.' in a directory name. Increase the name length limit to 31 for directories, and exclude '.'s. This name mapping and deduplication code is still fragile and convoluted and would beenfit from a more holistic effort. PR: 283238, 283112 Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48251 (cherry picked from commit 1f31d437428014e864bcce1223cf7017180e2608) (cherry picked from commit 40b11c1c16d85b3339be4c3c4fde2ef7fa36f3ff) M usr.sbin/makefs/cd9660.c M usr.sbin/makefs/tests/makefs_cd9660_tests.sh M usr.sbin/makefs/tests/makefs_tests_common.sh ____________________________________________________________________________________________________________ Commit: 94652c10c07abecb1d799145807cc0e01bad8b36 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=94652c10c07abecb1d799145807cc0e01bad8b36 Author: Ed Maste (Tue 24 Dec 2024 01:58:37 GMT) Committer: Ed Maste (Wed 15 Jan 2025 02:33:30 GMT) makefs: Remove impossible if condition This test is inside the else block for `if (*oldname == '.')`, so *oldname cannot be '.' here. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48243 (cherry picked from commit 788e1eb7c199297aa438fc5cb6caabc9be01b419) (cherry picked from commit 302be497fc0349979df05b700a7d27ffdac941f4) M usr.sbin/makefs/cd9660.c ____________________________________________________________________________________________________________ Commit: f6a64ab6a2c936a7660ddddce8b8676737b994ed URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f6a64ab6a2c936a7660ddddce8b8676737b994ed Author: Ed Maste (Tue 24 Dec 2024 16:08:10 GMT) Committer: Ed Maste (Wed 15 Jan 2025 02:33:30 GMT) makefs: Fix cd9660 filename buffer maximum length The maximum length is 30 characters for name and extension, two separators (. and ;) and 5 characters for file version from 1 to 32767, which is 37 characters. Add one for the null term as we treat these buffers as C strings. This is not an issue in practice, as the file version is always 1 in makefs. While here, drop `_WITH_PADDING` from the macro name and update the previously-unused ISO_FILENAME_MAXLENGTH for the corrected length. A 0x00 padding byte is used by ISO9660 when needed for alignment, which can be the null byte at the end of the string. Use sizeof where appropriate. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48193 (cherry picked from commit 2e09cef8dc6f46faba8bab87c42c3f19ba2ffe87) (cherry picked from commit 999c7a888f4fbe74573bc342052f3146b8d756c9) M usr.sbin/makefs/cd9660.c M usr.sbin/makefs/cd9660.h ____________________________________________________________________________________________________________ Commit: 954de313b261f6e631ca1a29106ae47e5621479c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=954de313b261f6e631ca1a29106ae47e5621479c Author: Ed Maste (Sun 22 Dec 2024 16:00:49 GMT) Committer: Ed Maste (Wed 15 Jan 2025 02:33:30 GMT) makefs: Crudely fix a sprintf warning Reviewed by: kevans Obtained from: OpenBSD d95291fdb2dc Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48178 (cherry picked from commit 2069f6ecb1b1268deac980176c652ffab264970e) (cherry picked from commit fb0239e69f17400b08421a002a72b9520afd8285) M usr.sbin/makefs/cd9660.c ____________________________________________________________________________________________________________ Commit: 91af1b8001d34a1563d861f1da81deaa121adca8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=91af1b8001d34a1563d861f1da81deaa121adca8 Author: Mohamed Akram (Mon 23 Dec 2024 19:06:09 GMT) Committer: Mark Johnston (Tue 14 Jan 2025 14:43:05 GMT) sed: Fix handling of an empty pattern space Add a regression test. PR: 271791 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271791 ) Obtained from: OpenBSD (1.38 millert) MFC after: 2 weeks (cherry picked from commit 5982237f1e5a30b6b7d67b307b4d3685b00718bf) M usr.bin/sed/process.c M usr.bin/sed/tests/sed2_test.sh ____________________________________________________________________________________________________________ Commit: 40c01de1356224a82fec217bd3cd59dd058ef095 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=40c01de1356224a82fec217bd3cd59dd058ef095 Author: Mark Johnston (Tue 7 Jan 2025 17:58:58 GMT) Committer: Mark Johnston (Tue 14 Jan 2025 14:14:45 GMT) x86: Short-circuit ipi_all_but_self() on UP systems Apparently this is required on old intel hw, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275086#c3 PR: 275086 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275086 ) Reviewed by: mav, kib Fixes: 279cd05b7e4d ("Use APIC_IPI_DEST_OTHERS for bitmapped IPIs too.") MFC after: 1 week Diagnosed by: Ben Wilber Differential Revision: https://reviews.freebsd.org/D48361 (cherry picked from commit 254a2b767f9a39f1541e0a07a70bbe269e86ad70) M sys/x86/x86/mp_x86.c ____________________________________________________________________________________________________________ Commit: 08ec14fecf6a93c0321c31ba1f0b04db6b888f16 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=08ec14fecf6a93c0321c31ba1f0b04db6b888f16 Author: Zhenlei Huang (Tue 14 Jan 2025 10:56:49 GMT) Committer: Zhenlei Huang (Tue 14 Jan 2025 10:56:49 GMT) sppp: Fix getting wrong spppreq cmd from ioctl ifr->ifr_data is supposed to point to a struct spppreq. The first member cmd of struct spppreq is int type. It was pre-read via `fueword()` before a full fetching. Unfortunately an user space `struct spppreq spr` may not be zeroed explicitly, on 64bit architectures `fueword()` reads 64bit word thus the garbage (extra 4 bytes) may be read into kernel space (subcmd). Prior to f9d8181868ee, `subcmd` was declared as int and assigned from `fuword()` and was implicitly converted from long to int. On 64bit little endian architectures the implicitly conversion overflows (undefined bahavior) which happen to trash the garbage (the extra 4 bytes, high 32 bits) and worked, but no luck on 64bit big endian architectures. Since f9d8181868ee `subcmd` was changed to u_long then there is no conversion so we end up mismatching `subcmd` with user space's `cmd`. It is also a bit hackish to get the value of cmd via `fueword()`, instead we refer to it directly from spr->cmd. This is a direct commit to stable/13 as sppp(4) no longer exists in main and stable/14. PR: 173002 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=173002 ) Reviewed by: glebius (previous version) Fixes: f9d8181868ee Fixed yet more ioctl breakage due to the type of ... Differential Revision: https://reviews.freebsd.org/D47335 M sys/net/if_spppsubr.c ____________________________________________________________________________________________________________ Commit: 163951959866377ebf6d9af84a412dd22b1a8983 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=163951959866377ebf6d9af84a412dd22b1a8983 Author: Xin LI (Mon 13 Jan 2025 04:25:29 GMT) Committer: Xin LI (Mon 13 Jan 2025 04:25:29 GMT) MFC: libmagic: Unbreak for older FreeBSD releases. PR: bin/273736 Reported by: philip (cherry picked from commit 7f8f120439b77e60a1070d87f4dc6cb9a43d0335) M lib/libmagic/config.h ____________________________________________________________________________________________________________ Commit: c6bf965f5d1d7cf32f26ecd5df0f8a5f5baebb0f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c6bf965f5d1d7cf32f26ecd5df0f8a5f5baebb0f Author: Kyle Evans (Sun 12 Jan 2025 20:08:41 GMT) Committer: Kyle Evans (Sun 12 Jan 2025 20:12:18 GMT) pkg: include missing My local environment seems to be seeing some pollution; we need for strlen. PR: 284021 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284021 ) Fixes: 2e065d74a5b0e ("pkg: add a pkgsign_verify_data [...]") (cherry picked from commit b8770ce1dfed52fcb7249cdf3cf4d4d16357b9fd) M usr.sbin/pkg/rsa.c ____________________________________________________________________________________________________________ Commit: 748e7bc1521c87d292e8762c59e415ac687f69a2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=748e7bc1521c87d292e8762c59e415ac687f69a2 Author: Shteryana Shopova (Fri 10 Jan 2025 20:30:21 GMT) Committer: Ed Maste (Sun 12 Jan 2025 19:32:38 GMT) bsnmpwalk: Fix crash on invalid data PR: 258570 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258570 ) Reported by: Robert Morris Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D48422 (cherry picked from commit f021e3573519ff192fc708cda9ca4bba264c96f7) (cherry picked from commit 7fbbab2d326bcbfa1592c6104b745cd5973f5aaa) M usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c ____________________________________________________________________________________________________________ Commit: dfd9c9bc3f8627a15443f9bfc068a7eade2d688c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dfd9c9bc3f8627a15443f9bfc068a7eade2d688c Author: Kristof Provost (Sun 5 Jan 2025 16:09:08 GMT) Committer: Kristof Provost (Sun 12 Jan 2025 09:46:31 GMT) umtx: handle allocation failire in umtx_pi_alloc() Don't assume that this allocation will succeed. We may have been passed M_NOWAIT. The calling code already handles allocation failures, but the function itself did not. PR: 283807 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283807 ) MFC after: 1 week (cherry picked from commit 50c1e179b584f43ba82e9afc91b25ec4831b58ef) M sys/kern/kern_umtx.c ____________________________________________________________________________________________________________ Commit: f57df4589d3cd91dac88b2c9edb80ad0eb50979c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f57df4589d3cd91dac88b2c9edb80ad0eb50979c Author: Alexander V. Chernikov (Tue 12 Nov 2024 23:36:50 GMT) Committer: Eugene Grosbein (Sat 11 Jan 2025 12:34:48 GMT) Fix failure to add an interface prefix route when route with the same prefix is already presented in the routing table. PR: 277125 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277125 ) Reported by: Oleksandr Ignatyev Reviewed by: ae, jlduran Tested by: jlduran Differential Revision: https://reviews.freebsd.org/D47534 (cherry picked from commit 1da4954c92ea7585b352ba830d3ee64ca69ada52) M sys/net/route/route_ctl.c M sys/net/route/route_ctl.h ____________________________________________________________________________________________________________ Commit: f4ff5481d8713ce3a37b4f2d48d7948e5bd3696b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f4ff5481d8713ce3a37b4f2d48d7948e5bd3696b Author: Yoshihiro Takahashi (Tue 31 Dec 2024 09:04:27 GMT) Committer: Yoshihiro Takahashi (Sat 11 Jan 2025 08:13:45 GMT) uart: Add support for Brainboxes / Intashield serial cards. PR: 283226 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283226 ) Reported by: Cameron Williams (cherry picked from commit 41b30bbc1a57b60afee9acdd6ad240c92ef13790) M sys/dev/puc/pucdata.c M sys/dev/uart/uart_bus_pci.c ____________________________________________________________________________________________________________ Commit: 0d946859c99408ab42c9f3934ee9c9f149e3e36b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0d946859c99408ab42c9f3934ee9c9f149e3e36b Author: Kyle Evans (Thu 2 Jan 2025 02:15:36 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:31 GMT) shar: add a deprecation notice The shar(1) program is simple, but the fundamental idea of a sh archive is risky at best and one that we probably shouldn't be promoting as prominently as a program in $PATH and a manpage. Let's deprecate and remove it, since the same functionality can easily be found in tar(1) instead. Reviewed by: emaste, philip Reviewed by: allanjude, brooks, delphij, des, imp, rpokala (previous) (cherry picked from commit f68ee0e7a1e8732f725cad4ac708ec49093782d4) (cherry picked from commit 2832af7b4ea256b18ef4dbf2ff97a50765f0609a) M usr.bin/shar/shar.1 ____________________________________________________________________________________________________________ Commit: b5ae765d824471bfd2d1b26a0b748d354d132a48 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=b5ae765d824471bfd2d1b26a0b748d354d132a48 Author: Kyle Evans (Wed 1 Jan 2025 21:10:28 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:31 GMT) pkg: finish adding the ECC signer and signature type bits Signature types need to be parsed out of the key/signature information that we are presented with from the files we download. We use that to understand whicher signer we need to dispatch to. The ECC signer is more-or-less lifted from pkg(8), with some changes to slim it down for pkg(7). Reviewed by: bapt (cherry picked from commit 3d0a0dda3a7d57bbd4eaf65ba8da0f2a36089c0e) M usr.sbin/pkg/Makefile A usr.sbin/pkg/ecc.c M usr.sbin/pkg/pkg.c M usr.sbin/pkg/pkg.h ____________________________________________________________________________________________________________ Commit: 4e33c2e91835162f994589bceff9a16ed4613d49 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4e33c2e91835162f994589bceff9a16ed4613d49 Author: Kyle Evans (Wed 1 Jan 2025 21:10:28 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:31 GMT) pkg: add a pkgsign_verify_data callback This will be used to verify raw payloads, as if signed by pkg-key(8). It will be used specifically in pkg(7) to verify .pubkeysig as published by poudriere. Amend verify_pubsignature() now to use it. For the RSA signer, we need to verify using a sha256 of the data instead of the data itself. Reviewed by: bapt (cherry picked from commit 2e065d74a5b0ea32db7d4f6e3f78eaa17ee7685e) M usr.sbin/pkg/pkg.c M usr.sbin/pkg/pkg.h M usr.sbin/pkg/rsa.c ____________________________________________________________________________________________________________ Commit: 082f3564f94d85054aba8ef4d34fc375611e5387 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=082f3564f94d85054aba8ef4d34fc375611e5387 Author: Kyle Evans (Wed 1 Jan 2025 21:10:27 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:30 GMT) pkg: abstract rsa out behind a pkgsign API This mirrors a change we made in pkg(8), and will be used to next add another signer that does ECC. Reviewed by: bapt, emaste (cherry picked from commit 5862580ded35e23581291a2e1052f04428369ead) M usr.sbin/pkg/pkg.c M usr.sbin/pkg/pkg.h M usr.sbin/pkg/rsa.c ____________________________________________________________________________________________________________ Commit: 9d25078d81211b3a91021d12a19bca9231f0821d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9d25078d81211b3a91021d12a19bca9231f0821d Author: Kyle Evans (Wed 1 Jan 2025 21:10:28 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:30 GMT) pkg: refactor out a pkg_read_fd() We already have to do this for reading the pubkey, just pull it out for other uses. The ECC signer will use this to verify the bootstrap if the PUBKEY mechanism is used. Reviewed by: bapt, emaste (cherry picked from commit 2ecfc040a09f8c42f67bbfdcc4bd02ef84dac8b7) M usr.sbin/pkg/pkg.c M usr.sbin/pkg/pkg.h ____________________________________________________________________________________________________________ Commit: 14cf1cdf9a099d47b8c80596b462696ebda1c11d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=14cf1cdf9a099d47b8c80596b462696ebda1c11d Author: Kyle Evans (Wed 1 Jan 2025 21:10:27 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:30 GMT) pkg: pull rsa bits out of pkg.c We'll eventually add a pkgsign abstraction over these similar to how we do in pkg(8), but start by isolating these parts. Reviewed by: bapt, emaste (cherry picked from commit 2629e90dd05fb69d767525f960101d7d055ffae0) M usr.sbin/pkg/Makefile M usr.sbin/pkg/pkg.c A usr.sbin/pkg/pkg.h A usr.sbin/pkg/rsa.c ____________________________________________________________________________________________________________ Commit: e993a99fd86267a6ea6a7925bf05d3f26730ee9c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e993a99fd86267a6ea6a7925bf05d3f26730ee9c Author: Kyle Evans (Wed 1 Jan 2025 21:10:27 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:29 GMT) secure: hook up libecc as libpkgecc libecc is not intended to be general use, other applications should really be using openssl. pkg(7) uses libecc to align with the pkg(8) project and its goals. This will be used in the upcoming support for ECC in pkg(7). Reviewed by: emaste (cherry picked from commit 05427f4639bcf2703329a9be9d25ec09bb782742) M secure/lib/Makefile A secure/lib/libpkgecc/Makefile A secure/lib/libpkgecc/pkg_libecc_rand.c M share/mk/src.libnames.mk ____________________________________________________________________________________________________________ Commit: c56f6dae426c76bf060c1986fe9bdd4efbd13813 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c56f6dae426c76bf060c1986fe9bdd4efbd13813 Author: Kyle Evans (Wed 1 Jan 2025 21:11:18 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:29 GMT) Add 'crypto/libecc/' from commit '736d663976d1768533badbf06581481d01fade4c' git-subtree-dir: crypto/libecc git-subtree-mainline: f59bb61e1eb4d1e4fc3c60cc14779d0668267cb2 git-subtree-split: 736d663976d1768533badbf06581481d01fade4c (cherry picked from commit f0865ec9906d5a18fa2a3b61381f22ce16e606ad) A crypto/libecc/.github/workflows/libecc_cifuzz.yml A crypto/libecc/.github/workflows/libecc_compilation_tests.yml A crypto/libecc/.github/workflows/libecc_crossarch_tests.yml A crypto/libecc/.github/workflows/libecc_examples.yml A crypto/libecc/.github/workflows/libecc_meson_build.yml A crypto/libecc/.github/workflows/libecc_python_tests.yml A crypto/libecc/.github/workflows/libecc_runtime_tests.yml A crypto/libecc/.gitignore A crypto/libecc/.travis.yml A crypto/libecc/LICENSE A crypto/libecc/Makefile A crypto/libecc/README.md A crypto/libecc/build/.gitignore A crypto/libecc/common.mk A crypto/libecc/include/libecc/curves/aff_pt.h A crypto/libecc/include/libecc/curves/curves.h A crypto/libecc/include/libecc/curves/curves_list.h A crypto/libecc/include/libecc/curves/ec_edwards.h A crypto/libecc/include/libecc/curves/ec_montgomery.h A crypto/libecc/include/libecc/curves/ec_params.h A crypto/libecc/include/libecc/curves/ec_shortw.h A crypto/libecc/include/libecc/curves/known/ec_params_bign256v1.h A crypto/libecc/include/libecc/curves/known/ec_params_bign384v1.h A crypto/libecc/include/libecc/curves/known/ec_params_bign512v1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp192r1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp192t1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp224r1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp224t1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp256r1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp256t1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp320r1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp320t1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp384r1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp384t1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp512r1.h A crypto/libecc/include/libecc/curves/known/ec_params_brainpoolp512t1.h A crypto/libecc/include/libecc/curves/known/ec_params_external.h A crypto/libecc/include/libecc/curves/known/ec_params_frp256v1.h A crypto/libecc/include/libecc/curves/known/ec_params_gost256.h A crypto/libecc/include/libecc/curves/known/ec_params_gost512.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2001_CryptoPro_A_ParamSet.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2001_CryptoPro_B_ParamSet.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2001_CryptoPro_C_ParamSet.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2001_CryptoPro_XchA_ParamSet.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2001_CryptoPro_XchB_ParamSet.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2001_TestParamSet.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2012_256_paramSetA.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2012_256_paramSetB.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2012_256_paramSetC.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2012_256_paramSetD.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2012_512_paramSetA.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2012_512_paramSetB.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2012_512_paramSetC.h A crypto/libecc/include/libecc/curves/known/ec_params_gost_R3410_2012_512_paramSetTest.h A crypto/libecc/include/libecc/curves/known/ec_params_secp192k1.h A crypto/libecc/include/libecc/curves/known/ec_params_secp192r1.h A crypto/libecc/include/libecc/curves/known/ec_params_secp224k1.h A crypto/libecc/include/libecc/curves/known/ec_params_secp224r1.h A crypto/libecc/include/libecc/curves/known/ec_params_secp256k1.h A crypto/libecc/include/libecc/curves/known/ec_params_secp256r1.h A crypto/libecc/include/libecc/curves/known/ec_params_secp384r1.h A crypto/libecc/include/libecc/curves/known/ec_params_secp521r1.h A crypto/libecc/include/libecc/curves/known/ec_params_sm2p192test.h A crypto/libecc/include/libecc/curves/known/ec_params_sm2p256test.h A crypto/libecc/include/libecc/curves/known/ec_params_sm2p256v1.h A crypto/libecc/include/libecc/curves/known/ec_params_wei25519.h A crypto/libecc/include/libecc/curves/known/ec_params_wei448.h A crypto/libecc/include/libecc/curves/prj_pt.h A crypto/libecc/include/libecc/ecdh/ecccdh.h A crypto/libecc/include/libecc/ecdh/ecdh.h A crypto/libecc/include/libecc/ecdh/x25519_448.h A crypto/libecc/include/libecc/external_deps/print.h A crypto/libecc/include/libecc/external_deps/rand.h A crypto/libecc/include/libecc/external_deps/time.h A crypto/libecc/include/libecc/fp/fp.h A crypto/libecc/include/libecc/fp/fp_add.h A crypto/libecc/include/libecc/fp/fp_config.h A crypto/libecc/include/libecc/fp/fp_montgomery.h A crypto/libecc/include/libecc/fp/fp_mul.h A crypto/libecc/include/libecc/fp/fp_mul_redc1.h A crypto/libecc/include/libecc/fp/fp_pow.h A crypto/libecc/include/libecc/fp/fp_rand.h A crypto/libecc/include/libecc/fp/fp_sqrt.h A crypto/libecc/include/libecc/hash/bash.h A crypto/libecc/include/libecc/hash/bash224.h A crypto/libecc/include/libecc/hash/bash256.h A crypto/libecc/include/libecc/hash/bash384.h A crypto/libecc/include/libecc/hash/bash512.h A crypto/libecc/include/libecc/hash/belt-hash.h A crypto/libecc/include/libecc/hash/hash_algs.h A crypto/libecc/include/libecc/hash/hmac.h A crypto/libecc/include/libecc/hash/keccak.h A crypto/libecc/include/libecc/hash/ripemd160.h A crypto/libecc/include/libecc/hash/sha2.h A crypto/libecc/include/libecc/hash/sha224.h A crypto/libecc/include/libecc/hash/sha256.h A crypto/libecc/include/libecc/hash/sha3-224.h A crypto/libecc/include/libecc/hash/sha3-256.h A crypto/libecc/include/libecc/hash/sha3-384.h A crypto/libecc/include/libecc/hash/sha3-512.h A crypto/libecc/include/libecc/hash/sha3.h A crypto/libecc/include/libecc/hash/sha384.h A crypto/libecc/include/libecc/hash/sha512-224.h A crypto/libecc/include/libecc/hash/sha512-256.h A crypto/libecc/include/libecc/hash/sha512.h A crypto/libecc/include/libecc/hash/sha512_core.h A crypto/libecc/include/libecc/hash/shake.h A crypto/libecc/include/libecc/hash/shake256.h A crypto/libecc/include/libecc/hash/sm3.h A crypto/libecc/include/libecc/hash/streebog.h A crypto/libecc/include/libecc/hash/streebog256.h A crypto/libecc/include/libecc/hash/streebog512.h A crypto/libecc/include/libecc/lib_ecc_config.h A crypto/libecc/include/libecc/lib_ecc_types.h A crypto/libecc/include/libecc/libarith.h A crypto/libecc/include/libecc/libec.h A crypto/libecc/include/libecc/libsig.h A crypto/libecc/include/libecc/meson.build A crypto/libecc/include/libecc/nn/nn.h A crypto/libecc/include/libecc/nn/nn_add.h A crypto/libecc/include/libecc/nn/nn_config.h A crypto/libecc/include/libecc/nn/nn_div.h A crypto/libecc/include/libecc/nn/nn_div_public.h A crypto/libecc/include/libecc/nn/nn_logical.h A crypto/libecc/include/libecc/nn/nn_mod_pow.h A crypto/libecc/include/libecc/nn/nn_modinv.h A crypto/libecc/include/libecc/nn/nn_mul.h A crypto/libecc/include/libecc/nn/nn_mul_public.h A crypto/libecc/include/libecc/nn/nn_mul_redc1.h A crypto/libecc/include/libecc/nn/nn_rand.h A crypto/libecc/include/libecc/sig/bign.h A crypto/libecc/include/libecc/sig/bign_common.h A crypto/libecc/include/libecc/sig/bip0340.h A crypto/libecc/include/libecc/sig/dbign.h A crypto/libecc/include/libecc/sig/decdsa.h A crypto/libecc/include/libecc/sig/ec_key.h A crypto/libecc/include/libecc/sig/ecdsa.h A crypto/libecc/include/libecc/sig/ecdsa_common.h A crypto/libecc/include/libecc/sig/ecfsdsa.h A crypto/libecc/include/libecc/sig/ecgdsa.h A crypto/libecc/include/libecc/sig/eckcdsa.h A crypto/libecc/include/libecc/sig/ecosdsa.h A crypto/libecc/include/libecc/sig/ecrdsa.h A crypto/libecc/include/libecc/sig/ecsdsa.h A crypto/libecc/include/libecc/sig/ecsdsa_common.h A crypto/libecc/include/libecc/sig/eddsa.h A crypto/libecc/include/libecc/sig/fuzzing_ecdsa.h A crypto/libecc/include/libecc/sig/fuzzing_ecgdsa.h A crypto/libecc/include/libecc/sig/fuzzing_ecrdsa.h A crypto/libecc/include/libecc/sig/sig_algs.h A crypto/libecc/include/libecc/sig/sig_algs_internal.h A crypto/libecc/include/libecc/sig/sm2.h A crypto/libecc/include/libecc/utils/dbg_sig.h A crypto/libecc/include/libecc/utils/print_buf.h A crypto/libecc/include/libecc/utils/print_curves.h A crypto/libecc/include/libecc/utils/print_fp.h A crypto/libecc/include/libecc/utils/print_keys.h A crypto/libecc/include/libecc/utils/print_nn.h A crypto/libecc/include/libecc/utils/utils.h A crypto/libecc/include/libecc/utils/utils_rand.h A crypto/libecc/include/libecc/words/types.h A crypto/libecc/include/libecc/words/words.h A crypto/libecc/include/libecc/words/words_16.h A crypto/libecc/include/libecc/words/words_32.h A crypto/libecc/include/libecc/words/words_64.h A crypto/libecc/meson.build A crypto/libecc/meson.options A crypto/libecc/scripts/crossbuild.sh A crypto/libecc/scripts/crossrun.sh A crypto/libecc/scripts/expand_libecc.py A crypto/libecc/scripts/gen_curves_tests.sh A crypto/libecc/scripts/gen_openssl_curves_tests.sh A crypto/libecc/scripts/sha3.py A crypto/libecc/scripts/test_ec_utils.sh A crypto/libecc/src/arithmetic_tests/Makefile A crypto/libecc/src/arithmetic_tests/arithmetic_tests.c A crypto/libecc/src/arithmetic_tests/arithmetic_tests_generator.py A crypto/libecc/src/curves/aff_pt.c A crypto/libecc/src/curves/aff_pt_edwards.c A crypto/libecc/src/curves/aff_pt_montgomery.c A crypto/libecc/src/curves/curves.c A crypto/libecc/src/curves/ec_edwards.c A crypto/libecc/src/curves/ec_montgomery.c A crypto/libecc/src/curves/ec_params.c A crypto/libecc/src/curves/ec_shortw.c A crypto/libecc/src/curves/meson.build A crypto/libecc/src/curves/prj_pt.c A crypto/libecc/src/ecdh/ecccdh.c A crypto/libecc/src/ecdh/meson.build A crypto/libecc/src/ecdh/x25519_448.c A crypto/libecc/src/examples/Makefile A crypto/libecc/src/examples/basic/Makefile A crypto/libecc/src/examples/basic/curve_basic_examples.c A crypto/libecc/src/examples/basic/curve_ecdh.c A crypto/libecc/src/examples/basic/fp_square_residue.c A crypto/libecc/src/examples/basic/nn_miller_rabin.c A crypto/libecc/src/examples/basic/nn_pollard_rho.c A crypto/libecc/src/examples/hash/Makefile A crypto/libecc/src/examples/hash/gostr34_11_94.c A crypto/libecc/src/examples/hash/gostr34_11_94.h A crypto/libecc/src/examples/hash/hash.c A crypto/libecc/src/examples/hash/hash.h A crypto/libecc/src/examples/hash/md2.c A crypto/libecc/src/examples/hash/md2.h A crypto/libecc/src/examples/hash/md4.c A crypto/libecc/src/examples/hash/md4.h A crypto/libecc/src/examples/hash/md5.c A crypto/libecc/src/examples/hash/md5.h A crypto/libecc/src/examples/hash/mdc2.c A crypto/libecc/src/examples/hash/mdc2.h A crypto/libecc/src/examples/hash/sha0.c A crypto/libecc/src/examples/hash/sha0.h A crypto/libecc/src/examples/hash/sha1.c A crypto/libecc/src/examples/hash/sha1.h A crypto/libecc/src/examples/hash/tdes.c A crypto/libecc/src/examples/hash/tdes.h A crypto/libecc/src/examples/sig/Makefile A crypto/libecc/src/examples/sig/common/common.h A crypto/libecc/src/examples/sig/dsa/Makefile A crypto/libecc/src/examples/sig/dsa/dsa.c A crypto/libecc/src/examples/sig/dsa/dsa.h A crypto/libecc/src/examples/sig/gostr34_10_94/Makefile A crypto/libecc/src/examples/sig/gostr34_10_94/gostr34_10_94.c A crypto/libecc/src/examples/sig/gostr34_10_94/gostr34_10_94.h A crypto/libecc/src/examples/sig/kcdsa/Makefile A crypto/libecc/src/examples/sig/kcdsa/kcdsa.c A crypto/libecc/src/examples/sig/kcdsa/kcdsa.h A crypto/libecc/src/examples/sig/rsa/Makefile A crypto/libecc/src/examples/sig/rsa/rsa.c A crypto/libecc/src/examples/sig/rsa/rsa.h A crypto/libecc/src/examples/sig/rsa/rsa_pkcs1_tests.h A crypto/libecc/src/examples/sig/rsa/rsa_tests.h A crypto/libecc/src/examples/sig/sdsa/Makefile A crypto/libecc/src/examples/sig/sdsa/sdsa.c A crypto/libecc/src/examples/sig/sdsa/sdsa.h A crypto/libecc/src/examples/sss/Makefile A crypto/libecc/src/examples/sss/sss.c A crypto/libecc/src/examples/sss/sss.h A crypto/libecc/src/examples/sss/sss_private.h A crypto/libecc/src/external_deps/meson.build A crypto/libecc/src/external_deps/print.c A crypto/libecc/src/external_deps/rand.c A crypto/libecc/src/external_deps/time.c A crypto/libecc/src/fp/fp.c A crypto/libecc/src/fp/fp_add.c A crypto/libecc/src/fp/fp_montgomery.c A crypto/libecc/src/fp/fp_mul.c A crypto/libecc/src/fp/fp_mul_redc1.c A crypto/libecc/src/fp/fp_pow.c A crypto/libecc/src/fp/fp_rand.c A crypto/libecc/src/fp/fp_sqrt.c A crypto/libecc/src/fp/meson.build A crypto/libecc/src/hash/bash.c A crypto/libecc/src/hash/bash224.c A crypto/libecc/src/hash/bash256.c A crypto/libecc/src/hash/bash384.c A crypto/libecc/src/hash/bash512.c A crypto/libecc/src/hash/belt-hash.c A crypto/libecc/src/hash/hash_algs.c A crypto/libecc/src/hash/hmac.c A crypto/libecc/src/hash/meson.build A crypto/libecc/src/hash/ripemd160.c A crypto/libecc/src/hash/sha224.c A crypto/libecc/src/hash/sha256.c A crypto/libecc/src/hash/sha3-224.c A crypto/libecc/src/hash/sha3-256.c A crypto/libecc/src/hash/sha3-384.c A crypto/libecc/src/hash/sha3-512.c A crypto/libecc/src/hash/sha3.c A crypto/libecc/src/hash/sha384.c A crypto/libecc/src/hash/sha512-224.c A crypto/libecc/src/hash/sha512-256.c A crypto/libecc/src/hash/sha512.c A crypto/libecc/src/hash/sha512_core.c A crypto/libecc/src/hash/shake.c A crypto/libecc/src/hash/shake256.c A crypto/libecc/src/hash/sm3.c A crypto/libecc/src/hash/streebog.c A crypto/libecc/src/nn/meson.build A crypto/libecc/src/nn/nn.c A crypto/libecc/src/nn/nn_add.c A crypto/libecc/src/nn/nn_div.c A crypto/libecc/src/nn/nn_div.h A crypto/libecc/src/nn/nn_logical.c A crypto/libecc/src/nn/nn_mod_pow.c A crypto/libecc/src/nn/nn_modinv.c A crypto/libecc/src/nn/nn_mul.c A crypto/libecc/src/nn/nn_mul.h A crypto/libecc/src/nn/nn_mul_redc1.c A crypto/libecc/src/nn/nn_rand.c A crypto/libecc/src/sig/bign.c A crypto/libecc/src/sig/bign_common.c A crypto/libecc/src/sig/bip0340.c A crypto/libecc/src/sig/dbign.c A crypto/libecc/src/sig/decdsa.c A crypto/libecc/src/sig/ec_key.c A crypto/libecc/src/sig/ecdsa.c A crypto/libecc/src/sig/ecdsa_common.c A crypto/libecc/src/sig/ecfsdsa.c A crypto/libecc/src/sig/ecgdsa.c A crypto/libecc/src/sig/eckcdsa.c A crypto/libecc/src/sig/ecosdsa.c A crypto/libecc/src/sig/ecrdsa.c A crypto/libecc/src/sig/ecsdsa.c A crypto/libecc/src/sig/ecsdsa_common.c A crypto/libecc/src/sig/eddsa.c A crypto/libecc/src/sig/fuzzing_ecdsa.c A crypto/libecc/src/sig/fuzzing_ecgdsa.c A crypto/libecc/src/sig/fuzzing_ecrdsa.c A crypto/libecc/src/sig/meson.build A crypto/libecc/src/sig/sig_algs.c A crypto/libecc/src/sig/sm2.c A crypto/libecc/src/tests/bign_test_vectors.h A crypto/libecc/src/tests/bip0340_test_vectors.h A crypto/libecc/src/tests/dbign_test_vectors.h A crypto/libecc/src/tests/decdsa_test_vectors.h A crypto/libecc/src/tests/ec_self_tests.c A crypto/libecc/src/tests/ec_self_tests.h A crypto/libecc/src/tests/ec_self_tests_core.c A crypto/libecc/src/tests/ec_self_tests_core.h A crypto/libecc/src/tests/ec_utils.c A crypto/libecc/src/tests/ecccdh_test_vectors.h A crypto/libecc/src/tests/ed25519_test_vectors.h A crypto/libecc/src/tests/ed25519ctx_test_vectors.h A crypto/libecc/src/tests/ed25519ph_test_vectors.h A crypto/libecc/src/tests/ed448_test_vectors.h A crypto/libecc/src/tests/ed448ph_test_vectors.h A crypto/libecc/src/tests/meson.build A crypto/libecc/src/tests/x25519_test_vectors.h A crypto/libecc/src/tests/x448_test_vectors.h A crypto/libecc/src/utils/meson.build A crypto/libecc/src/utils/print_buf.c A crypto/libecc/src/utils/print_curves.c A crypto/libecc/src/utils/print_fp.c A crypto/libecc/src/utils/print_keys.c A crypto/libecc/src/utils/print_nn.c A crypto/libecc/src/utils/utils.c A crypto/libecc/src/utils/utils_rand.c A crypto/libecc/src/utils/utils_rand.h A crypto/libecc/src/wycheproof_tests/Makefile A crypto/libecc/src/wycheproof_tests/libecc_wycheproof.c A crypto/libecc/src/wycheproof_tests/libecc_wycheproof.h A crypto/libecc/src/wycheproof_tests/libecc_wycheproof_tests.h A crypto/libecc/support/meson/armv7em-noneabi.ini ____________________________________________________________________________________________________________ Commit: 98b689134b696023b35197479f1fe553e22087ff URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=98b689134b696023b35197479f1fe553e22087ff Author: Kyle Evans (Wed 1 Jan 2025 21:10:27 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:28 GMT) lib: hook libder up to the build libder will be used in upcoming ECC support in the pkg(7) bootstrap to read DER-encoded keys and signatures. (cherry picked from commit f59bb61e1eb4d1e4fc3c60cc14779d0668267cb2) M lib/Makefile A lib/libder/Makefile M share/mk/src.libnames.mk ____________________________________________________________________________________________________________ Commit: 883ba1bdbe3695579c1b615e90b01ce1bc6a8b14 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=883ba1bdbe3695579c1b615e90b01ce1bc6a8b14 Author: Kyle Evans (Wed 1 Jan 2025 21:11:02 GMT) Committer: Kyle Evans (Sat 11 Jan 2025 02:48:27 GMT) Add 'contrib/libder/' from commit '9c40c4de4c33b2ba1124fb752ebea0bebaa6013f' git-subtree-dir: contrib/libder git-subtree-mainline: d11904b350214943dedb64c7121d4602799d7afd git-subtree-split: 9c40c4de4c33b2ba1124fb752ebea0bebaa6013f (cherry picked from commit 35c0a8c449fd2b7f75029ebed5e10852240f0865) A contrib/libder/.cirrus.yml A contrib/libder/.github/workflows/build.yml A contrib/libder/.gitignore A contrib/libder/CMakeLists.txt A contrib/libder/LICENSE A contrib/libder/README.md A contrib/libder/derdump/.gitignore A contrib/libder/derdump/CMakeLists.txt A contrib/libder/derdump/derdump.1 A contrib/libder/derdump/derdump.c A contrib/libder/libder/CMakeLists.txt A contrib/libder/libder/libder.3 A contrib/libder/libder/libder.c A contrib/libder/libder/libder.h A contrib/libder/libder/libder_error.c A contrib/libder/libder/libder_obj.3 A contrib/libder/libder/libder_obj.c A contrib/libder/libder/libder_private.h A contrib/libder/libder/libder_read.3 A contrib/libder/libder/libder_read.c A contrib/libder/libder/libder_type.3 A contrib/libder/libder/libder_type.c A contrib/libder/libder/libder_write.3 A contrib/libder/libder/libder_write.c A contrib/libder/tests/.gitignore A contrib/libder/tests/CMakeLists.txt A contrib/libder/tests/fuzz_parallel.c A contrib/libder/tests/fuzz_stream.c A contrib/libder/tests/fuzz_write.c A contrib/libder/tests/fuzzers.h A contrib/libder/tests/make_corpus.c A contrib/libder/tests/repo.priv A contrib/libder/tests/repo.pub A contrib/libder/tests/test_common.h A contrib/libder/tests/test_privkey.c A contrib/libder/tests/test_pubkey.c ____________________________________________________________________________________________________________ Commit: 02a71cfa504ebab7b94722068f57c8f4bdd509e2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=02a71cfa504ebab7b94722068f57c8f4bdd509e2 Author: Konstantin Belousov (Tue 12 Nov 2024 06:29:23 GMT) Committer: Konstantin Belousov (Tue 7 Jan 2025 18:31:56 GMT) SU+J: all writes to SU journal must be exempt from runningbufspace throttling PR: 282449 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282449 ) (cherry picked from commit 46f02c4282ff76b66579c83be53ef441ea522536) M sys/ufs/ffs/ffs_softdep.c ____________________________________________________________________________________________________________ Commit: eb9fa4c2d786b327bb4d9bd7727428c70a33c710 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eb9fa4c2d786b327bb4d9bd7727428c70a33c710 Author: Baptiste Daroussin (Fri 3 Jan 2025 09:50:30 GMT) Committer: Baptiste Daroussin (Tue 7 Jan 2025 09:03:21 GMT) libusb: fix hotplug sigbus When a hotplug callback has been registered, and the program using libusb is calling libusb_exit then the thread handler is set to NO_THREAD which result in the variable controlling the loop the be set to 0, it does a last pass through device available without having done a scan, which result in a sigbus after it tried to unregister all the devices. directly break the loop instead and cleanup the list of devices this fixes the tests with LGPLed libusb's hotplugtest program MFC After: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D48298 (cherry picked from commit ba5834b8e11fd002a663d083a464e397e76cb3a9) M lib/libusb/libusb10_hotplug.c ____________________________________________________________________________________________________________ Commit: 014064b33f72c4405117eb71e6a06c8b51cc224e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=014064b33f72c4405117eb71e6a06c8b51cc224e Author: Dimitry Andric (Sat 4 Jan 2025 18:09:37 GMT) Committer: Dimitry Andric (Sat 4 Jan 2025 18:13:30 GMT) Revert "Export additional __aeabi_ symbols from arm's libgcc_s" This reverts commit caab831338f4eeaa7455e981478be9fd414b7969, because some new unresolved issues came up in bug 271087: Some programs depend on these symbols, when they are compiled for armv6 or armv7. Closes #1560 (slightly changed due to sorting of the symbols). PR: 271087 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271087 ) Reported by: mmel MFC after: immediately (cherry picked from commit b662ca1d6cd82044c6cb79075e1830b97594bef3) M lib/libgcc_s/arm/Symbol.map ____________________________________________________________________________________________________________ Commit: a0da8a5fc7c4b3be6aa39f4d321490ccc6b168d4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a0da8a5fc7c4b3be6aa39f4d321490ccc6b168d4 Author: Dimitry Andric (Sat 28 Dec 2024 21:17:13 GMT) Committer: Dimitry Andric (Sat 4 Jan 2025 01:01:53 GMT) Export additional __aeabi_ symbols from arm's libgcc_s Some programs depend on these symbols, when they are compiled for armv6 or armv7. Closes #1560 (slightly changed due to sorting of the symbols). PR: 271087 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271087 ) Reported by: fuz Submitted by: jfc@mit.edu MFC after: 1 week (cherry picked from commit caab831338f4eeaa7455e981478be9fd414b7969) M lib/libgcc_s/arm/Symbol.map ____________________________________________________________________________________________________________ Commit: e374f096e7b61c814a2011d881b002cf406a838c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e374f096e7b61c814a2011d881b002cf406a838c Author: Kyle Evans (Wed 11 Dec 2024 01:23:10 GMT) Committer: Kyle Evans (Wed 1 Jan 2025 05:47:48 GMT) usb: serial: make more commands execute synchronously The termios layer wants some level of guarantee that we've actually submitted param changes to the hardware when our functions return, so we need to do a little more waiting to avoid violating those guarantees. This is especially important as some hardware has some minimum timing specifications around this stuff, and without being less asynchronous the software dealing with these devices can't reasonably operate the hardware without more excessive delays than they should need. More specifically, we make sure that: - The command to start transfers is finished before we toggle DTR/RTS - The status_change command finishes before we return, which may change some fields in the softc that we need for a subsequent call into usb_serial - cfg_param finishes before we re-enable transfers, and we ensure that RTS is appropriately toggled before we return to userland This has been observed to fix some flakiness in connecting to some ESP32 devices. Tested by: kenrap from Libera Reviewed by: imp, kib (cherry picked from commit 36a80f4264350a2f4f0686eb91ae7f5943d40327) M sys/dev/usb/serial/usb_serial.c ____________________________________________________________________________________________________________ Commit: 0fb0a408a13c7ec7ff6834a213aede35b26419fa URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0fb0a408a13c7ec7ff6834a213aede35b26419fa Author: Kyle Evans (Wed 11 Dec 2024 01:23:10 GMT) Committer: Kyle Evans (Wed 1 Jan 2025 05:47:47 GMT) usb: serial: allow the open/close sleep to be interruptible ucom_queue_command will issue commands for open/close, then wait on them to be finished. In the spirit of playing it safe, allow ucom_queue_command's wait to be interrupted in case the usb process gets jammed up waiting on the hardware -- we can at least recover the user thread that initiated it, even if we can't recover the usb process. Reviewed by: imp, kib (cherry picked from commit 729eb176a465cedc55c5980f116d87be592421f1) M sys/dev/usb/serial/usb_serial.c M sys/dev/usb/usb_process.c M sys/dev/usb/usb_process.h M sys/dev/usb/usbdi.h ____________________________________________________________________________________________________________ Commit: 360d3fe8743dbc9dc500b057ccdfd9c36743ef58 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=360d3fe8743dbc9dc500b057ccdfd9c36743ef58 Author: Kyle Evans (Wed 11 Dec 2024 01:23:10 GMT) Committer: Kyle Evans (Wed 1 Jan 2025 05:47:47 GMT) usb: serial: propagate errors from ucom_queue_command() There's only one error that we can get back right now, but future changes will add some more cases that we need to watch out for. Start by returning errors and propagating them back. Reviewed by: kib (cherry picked from commit 51f3d0874f6216907c8971c4af9d6be6c93edf7b) M sys/dev/usb/serial/usb_serial.c ____________________________________________________________________________________________________________ Commit: 242eb8d4e0095f7d922ecec78b7a3c91a6e2d99c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=242eb8d4e0095f7d922ecec78b7a3c91a6e2d99c Author: Tijl Coosemans (Tue 3 Dec 2024 10:45:10 GMT) Committer: Tijl Coosemans (Tue 31 Dec 2024 13:17:46 GMT) rc.d/sendmail: Fix error with some configurations The sendmail startup script can run 4 daemons: sendmail, sendmail_submit, sendmail_outbound, and sendmail_msp_queue. Of the first 3 at most one can be enabled. There's a run_rc_command call for each and the ones for sendmail and sendmail_msp_queue run unconditionally. For some rc commands this triggers warnings or errors when sendmail_enable="NO" or sendmail_msp_queue_enable="NO". Since d2e7bb630b83 these errors are propagated and the whole script fails. Fix this by first determining which daemons are enabled, setting ${name} and ${rcvar} accordingly, and then always calling run_rc_command conditionally. Also replace ${name}.cf with sendmail.cf because ${name} isn't always sendmail. PR: 282585 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282585 ) Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47757 (cherry picked from commit 6b17d944a1d448dbb797c5fa5b0778242ba02e52) M libexec/rc/rc.d/sendmail ____________________________________________________________________________________________________________ Commit: 3f00a0678b9de3657d859e590adb3e646aebb2ae URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3f00a0678b9de3657d859e590adb3e646aebb2ae Author: Michael Osipov (Mon 2 Dec 2024 13:25:45 GMT) Committer: Michael Osipov (Tue 31 Dec 2024 12:37:39 GMT) linprocfs: Properly reset error variable for mtab generation Both functions linprocfs_domtab() and linprocfs_doprocmountinfo() are logically identical, but the former fails with ECANCELED because error is not reset after the for loop. Reviewed by: jrm, fluffy MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47865 (cherry picked from commit 58c7db14cd71c41f59d80d26d921782c0c27d523) M sys/compat/linprocfs/linprocfs.c ____________________________________________________________________________________________________________ Commit: 420d4927b31170d4b04462e9265519af9e8d764c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=420d4927b31170d4b04462e9265519af9e8d764c Author: Gordon Bergling (Sat 28 Dec 2024 06:38:33 GMT) Committer: Gordon Bergling (Tue 31 Dec 2024 09:35:13 GMT) isci(4): Fix a typo in a source code comment - s/kength/length/ (cherry picked from commit 3db51fb1720efdddd6e8c2045397f59a398692d3) M sys/dev/isci/scil/sati_util.c ____________________________________________________________________________________________________________ Commit: 7d14823194752e41f3a10b9282ff04bb8cff16cd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7d14823194752e41f3a10b9282ff04bb8cff16cd Author: Gordon Bergling (Sat 28 Dec 2024 06:39:50 GMT) Committer: Gordon Bergling (Tue 31 Dec 2024 09:34:59 GMT) kern: Fix a typo in a source code comment - s/explicity/explicitly/ (cherry picked from commit 15ce9a0544e9d850fb332b4bae3313ff38584d61) M sys/kern/sys_process.c ____________________________________________________________________________________________________________ Commit: 228b9b37a8dfa1e7e965b3913979d12a573e8852 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=228b9b37a8dfa1e7e965b3913979d12a573e8852 Author: Gordon Bergling (Sat 28 Dec 2024 06:39:21 GMT) Committer: Gordon Bergling (Tue 31 Dec 2024 09:33:58 GMT) sound(4): Fix a typo in a source code comment - s/orginally/originally/ (cherry picked from commit d40330306cd000c7c64dc18a3634ac8e04b33fdd) M sys/dev/sound/pci/csareg.h ____________________________________________________________________________________________________________ Commit: e2bb5f213a724fd163be4262eb925def0fa8f9fc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e2bb5f213a724fd163be4262eb925def0fa8f9fc Author: Kristof Provost (Wed 11 Dec 2024 22:27:21 GMT) Committer: Kristof Provost (Mon 30 Dec 2024 20:42:33 GMT) pf: fix double free in pf_state_key_attach() In 371bd29d4b we fixed a state key leak, but unintentionally introduced a double free. We pass through the relevant code twice, first for PF_SK_WIRE, then for PF_SK_STACK. If we fail to attach on the second pass we have a more complex cleanup job, handled by pf_detach_state(). We must only free the state keys manually on the first pass, on the second one pf_detach_state() takes care of everything. Tested by: yds Fixes: 371bd29d4b22257a7e92e1e711cca3d94cfbd00d MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 01eb1261443dddcb50a3a278f1278fffdfb0d36e) M sys/netpfil/pf/pf.c ____________________________________________________________________________________________________________ Commit: 6258b5bf0670ba0c280ae1e387fcb0f3ba9f3e32 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6258b5bf0670ba0c280ae1e387fcb0f3ba9f3e32 Author: Craig Leres (Thu 26 Dec 2024 14:42:11 GMT) Committer: Dimitry Andric (Mon 30 Dec 2024 19:20:17 GMT) bsdinstall zfsboot: Add an option to edit the ZFS pool creation options This allows the default options (-O compress=lz4 -O atime=off) to be overridden, before the ZFS boot pool is created. For example, to set the compression algorithm to something different. Reviewed by: jhb, dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47478 (cherry picked from commit ca7e12f7df222458ec5cac8009c5b0931fb4a95b) M usr.sbin/bsdinstall/scripts/zfsboot ____________________________________________________________________________________________________________ Commit: 1a2d8c4db2ae888f4e75b9f15f39934508fb61da URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1a2d8c4db2ae888f4e75b9f15f39934508fb61da Author: Alexander Ziaee (Fri 6 Dec 2024 16:13:53 GMT) Committer: Warner Losh (Sat 28 Dec 2024 18:17:40 GMT) nvmecontrol: Fix minor usage typo PR: 282930 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282930 ) MFC after: 3 days Reported by: Gian-Simon Purkert Reviewed by: imp, jhb, emaste Differential Revision: https://reviews.freebsd.org/D47726 (cherry picked from commit e7aec3ccf759dcd3fe56ae2bdbec92839c166160) M sbin/nvmecontrol/format.c ____________________________________________________________________________________________________________ Commit: 317cf8a1f83255811d35776674395a47a6d7f0b0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=317cf8a1f83255811d35776674395a47a6d7f0b0 Author: Alexander Ziaee (Sun 15 Sep 2024 00:26:16 BST) Committer: Warner Losh (Sat 28 Dec 2024 18:17:30 GMT) cu.1: describe better + tag spdx Preserve over 40 years of "call UNIX" BSD heritage while answering "one line about what it does" e.g. "how do I get a serial console?" "% apropos serial" MFC after: 3 days Reported by: imp Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1423 (cherry picked from commit 4d12c7b9df660b15580ff3b07ef5570d1cab958a) M usr.bin/tip/tip/cu.1 ____________________________________________________________________________________________________________ Commit: 6a03eb1f3028a96a031bf11b2567540b0e9b7f5e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6a03eb1f3028a96a031bf11b2567540b0e9b7f5e Author: Alexander Ziaee (Sun 29 Sep 2024 09:14:36 BST) Committer: Warner Losh (Sat 28 Dec 2024 18:17:14 GMT) sh.1: update history + spdx + linter error + increase history consistency by adding "first appeared" + remove a skipped new paragraph macro to quiet linter + tag spdx MFC after: 3 days History source: www.in-ulm.de/~mascheck/various/ash/#bsd Reviewed by: mhorne,imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1440 (cherry picked from commit e2a72442bd57c1373c30fab945fbfc86464f3782) M bin/sh/sh.1 ____________________________________________________________________________________________________________ Commit: 32b84f8addf0d5460a6dc445bb7b790d9a25714f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=32b84f8addf0d5460a6dc445bb7b790d9a25714f Author: Alexander Ziaee (Fri 8 Nov 2024 00:51:50 GMT) Committer: Warner Losh (Sat 28 Dec 2024 18:17:01 GMT) vt.4: document kern.consmute MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1521 (cherry picked from commit fb91b9858080143b56ba637ab3c8954f3f94694a) M share/man/man4/vt.4 ____________________________________________________________________________________________________________ Commit: 0601bbbea8b35cc1d49450db452304fd00734f2f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0601bbbea8b35cc1d49450db452304fd00734f2f Author: Warner Losh (Tue 15 Oct 2024 12:05:07 BST) Committer: Warner Losh (Sat 28 Dec 2024 18:16:09 GMT) acpidump: Move to acpi.rsdp Switch from the long obsolete hint.0.acpi.rsdp to acpi.rsdp to get the root of the ACPI tables. MFC After: 1 week Sponsored by: Netflix Reviewed by: andrew, markj Differential Revision: https://reviews.freebsd.org/D47079 (cherry picked from commit 5d3fb72667e5794bf16756e00a87338f4acb7f90) M usr.sbin/acpi/acpidump/acpi_user.c ____________________________________________________________________________________________________________ Commit: f6222e8e816cf12d54117fb2d175738bb21f2d25 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f6222e8e816cf12d54117fb2d175738bb21f2d25 Author: Warner Losh (Tue 15 Oct 2024 05:53:55 BST) Committer: Warner Losh (Sat 28 Dec 2024 18:15:53 GMT) linux.h: don't redefine lower_32_bits if already defined systrace.c fails to build if we're using a common compiler.h for both openzfs and linuxkpi. The issue is easy enough to fix: don't redefined lower_32_bits if it's already defined in linux.h, since it's the least 'standardized'. This will allow systrace.c to build using an equivalent macro. MFC After: 3 days Sponsored by: Netflix (cherry picked from commit 481d5a4891648f0a6979a48689cc16fca80d4ab6) M sys/compat/linux/linux.h ____________________________________________________________________________________________________________ Commit: 9184e787ba9140d02699905f6242b6b9c646f15d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9184e787ba9140d02699905f6242b6b9c646f15d Author: Warner Losh (Fri 11 Oct 2024 20:06:24 BST) Committer: Warner Losh (Sat 28 Dec 2024 18:15:03 GMT) loader: Use Cyan instead of Blue for some menu items BLUE often translates to DARK BLUE. On BLACK this is hard to read. Instead, use CYAN which looks good on both black and white backgrounds. Discussed with: kevans Sponsored by: Netflix (cherry picked from commit baa7e9cd3083ccaed8f26e9ad786ff9657ab85fc) M stand/lua/menu.lua ____________________________________________________________________________________________________________ Commit: 65e3190d627feee3911f7aaf44d83c4368135795 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=65e3190d627feee3911f7aaf44d83c4368135795 Author: Warner Losh (Tue 24 Sep 2024 20:54:56 BST) Committer: Warner Losh (Sat 28 Dec 2024 18:14:45 GMT) loader: Fix 0 vs 1 confusion for column numbers In two places we use '0' for a column number. However, the upper left hand corner of the screen is 1, 1. Fix those two confusions. Also, fix a comment that flipped the coordinates in a comment (I'm used to the vt100 convention where it's row, column (eg y, x)) and didn't notice the rest of the code uses x, y. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D46777 (cherry picked from commit 604919c47fa4092db08dadd282851afc9cba0a90) M stand/lua/menu.lua M stand/lua/screen.lua ____________________________________________________________________________________________________________ Commit: bf0b82f8292db384199495ab457f00bcfa3e8c2c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bf0b82f8292db384199495ab457f00bcfa3e8c2c Author: Warner Losh (Tue 24 Sep 2024 17:52:18 BST) Committer: Warner Losh (Sat 28 Dec 2024 18:14:31 GMT) loader: Use printc instead of print to fit in 24,80 print automatically adds a newline, while printc does not. Use printc in preference to print for managing the autoboot message. This means we can use line 24 safely on a 24x80 terminal, restoring some functionality that was lost in 101afbc6ee2f0. Note: we still set the default curosor position to 25,1 in screen.lua, but real VT100s (and successors) will treat any row larger than the pnumber of rows in a cursor motion command to be the last physical row (this is so you can move to 9999,9999 and do a cursor location query to get the size of the screen). Keeping that as is looks better on a typical VGA console. Fixes: 101afbc6ee2f0 Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46771 (cherry picked from commit 3fb656f8ef21332d96de8097521aaa51ddeb649d) M stand/lua/menu.lua ____________________________________________________________________________________________________________ Commit: 59b6187c570d655c619dc32181934287e956bc43 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=59b6187c570d655c619dc32181934287e956bc43 Author: Warner Losh (Fri 23 Aug 2024 00:28:51 BST) Committer: Warner Losh (Sat 28 Dec 2024 18:12:21 GMT) loader/menu: tweak for added line I added a line to the menu, but didn't adjust so things were a line off. Make the necessary adjustments. Fixes: 7cb65be96d47 Sponsored by: Netflix MFC After: 3 days (cherry picked from commit 101afbc6ee2f06f77e6886f1f3ffe115c579967c) M stand/lua/drawer.lua M stand/lua/menu.lua ____________________________________________________________________________________________________________ Commit: 9863280ff77c23c00dfe7f5052bc3814bbc4b733 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9863280ff77c23c00dfe7f5052bc3814bbc4b733 Author: Warner Losh (Wed 3 Jan 2024 23:18:23 GMT) Committer: Warner Losh (Sat 28 Dec 2024 18:11:18 GMT) acpi/apm: Improve APM ioctl interface emulation The apm(8) program documents certain states, but doesn't document the 'unknown' state. It reports things correctly for systems with a battery, but incorrectly for systems without one. Emulate the old interface a little better by saying ac power is online if we have no status (instead of unknown), the battery has a high charge of 255% if there's no battery (instead of -1). Programs, like emacs, expect to see only the documented values and misbehave when they see something else. This is closer to what would happen on old-school APM machines. Sadly (or not) I have no access to old-school APM machines to 100% confirm this, but reading the spec, old code and testing with emacs' mode line with battery suggests these values are more correct. emacs has never been converted to acpi_conf due to permissions issues with acpi devices. Fixing the kernel is preferable to hacking apm(8) for these special cases because other programs that use these interfaces will also be more correct. The kernel also has more data with which to decide what to return. Sponsored by: Netflix MFC After: 1 week (cherry picked from commit 8a3fafc821149e800747cd92afee092fd131c402) M sys/x86/acpica/acpi_apm.c ____________________________________________________________________________________________________________ Commit: dfdcb418d7b8891843130c9415f9778b227945d8 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dfdcb418d7b8891843130c9415f9778b227945d8 Author: Jon Hopper (Sat 28 Dec 2024 17:59:59 GMT) Committer: Warner Losh (Sat 28 Dec 2024 18:00:59 GMT) Adds support for Purism coreboot keyboards On Purism coreboot systems the quirks mode in atkbdc prevents built in Keyboard from being used. Add quirk to prevent that. MFC After: 2 weeks PR: 271737 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271737 ) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40405 (cherry picked from commit 599a4548f8f1758afe1d33c53e9a56e42c5f3e30) M sys/dev/atkbdc/atkbdc.c ____________________________________________________________________________________________________________ Commit: e1deab42d259d3cb8d67e696ed83b66549df9b75 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e1deab42d259d3cb8d67e696ed83b66549df9b75 Author: Warner Losh (Sat 28 Dec 2024 17:59:59 GMT) Committer: Warner Losh (Sat 28 Dec 2024 18:00:58 GMT) ncal: LT is the country code for Lithuania PR: 265479 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265479 ) MFC After: 3 days (cherry picked from commit 6feb6b4ffc0514f59da98992dffd88da472a4397) Sponsored by: Netflix M usr.bin/ncal/ncal.c ____________________________________________________________________________________________________________ Commit: fce635e026676839e030c54499b16bc3dfce17e1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fce635e026676839e030c54499b16bc3dfce17e1 Author: Warner Losh (Sat 28 Dec 2024 17:59:59 GMT) Committer: Warner Losh (Sat 28 Dec 2024 18:00:56 GMT) cam_periph: Return ENXIO when peripheral is invalidated When the peripheral is invalidated, no further I/O is possible. Signal this up the stack with ENXIO now that upper layers of the stack differentiate sometimes. In order for there to be further I/O, and new open is required for any block device that a future periph might instantiate for devices at this location that might return or otherwise become available. The I/O scheduler flushes its I/O with the ENXIO error for pending I/O that didn't make it to the device, so this makes the two paths match. MFC After: 3 days Sponsored by: Netflix Reviewed by: chs, mav Differential Revision: https://reviews.freebsd.org/D35093 (cherry picked from commit 9fb40baf60435c000415429220c57c754ce318fd) M sys/cam/cam_periph.c ____________________________________________________________________________________________________________ Commit: aea9f26d8005e32ad840d0490af94866787e2731 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=aea9f26d8005e32ad840d0490af94866787e2731 Author: Warner Losh (Sat 28 Dec 2024 17:59:59 GMT) Committer: Warner Losh (Sat 28 Dec 2024 18:00:54 GMT) mpr/mps: when sending reset on removal, include target in message It's possible for muliple drives to be departing at the same time (if the common power rail the share goes dark, for example). To understand what's going on better, include target and handle in the messages announcing the reset to allow matching with other corresponding events. MFC After: 3 days Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D35092 (cherry picked from commit ca420b4ef2ceac00f6c6905252d553a86100ab6a) M sys/dev/mpr/mpr_sas.c M sys/dev/mps/mps_sas.c ____________________________________________________________________________________________________________ Commit: 3c7f629b38194920c0a1c71a42bc9d7321d335d7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3c7f629b38194920c0a1c71a42bc9d7321d335d7 Author: Warner Losh (Sat 28 Dec 2024 17:59:59 GMT) Committer: Warner Losh (Sat 28 Dec 2024 18:00:53 GMT) ata_xpt: Rename probe_softc to aprobe_softc Since both scsi_xpt and ata_xpt use the same name for the softc, this can lead to problems in gdb. Avoid the issue by renaming the ata probe_softc to aprobe_softc as has been done for the aprobe in 0f280cbd0a3a9. This was overlooked at the time. Sponsored by: Netflix MFC After: 2 weeks (cherry picked from commit 4762aa57ad17b67b46570025ca21ac4a5eefed0c) M sys/cam/ata/ata_xpt.c ____________________________________________________________________________________________________________ Commit: 2d3426eb9e31fd9e07e1542663426fccf82627e5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2d3426eb9e31fd9e07e1542663426fccf82627e5 Author: Warner Losh (Sat 28 Dec 2024 17:59:59 GMT) Committer: Warner Losh (Sat 28 Dec 2024 18:00:50 GMT) cam: Add doxygen docs to cam_sim_alloc Add description for what each of the parameters are to the cam_sim_alloc call. Add some additional context for the mtx and queue parameters to explain what special values passed in mean. MFC After: 3 days Reviewed by: mav@ Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D30115 (cherry picked from commit cb5880594387d5b07c5d580c4aa1b633947a6046) M sys/cam/cam_sim.c ____________________________________________________________________________________________________________ Commit: 1330ea449802aaf36d4e3fb8e98fcee5be1f5aeb URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1330ea449802aaf36d4e3fb8e98fcee5be1f5aeb Author: Joerg Wunsch (Fri 20 Dec 2024 20:16:52 GMT) Committer: Joerg Wunsch (Fri 27 Dec 2024 21:42:54 GMT) MFC: devd.conf(5): explain difference between internal and shell variables devd.conf by default considers many variables as internal, possibly expanding them to an empty string. Shell variables thus need to be wrapped into braces. Reviewed by: imp, Andre Albsmeier Differential Revision: (cherry picked from commit 1fc7922f9f905b62ef9a6c03be498c282e7b382e) M sbin/devd/devd.conf.5 ____________________________________________________________________________________________________________ Commit: 1d673cc1fd82263ef914f314942412da6047e1e5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1d673cc1fd82263ef914f314942412da6047e1e5 Author: Kajetan Staszkiewicz (Thu 21 Nov 2024 20:30:58 GMT) Committer: Kristof Provost (Fri 27 Dec 2024 18:03:56 GMT) pf: Set cleared time when zeroing stats for table addresses Reviewed by: kp Approved by: kp (mentor) Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D47697 (cherry picked from commit 1a5dc6ee62b316b0caad5118dc0f3aee036f1958) M sys/netpfil/pf/pf_table.c ____________________________________________________________________________________________________________ Commit: f904025c5d20fb579a4b1607069ad9697be542fd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f904025c5d20fb579a4b1607069ad9697be542fd Author: Cy Schubert (Mon 23 Dec 2024 22:30:58 GMT) Committer: Cy Schubert (Fri 27 Dec 2024 17:59:20 GMT) ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 The patch for upstream (ntp.org) fix for upstream Bug 3851 may have fixed a Linux bug but it caused a regression when ntpd is run on FreeBSD. Suggested that so@ publish an errata and merge this to releng/14.2. PR: 283116 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283116 ) (cherry picked from commit 98e34e8e255767e18dd8a6c348cff8bfc01b2662) M contrib/ntp/ntpd/ntp_proto.c ____________________________________________________________________________________________________________ Commit: 393d567afa184fd2b9488ded250481642200abce URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=393d567afa184fd2b9488ded250481642200abce Author: John Baldwin (Fri 13 Dec 2024 16:53:51 GMT) Committer: John Baldwin (Fri 27 Dec 2024 15:53:06 GMT) timeradd.3: Add missing .Pp after .Ed This ensures a blank line between the end of the struct timeval definition and the following paragraph. Formatting change only. Sponsored by: Chelsio Communications (cherry picked from commit 91c6231246b587209e585376c15553f574b17463) M share/man/man3/timeradd.3 ____________________________________________________________________________________________________________ Commit: c9921d4e81e14fe77949920a9bea8768aa7aaf6a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=c9921d4e81e14fe77949920a9bea8768aa7aaf6a Author: John Baldwin (Sat 7 Dec 2024 15:45:26 GMT) Committer: John Baldwin (Fri 27 Dec 2024 15:52:37 GMT) mount_cd9660.8: Bump .Dd for expanding mode mask bits Forgot to amend the prior commit before pushing. Fixes: c1ad5b4b10c5 cd9660: Apply the file and directory mode masks bits to all 12 access bits (cherry picked from commit dde3a7e15be175e8b733cfc42bbb2a2c15810311) M sbin/mount_cd9660/mount_cd9660.8 ____________________________________________________________________________________________________________ Commit: 9263f003185035cf286eb0257c1fea9f703c5f93 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9263f003185035cf286eb0257c1fea9f703c5f93 Author: John Baldwin (Fri 6 Dec 2024 22:40:35 GMT) Committer: John Baldwin (Fri 27 Dec 2024 15:51:01 GMT) cd9660: Apply the file and directory mode masks bits to all 12 access bits This permits the mask bits to control the upper 3 bits used for setuid, setgid, and sticky permissions. While here, clarify the manpage language as non-Rockridge volumes with extended attributes can also supply users and groups along with permissions. Reviewed by: olce Fixes: 82f2275b73e5 cd9660: Add support for mask,dirmask,uid,gid options Differential Revision: https://reviews.freebsd.org/D47357 (cherry picked from commit c1ad5b4b10c5e426d3d782b7216a038187419a1e) M sbin/mount_cd9660/mount_cd9660.8 M sys/fs/cd9660/cd9660_vfsops.c ____________________________________________________________________________________________________________ Commit: 8b82dcb87ebae3c712b6af5bb455b32fc901bd36 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8b82dcb87ebae3c712b6af5bb455b32fc901bd36 Author: Yoshiaki Kasahara (Fri 6 Dec 2024 18:27:32 GMT) Committer: John Baldwin (Fri 27 Dec 2024 15:50:16 GMT) find: Re-enable the -acl primary on FreeBSD This was made conditional to support cross-builds, but the relevant header wasn't included so it was never enabled for native builds. PR: 278124 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278124 ) Fixes: c3a6ea5ba6b5 Allow compiling usr.bin/find on Linux and Mac (cherry picked from commit 984add354edef8a6b4983a33f89ff62532a1556b) M usr.bin/find/option.c ____________________________________________________________________________________________________________ Commit: 7c4be554f72adb4bc008aa71c269801c10012d77 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7c4be554f72adb4bc008aa71c269801c10012d77 Author: Graham Percival (Sun 6 Oct 2024 23:57:45 BST) Committer: John Baldwin (Fri 27 Dec 2024 15:49:31 GMT) fgets.3: document gets_s() __STDC_WANT_LIB_EXT1__ This matches the man page for qsort_s(). PR: 281828 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281828 ) Signed-off-by: Graham Percival Sponsored by: Tarsnap Backup Inc. (cherry picked from commit d0a3fd34a05794bc5cbf48709001a78e9f85169a) M lib/libc/stdio/fgets.3 ____________________________________________________________________________________________________________ Commit: 269e5e7dcbe494beeb2c96badd04737dbfaec0a7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=269e5e7dcbe494beeb2c96badd04737dbfaec0a7 Author: John Baldwin (Wed 4 Dec 2024 14:11:19 GMT) Committer: John Baldwin (Fri 27 Dec 2024 15:47:25 GMT) procctl.2: Editing pass - Add some missing .Pp macros after the end of literal blocks and some lists to ensure there is a blank line before the following text. - Use an indent of Ds for nested lists to reduce excessive indentation and make the bodies of the nested list items easier to read. - Various and sundry rewordings and clarifications. Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D47782 (cherry picked from commit 8277c790179304159c2e4dcb1d99552518d5be8e) M lib/libc/sys/procctl.2 ____________________________________________________________________________________________________________ Commit: 0d17ac9c22028eee7121b25a7039ecec7dbc47f0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0d17ac9c22028eee7121b25a7039ecec7dbc47f0 Author: Graham Percival (Thu 12 Sep 2024 17:36:42 BST) Committer: John Baldwin (Fri 27 Dec 2024 15:47:13 GMT) manuals: Misc macro typos These were reported by `mandoc -T lint` as ERROR: skipping unknown macro When these pages were rendered with `man`, the "unknown macro" meant that the entire line was omitted from the output. Obvious typos in: lib/libsys/swapon.2 lib/libsys/procctl.2 share/man/man9/firmware.9 lib/libcasper/services/cap_net/cap_net.3: 'mode' describes a function argument. lib/libsys/statfs.2: there's no .Tm command ("trademark?"), and .Tn ("tradename") is deprecated, so remove the macro entirely. usr.sbin/mfiutil/mfiutil.8: man was interpreting '/dev/' as a macro (which it didn't recognize). share/man/man4/qat.4: same issue as above, but with '0'. In this case, given the context of the previous line, rewriting as "Value '0'" seemed more appropriate. usr.sbin/mlx5tool/mlx5tool.8: typo in .Xr Signed-off-by: Graham Percival Sponsored by: Tarsnap Backup Inc. Reviewed by: concussious, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1417 (cherry picked from commit 2878d99dfcfbdd7a415a7f31cf95fbd53fc8e581) M lib/libc/sys/procctl.2 M lib/libc/sys/statfs.2 M lib/libc/sys/swapon.2 M lib/libcasper/services/cap_net/cap_net.3 M usr.sbin/mlx5tool/mlx5tool.8 ____________________________________________________________________________________________________________ Commit: 3aaa2a2694cd26a1706c42465d8a3c96ffd68013 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3aaa2a2694cd26a1706c42465d8a3c96ffd68013 Author: Graham Percival (Fri 20 Sep 2024 02:54:39 BST) Committer: John Baldwin (Fri 27 Dec 2024 15:46:45 GMT) manuals: Fix errors in .2 pages These were reported by `mandoc -T lint ...` as errors. fhlink.2, fhreadlink.2: remove unneeded block closing. getfh.2, procctl.2: add necessary block closing. ptrace.2: -width only takes one argument. swapon.2: and weren't being displayed, because .It is for a list item whereas .In is for included files. Also, we want a blank line between headers and the other one. Signed-off-by: Graham Percival PR: 281597 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281597 ) Reviewed by: mhorne Sponsored by: Tarsnap Backup Inc. (cherry picked from commit 650056363baddb83c61c85b0539ee536f3d4b56c) M lib/libc/sys/fhlink.2 M lib/libc/sys/fhreadlink.2 M lib/libc/sys/getfh.2 M lib/libc/sys/procctl.2 M lib/libc/sys/ptrace.2 M lib/libc/sys/swapon.2 ____________________________________________________________________________________________________________ Commit: feb545cb01502259b653cb46c77febd48fdd721b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=feb545cb01502259b653cb46c77febd48fdd721b Author: John Baldwin (Mon 25 Nov 2024 20:16:09 GMT) Committer: John Baldwin (Fri 27 Dec 2024 15:35:44 GMT) ccr(4): Belatedly bump .Dd for prior commit Pointy hat to: jhb (cherry picked from commit bf06074106cf80564e1137b0f6ad0eb923baca55) M share/man/man4/ccr.4 ____________________________________________________________________________________________________________ Commit: a561352557b165df98faa9f9bfbfbbf81c0c3ed3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a561352557b165df98faa9f9bfbfbbf81c0c3ed3 Author: John Baldwin (Mon 25 Nov 2024 19:59:36 GMT) Committer: John Baldwin (Fri 27 Dec 2024 15:35:33 GMT) ccr(4): Mention geli(4) and ktls(4) as other consumers Cross reference crypto(7) and crypto(9) as well. Sponsored by: Chelsio Communications (cherry picked from commit 370ad2d36789dd565b87dcd0bec6964e3d15c71a) M share/man/man4/ccr.4 ____________________________________________________________________________________________________________ Commit: fd8dadbe222a1ce3b49cf50a1e66b4f0b2e6c25a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fd8dadbe222a1ce3b49cf50a1e66b4f0b2e6c25a Author: Kristof Provost (Tue 3 Dec 2024 18:27:49 GMT) Committer: Kristof Provost (Tue 24 Dec 2024 10:19:27 GMT) pf: fix potential NULL dereference in SCTP multihome handling When processing an SCTP ASCONF we re-run the rules processing to check if the new state should be allowed as well. We used to do so against the 'all' interface, to allow new connections to use any interface. This is problematic for two reasons, the first being it may unexpectedly bypass interface restrictions. The more important one is that it can trigger panics. If the ruleset contains a rule which filters on interface group we'd attempt to process the group list for the 'all' interface. As this isn't a real interface it doesn't have an associated struct ifnet, and we end up dereferencing a NULL pointer. Solve this by not overriding the interface, instead leaving the physical interface the SCTP ASCONF arrived on. This implies that we may end up binding to that interface (if if-bound), and thus denying traffic on other interfaces. Users can allow this anyway by setting 'state-policy floating' on the relevant SCTP rules. This arguably better reflects user intent as well. That is, we'll consider SCTP multihomed states to be floating if we're in floating mode, and if-bound if we're if-bound. Update the test cases to account for this, while adding a "pass on lo" (i.e. pass on an interface group") rule to provoke this issue. Add separate test cases for the floating and if-bound scenarios. Reported by: Franco Fichtner MFC after: 3 weeks Sponsored by: Orange Business Services (cherry picked from commit c22c9879845653abb365e468daaa621e3f8f767a) M sys/netpfil/pf/pf.c M sys/netpfil/pf/pf_if.c M tests/sys/netpfil/pf/sctp.py ____________________________________________________________________________________________________________ Commit: 3fa5d13c5be01da5796e0f3617d6da277cc16432 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3fa5d13c5be01da5796e0f3617d6da277cc16432 Author: Leonid Evdokimov (Fri 6 Dec 2024 12:08:54 GMT) Committer: Kristof Provost (Tue 24 Dec 2024 10:16:50 GMT) pfctl: add -T `reset` to touch pfras_tzero only for non-zero entries This will make it easier for scripts to detect idle hosts in tables. PR: 282984 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282984 ) Reviewed by: kp MFC after: 2 weeks (cherry picked from commit 5b59b0c61e29f684a019afdd2848ffe2d5604e0c) M sbin/pfctl/pfctl.8 M sbin/pfctl/pfctl.c M sbin/pfctl/pfctl_radix.c M sbin/pfctl/pfctl_table.c M tests/sys/netpfil/pf/table.sh ____________________________________________________________________________________________________________ Commit: 4c6d5d444b1557d45721319ccd05f667cd55e514 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4c6d5d444b1557d45721319ccd05f667cd55e514 Author: Kevin Bowling (Tue 3 Dec 2024 00:43:17 GMT) Committer: Kevin Bowling (Mon 23 Dec 2024 22:01:58 GMT) igc.4: Add I226 and other additions to supported list (cherry picked from commit 850f78d5a191d0058fcd20beb8b1309b795ecdbd) M share/man/man4/igc.4 M sys/dev/igc/if_igc.c ____________________________________________________________________________________________________________ Commit: 37d6a8531bbf026d9ec54869893c4f6e485208bd URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=37d6a8531bbf026d9ec54869893c4f6e485208bd Author: Sergey A. Osokin (Fri 20 Dec 2024 02:10:59 GMT) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:47:39 GMT) bsd-family-tree: add NetBSD 10.1 (cherry picked from commit c4ca1d214f9a3d20e9381233314a57526ac9b515) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: 0a5dea714e94bbe78b4303d1ce10e63e3aca9bfc URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0a5dea714e94bbe78b4303d1ce10e63e3aca9bfc Author: Maxim Konovalov (Wed 11 Dec 2024 19:31:25 GMT) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:47:23 GMT) bsd-family-tree: add FreeBSD 14.2 (cherry picked from commit ac3dedf4e8e08647a2c08e75f1ef69d8bb2831e6) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: a4f31ef63a3b3b8b0be675184824a64f5318ccea URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a4f31ef63a3b3b8b0be675184824a64f5318ccea Author: Sergey A. Osokin (Wed 16 Oct 2024 01:52:01 BST) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:47:02 GMT) bsd-family-tree: add macOS 15 While I'm here fix whitespaces for recent OpenBSD releases. (cherry picked from commit bdbf50660c51534d7a25569349bcdf2d4e460f50) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: 9e3d32b872f80894cbb6b7b9367a30bba883ecd9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9e3d32b872f80894cbb6b7b9367a30bba883ecd9 Author: Maxim Konovalov (Mon 7 Oct 2024 22:16:19 BST) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:46:40 GMT) bsd-family-tree: FreeBSD 13.4 and OpenBSD 7.6 added (cherry picked from commit 3ebb738a93139fd2f8826a62b5f282480f2e19d5) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: 8377ba3eac4eb86a54ba36809bb152e18271237e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8377ba3eac4eb86a54ba36809bb152e18271237e Author: Maxim Konovalov (Thu 22 Aug 2024 01:29:36 BST) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:46:17 GMT) bsd-family-tree: NetBSD 8.3 added PR: 280983 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280983 ) (cherry picked from commit d399c791b223953d230423eff1d56fb45a1be77c) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: cd4f81363f68e8991e22518fb997d3fe24282a99 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cd4f81363f68e8991e22518fb997d3fe24282a99 Author: Wolfram Schneider (Tue 20 Aug 2024 15:35:29 BST) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:45:51 GMT) bsd-family-tree: fix macOS 11 release date (cherry picked from commit b49aec04f073de02b03b44503feffeb52cbbdd51) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: f971735d62ad44879af869e72aed50fc44ab9d4e URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f971735d62ad44879af869e72aed50fc44ab9d4e Author: Wolfram Schneider (Tue 20 Aug 2024 14:29:18 BST) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:45:27 GMT) bsd-family-tree: shorter URLs (cherry picked from commit d4a4d1e742852b00427f723f59534b42718628de) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: 5352a50c8003693f976c9888b8bcfb0fc19e7d06 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=5352a50c8003693f976c9888b8bcfb0fc19e7d06 Author: Wolfram Schneider (Tue 20 Aug 2024 14:26:46 BST) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:45:01 GMT) bsd-family-tree: add NetBSD 9.4 (cherry picked from commit d1e78fbd4a67245e058e9d26b333216093f8d2d1) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: 7a2fc78571c5ecbc697009b6f18cc123734df78c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=7a2fc78571c5ecbc697009b6f18cc123734df78c Author: Wolfram Schneider (Mon 19 Aug 2024 20:40:34 BST) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:43:38 GMT) bsd-family-tree: add FreeBSD Documentation Archive (cherry picked from commit 4132c4be4c0a4b80a4ef6f4b8ff0d8ac9a3b9939) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: 57507a2408713f67238c38a28053e493540ace2b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=57507a2408713f67238c38a28053e493540ace2b Author: Wolfram Schneider (Mon 19 Aug 2024 20:32:51 BST) Committer: Sergey A. Osokin (Mon 23 Dec 2024 15:43:05 GMT) bsd-family-tree: shorter URL for FreeBSD manual pages (cherry picked from commit 2a916499470ae35178ca218e68175478037c3b0a) M share/misc/bsd-family-tree ____________________________________________________________________________________________________________ Commit: d353c342a12cd346c79c074660709657f7a741ef URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d353c342a12cd346c79c074660709657f7a741ef Author: Alexander Motin (Mon 9 Dec 2024 16:52:26 GMT) Committer: Alexander Motin (Mon 23 Dec 2024 14:34:50 GMT) isp: Improve task aborts handling - When handling notify acknowledge from target code for task abort request, not only send abort to the firmware, but also delete the ATIO private data associated with the command. It is required for proper tag reuse, allowing new "conflicting" commands to be passed to the target. CTL was already fixed to handle that right, instead of delaying them in restart queue of the driver. - When target finally aborts the command (which it should have done before the notify ack) we should not send another abort to the firmware. Since we already sent the abort and deleted ATIO private data above, just return successful completion here, doing nothing. Since the tag can be reused by that time, we can not rely on its uniqueness, so when searching to the ATIO private data compare also the aborted CCB pointer in addition to the tag. - Fix BA_RJT sending in isp_acknak_abts(). While it should be rare, teach the code to send error responses for ABTS requests. MFC after: 2 weeks (cherry picked from commit ec3175fc3b2c1b07144a85e6a3e2fe534acc0c87) M sys/dev/isp/isp_freebsd.c M sys/dev/isp/isp_freebsd.h M sys/dev/isp/isp_target.c ____________________________________________________________________________________________________________ Commit: 36abbfe061dfa56723f2eb3d6942d0407dfcd3a1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=36abbfe061dfa56723f2eb3d6942d0407dfcd3a1 Author: Alexander Motin (Mon 9 Dec 2024 16:47:03 GMT) Committer: Alexander Motin (Mon 23 Dec 2024 14:34:50 GMT) isp: Fix use after free in aborts handling When aborting command waiting in restart queue remove it from the queue before freeing it. This should fix NULL dereference panics we saw on some very busy system. MFC after: 2 weeks (cherry picked from commit 40fb1b8bc1cf452d83edc5b25bc1d8bd13c0e72d) M sys/dev/isp/isp_freebsd.c ____________________________________________________________________________________________________________ Commit: 4f20dec1bf177408ef04969e5ac0f3523cd6df07 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4f20dec1bf177408ef04969e5ac0f3523cd6df07 Author: Ricardo Branco (Wed 3 Jan 2024 20:32:47 GMT) Committer: Xin LI (Sun 22 Dec 2024 07:49:51 GMT) MFC: tail: Do not trust st_size if it equals zero. PR: bin/276107 (cherry picked from commit 1fb3caee72241b9b4dacbfb0109c972a86d4401f) M usr.bin/tail/forward.c ____________________________________________________________________________________________________________ Commit: ff99541a14d7b8cf85e93774e939efde38a469b9 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ff99541a14d7b8cf85e93774e939efde38a469b9 Author: Ricardo Branco (Wed 3 Jan 2024 20:17:58 GMT) Committer: Xin LI (Sun 22 Dec 2024 07:49:50 GMT) MFC: hexdump: Do not trust st_size if it equals zero. PR: bin/276106 (cherry picked from commit e23954bd42fe4331b67ba8f6446bcccf751096f1) M usr.bin/hexdump/display.c ____________________________________________________________________________________________________________ Commit: eed6d080a74f9f74e367a9178b2764780724518c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eed6d080a74f9f74e367a9178b2764780724518c Author: Xin LI (Mon 9 Dec 2024 04:50:00 GMT) Committer: Xin LI (Sun 22 Dec 2024 07:47:24 GMT) MFC: MFV: less v668. (cherry picked from commit c77c488926555ca344ae3a417544cf7a720e1de1) M contrib/less/LICENSE M contrib/less/NEWS M contrib/less/brac.c M contrib/less/ch.c M contrib/less/charset.c M contrib/less/charset.h M contrib/less/cmd.h M contrib/less/cmdbuf.c M contrib/less/command.c M contrib/less/compose.uni M contrib/less/cvt.c M contrib/less/decode.c M contrib/less/edit.c A contrib/less/evar.c M contrib/less/filename.c M contrib/less/fmt.uni M contrib/less/forwback.c M contrib/less/funcs.h M contrib/less/help.c M contrib/less/ifile.c M contrib/less/input.c M contrib/less/jump.c A contrib/less/lang.h M contrib/less/less.h M contrib/less/less.hlp M contrib/less/less.nro M contrib/less/lessecho.c M contrib/less/lessecho.nro M contrib/less/lesskey.c M contrib/less/lesskey.h M contrib/less/lesskey.nro M contrib/less/lesskey_parse.c M contrib/less/lglob.h M contrib/less/line.c M contrib/less/linenum.c M contrib/less/lsystem.c M contrib/less/main.c M contrib/less/mark.c M contrib/less/optfunc.c M contrib/less/option.c M contrib/less/option.h M contrib/less/opttbl.c M contrib/less/os.c M contrib/less/output.c M contrib/less/pattern.c M contrib/less/pattern.h M contrib/less/pckeys.h M contrib/less/position.c M contrib/less/position.h M contrib/less/prompt.c M contrib/less/regexp.c M contrib/less/regexp.h M contrib/less/screen.c M contrib/less/scrsize.c M contrib/less/search.c M contrib/less/signal.c M contrib/less/tags.c M contrib/less/ttyin.c M contrib/less/ubin.uni M contrib/less/version.c M contrib/less/wide.uni M contrib/less/xbuf.c M contrib/less/xbuf.h M usr.bin/less/Makefile M usr.bin/less/defines.h ____________________________________________________________________________________________________________ Commit: 3d46113d21963d4236506f7c8e9c476b1f4aa512 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3d46113d21963d4236506f7c8e9c476b1f4aa512 Author: Xin LI (Mon 9 Dec 2024 04:24:16 GMT) Committer: Xin LI (Sun 22 Dec 2024 07:46:25 GMT) MFC: MFV: expat 2.6.4. (cherry picked from commit 908f215e80fa482aa953c39afa6bb516f561fc00) M contrib/expat/Changes M contrib/expat/README.md M contrib/expat/configure.ac M contrib/expat/doc/reference.html M contrib/expat/doc/xmlwf.1 M contrib/expat/doc/xmlwf.xml M contrib/expat/examples/element_declarations.c M contrib/expat/lib/expat.h M contrib/expat/lib/xmlparse.c M contrib/expat/tests/basic_tests.c M contrib/expat/tests/common.c M contrib/expat/tests/common.h M contrib/expat/tests/handlers.c M contrib/expat/tests/handlers.h M contrib/expat/tests/misc_tests.c M contrib/expat/xmlwf/xmlfile.c M lib/libexpat/Makefile M lib/libexpat/expat_config.h M lib/libexpat/libbsdxml.3 ____________________________________________________________________________________________________________ Commit: eab7ed2ec2af6307842abcc94c11743a1058bd11 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=eab7ed2ec2af6307842abcc94c11743a1058bd11 Author: Enji Cooper (Wed 2 Oct 2024 03:26:37 BST) Committer: Xin LI (Sun 22 Dec 2024 07:46:25 GMT) MFC: Update the expat version referenced in libbsdxml.3 This change updates the version of expat referenced from 2.6.0 to 2.6.3, correcting documentation post-ffd294a1f4c23863c3e515d16dce31d5509bcb01. Bump .Dd for the change. MFC with: ffd294a1f4c23863c3e515d16dce31d5509bcb01 Differential Revision: https://reviews.freebsd.org/D46865 (cherry picked from commit ba23ab2168ffabc2c5e647a1a37ab9a8fb482bb8) M lib/libexpat/libbsdxml.3 ____________________________________________________________________________________________________________ Commit: bab279022ba2bed4f216924b3b5fdfc60ced364c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=bab279022ba2bed4f216924b3b5fdfc60ced364c Author: Enji Cooper (Sat 28 Sep 2024 15:19:59 BST) Committer: Xin LI (Sun 22 Dec 2024 07:46:24 GMT) MFC: MFV: expat 2.6.3 The 2.6.1 - 2.6.3 releases address several security issues with the library. The release notes for the 2.6.1-2.6.3 releases can be found at https://github.com/libexpat/libexpat/blob/R_2_6_3/expat/Changes . Differential Revision: https://reviews.freebsd.org/D46829 Merge commit '8e1eae2319cd3a651941c88b46d95e8ee8507c6c' (cherry picked from commit ffd294a1f4c23863c3e515d16dce31d5509bcb01) M contrib/expat/Changes M contrib/expat/FREEBSD-Xlist M contrib/expat/Makefile.am M contrib/expat/Makefile.in M contrib/expat/README.md M contrib/expat/buildconf.sh M contrib/expat/configure.ac M contrib/expat/doc/Makefile.am M contrib/expat/doc/Makefile.in M contrib/expat/doc/reference.html M contrib/expat/doc/xmlwf.1 M contrib/expat/doc/xmlwf.xml M contrib/expat/examples/Makefile.in M contrib/expat/expat_config.h.in M contrib/expat/fix-xmltest-log.sh M contrib/expat/lib/Makefile.am M contrib/expat/lib/Makefile.in M contrib/expat/lib/expat.h M contrib/expat/lib/internal.h M contrib/expat/lib/siphash.h M contrib/expat/lib/xmlparse.c M contrib/expat/tests/Makefile.am M contrib/expat/tests/Makefile.in A contrib/expat/tests/README.md D contrib/expat/tests/README.txt M contrib/expat/tests/acc_tests.c M contrib/expat/tests/basic_tests.c M contrib/expat/tests/benchmark/Makefile.in M contrib/expat/tests/misc_tests.c M contrib/expat/xmlwf/Makefile.in ____________________________________________________________________________________________________________ Commit: dcb4ac96fcf69b5c95e36284a1b679dac51d51c6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=dcb4ac96fcf69b5c95e36284a1b679dac51d51c6 Author: Xin LI (Sun 8 Dec 2024 19:07:01 GMT) Committer: Xin LI (Sun 22 Dec 2024 07:40:01 GMT) MFC: MFV: file 5.46. (cherry picked from commit ae316d1d1cffd71ab7751f94e10118777a88e027) M contrib/file/ChangeLog M contrib/file/Makefile.in M contrib/file/aclocal.m4 M contrib/file/config.h.in M contrib/file/configure M contrib/file/configure.ac M contrib/file/doc/Makefile.in M contrib/file/doc/file.man M contrib/file/doc/libmagic.man M contrib/file/doc/magic.man M contrib/file/ltmain.sh M contrib/file/m4/libtool.m4 M contrib/file/m4/ltoptions.m4 M contrib/file/m4/ltsugar.m4 M contrib/file/m4/ltversion.m4 M contrib/file/m4/lt~obsolete.m4 M contrib/file/magic/Magdir/acorn M contrib/file/magic/Magdir/adventure M contrib/file/magic/Magdir/algol68 M contrib/file/magic/Magdir/android M contrib/file/magic/Magdir/animation M contrib/file/magic/Magdir/apple M contrib/file/magic/Magdir/archive M contrib/file/magic/Magdir/aria M contrib/file/magic/Magdir/arm M contrib/file/magic/Magdir/asf M contrib/file/magic/Magdir/audio M contrib/file/magic/Magdir/ber M contrib/file/magic/Magdir/biosig M contrib/file/magic/Magdir/bsdi M contrib/file/magic/Magdir/c64 M contrib/file/magic/Magdir/cafebabe M contrib/file/magic/Magdir/cbor M contrib/file/magic/Magdir/claris M contrib/file/magic/Magdir/coff M contrib/file/magic/Magdir/commands M contrib/file/magic/Magdir/compress M contrib/file/magic/Magdir/console M contrib/file/magic/Magdir/ctf M contrib/file/magic/Magdir/database M contrib/file/magic/Magdir/dataone M contrib/file/magic/Magdir/diff M contrib/file/magic/Magdir/digital M contrib/file/magic/Magdir/efi M contrib/file/magic/Magdir/elf M contrib/file/magic/Magdir/epoc M contrib/file/magic/Magdir/espressif M contrib/file/magic/Magdir/filesystems M contrib/file/magic/Magdir/firmware M contrib/file/magic/Magdir/fonts M contrib/file/magic/Magdir/frame M contrib/file/magic/Magdir/games M contrib/file/magic/Magdir/gentoo M contrib/file/magic/Magdir/geo M contrib/file/magic/Magdir/geos M contrib/file/magic/Magdir/hitachi-sh M contrib/file/magic/Magdir/hp M contrib/file/magic/Magdir/ibm370 M contrib/file/magic/Magdir/ibm6000 M contrib/file/magic/Magdir/iff M contrib/file/magic/Magdir/images M contrib/file/magic/Magdir/ispell M contrib/file/magic/Magdir/javascript M contrib/file/magic/Magdir/jpeg A contrib/file/magic/Magdir/keyman M contrib/file/magic/Magdir/lammps A contrib/file/magic/Magdir/lauterbach M contrib/file/magic/Magdir/linux M contrib/file/magic/Magdir/lisp M contrib/file/magic/Magdir/magic M contrib/file/magic/Magdir/mail.news M contrib/file/magic/Magdir/map M contrib/file/magic/Magdir/meteorological M contrib/file/magic/Magdir/mips M contrib/file/magic/Magdir/mmdf M contrib/file/magic/Magdir/motorola M contrib/file/magic/Magdir/msdos M contrib/file/magic/Magdir/msooxml M contrib/file/magic/Magdir/msvc M contrib/file/magic/Magdir/msx M contrib/file/magic/Magdir/music M contrib/file/magic/Magdir/nasa M contrib/file/magic/Magdir/ole2compounddocs M contrib/file/magic/Magdir/olf A contrib/file/magic/Magdir/pack D contrib/file/magic/Magdir/pc88 M contrib/file/magic/Magdir/pdp M contrib/file/magic/Magdir/pgp M contrib/file/magic/Magdir/plan9 M contrib/file/magic/Magdir/printer M contrib/file/magic/Magdir/python M contrib/file/magic/Magdir/revision M contrib/file/magic/Magdir/riff M contrib/file/magic/Magdir/rpm M contrib/file/magic/Magdir/sgml M contrib/file/magic/Magdir/sharc M contrib/file/magic/Magdir/sniffer M contrib/file/magic/Magdir/sql M contrib/file/magic/Magdir/ssh M contrib/file/magic/Magdir/ssl M contrib/file/magic/Magdir/sun M contrib/file/magic/Magdir/symbos M contrib/file/magic/Magdir/terminfo M contrib/file/magic/Magdir/uf2 A contrib/file/magic/Magdir/uxn M contrib/file/magic/Magdir/varied.script M contrib/file/magic/Magdir/vax M contrib/file/magic/Magdir/virtual M contrib/file/magic/Magdir/weak M contrib/file/magic/Magdir/windows M contrib/file/magic/Magdir/wordprocessors M contrib/file/magic/Magdir/xenix M contrib/file/magic/Magdir/xilinx M contrib/file/magic/Magdir/yara M contrib/file/magic/Makefile.am M contrib/file/magic/Makefile.in M contrib/file/python/Makefile.in M contrib/file/src/Makefile.in M contrib/file/src/apprentice.c M contrib/file/src/cdf.c M contrib/file/src/cdf.h M contrib/file/src/cdf_time.c M contrib/file/src/compress.c M contrib/file/src/der.c M contrib/file/src/der.h M contrib/file/src/encoding.c M contrib/file/src/file.c M contrib/file/src/file.h M contrib/file/src/funcs.c M contrib/file/src/is_csv.c M contrib/file/src/magic.c M contrib/file/src/magic.h.in M contrib/file/src/mygetopt.h M contrib/file/src/print.c M contrib/file/src/readelf.c M contrib/file/src/readelf.h M contrib/file/src/seccomp.c M contrib/file/src/softmagic.c M contrib/file/tests/Makefile.am M contrib/file/tests/Makefile.in A contrib/file/tests/keyman-0.result A contrib/file/tests/keyman-0.testfile A contrib/file/tests/keyman-1.result A contrib/file/tests/keyman-1.testfile A contrib/file/tests/keyman-2.result A contrib/file/tests/keyman-2.testfile M contrib/file/tests/multiple.result A contrib/file/tests/rpm-v3.0-bin-aarch64.result A contrib/file/tests/rpm-v3.0-bin-aarch64.testfile A contrib/file/tests/rpm-v3.0-bin-powerpc64.result A contrib/file/tests/rpm-v3.0-bin-powerpc64.testfile A contrib/file/tests/rpm-v3.0-bin-s390x.result A contrib/file/tests/rpm-v3.0-bin-s390x.testfile A contrib/file/tests/rpm-v3.0-bin-x86_64.result A contrib/file/tests/rpm-v3.0-bin-x86_64.testfile A contrib/file/tests/rpm-v3.0-src.result A contrib/file/tests/rpm-v3.0-src.testfile A contrib/file/tests/searchbug.magic A contrib/file/tests/searchbug.result A contrib/file/tests/searchbug.testfile M contrib/file/tests/uf2.result A contrib/file/tests/utf16xmlsvg.result A contrib/file/tests/utf16xmlsvg.testfile M lib/libmagic/config.h ____________________________________________________________________________________________________________ Commit: 0826d4b6c4f1580c4fd749e62a171934c0995f0c URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=0826d4b6c4f1580c4fd749e62a171934c0995f0c Author: Jose Luis Duran (Mon 9 Oct 2023 05:52:53 BST) Committer: Xin LI (Sun 22 Dec 2024 07:40:00 GMT) (upstream) PR/386: Add newlines for consitency 2 Obtained from: https://github.com/file/file/pull/134/ (cherry picked from commit 3347078000c078f2e67214ef1ba2e0bffe1aea4f) M contrib/file/tests/bcachefs2.result ____________________________________________________________________________________________________________ Commit: 2d54b1f5e5a8a29399e8fd131ef83fd0f4b8220d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=2d54b1f5e5a8a29399e8fd131ef83fd0f4b8220d Author: Jose Luis Duran (Sat 7 Oct 2023 13:47:29 BST) Committer: Xin LI (Sun 22 Dec 2024 07:39:59 GMT) file_test: Fix file test Trimming of the line feed is no longer necessary after https://github.com/file/file/commit/d993c6b0db20711b2c4cb9d2bee8c7f2e59b0a43 Currently the tests: - bcachefs2 - gpkg-1-zst - multiple are failing, but a fix will be committed upstream. This also reverts c5e957ad4 "file: fix test case for gpkg by removing the extra \n." MFC after: 3 days (cherry picked from commit 0d3a87569f14b0e48826bbaab5e05f35669bcebf) M contrib/file/tests/gpkg-1-zst.result M usr.bin/file/tests/file_test.sh ____________________________________________________________________________________________________________ Commit: 90222d7fa4bbf6dd9c57d4330c36b8733cf48ba0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=90222d7fa4bbf6dd9c57d4330c36b8733cf48ba0 Author: Xin LI (Sun 10 Sep 2023 20:20:33 BST) Committer: Xin LI (Sun 22 Dec 2024 07:39:59 GMT) MFC: MFV: file 5.45. (cherry picked from commit 898496ee09ed2b7d25f6807edc4515628196ec0a) Disable byteswap.h for now. (cherry picked from commit 90474518912f5e5f49bc5325b7f88e94eba64d6a) M contrib/file/ChangeLog M contrib/file/README.md M contrib/file/acinclude.m4 M contrib/file/config.guess M contrib/file/config.h.in M contrib/file/config.sub M contrib/file/configure M contrib/file/configure.ac M contrib/file/doc/file.man M contrib/file/doc/libmagic.man M contrib/file/doc/magic.man M contrib/file/libmagic.pc.in M contrib/file/magic/Magdir/algol68 M contrib/file/magic/Magdir/android M contrib/file/magic/Magdir/animation M contrib/file/magic/Magdir/apple M contrib/file/magic/Magdir/archive M contrib/file/magic/Magdir/arm M contrib/file/magic/Magdir/asf M contrib/file/magic/Magdir/audio M contrib/file/magic/Magdir/blender M contrib/file/magic/Magdir/bytecode M contrib/file/magic/Magdir/c-lang M contrib/file/magic/Magdir/c64 M contrib/file/magic/Magdir/cad M contrib/file/magic/Magdir/coff M contrib/file/magic/Magdir/commands M contrib/file/magic/Magdir/compress M contrib/file/magic/Magdir/console M contrib/file/magic/Magdir/crypto M contrib/file/magic/Magdir/database M contrib/file/magic/Magdir/der D contrib/file/magic/Magdir/dsf A contrib/file/magic/Magdir/dwarfs M contrib/file/magic/Magdir/elf M contrib/file/magic/Magdir/filesystems A contrib/file/magic/Magdir/firmware M contrib/file/magic/Magdir/games M contrib/file/magic/Magdir/gentoo M contrib/file/magic/Magdir/geo M contrib/file/magic/Magdir/images M contrib/file/magic/Magdir/intel M contrib/file/magic/Magdir/java M contrib/file/magic/Magdir/javascript M contrib/file/magic/Magdir/jpeg M contrib/file/magic/Magdir/lif M contrib/file/magic/Magdir/linux M contrib/file/magic/Magdir/llvm M contrib/file/magic/Magdir/macintosh M contrib/file/magic/Magdir/magic M contrib/file/magic/Magdir/mail.news M contrib/file/magic/Magdir/map M contrib/file/magic/Magdir/mathematica M contrib/file/magic/Magdir/meteorological M contrib/file/magic/Magdir/misctools M contrib/file/magic/Magdir/modem M contrib/file/magic/Magdir/msdos M contrib/file/magic/Magdir/msooxml M contrib/file/magic/Magdir/ole2compounddocs M contrib/file/magic/Magdir/pdf M contrib/file/magic/Magdir/perl A contrib/file/magic/Magdir/playdate M contrib/file/magic/Magdir/printer M contrib/file/magic/Magdir/qt M contrib/file/magic/Magdir/rst A contrib/file/magic/Magdir/rust M contrib/file/magic/Magdir/scientific M contrib/file/magic/Magdir/sendmail M contrib/file/magic/Magdir/sgml M contrib/file/magic/Magdir/sniffer M contrib/file/magic/Magdir/softquad M contrib/file/magic/Magdir/spectrum M contrib/file/magic/Magdir/sql M contrib/file/magic/Magdir/ssh A contrib/file/magic/Magdir/svf M contrib/file/magic/Magdir/sysex M contrib/file/magic/Magdir/terminfo M contrib/file/magic/Magdir/tex M contrib/file/magic/Magdir/tplink M contrib/file/magic/Magdir/troff M contrib/file/magic/Magdir/uterus M contrib/file/magic/Magdir/varied.script M contrib/file/magic/Magdir/web M contrib/file/magic/Magdir/windows M contrib/file/magic/Magdir/wordprocessors M contrib/file/magic/Magdir/xenix M contrib/file/magic/Magdir/xilinx M contrib/file/magic/Makefile.am M contrib/file/magic/Makefile.in M contrib/file/src/Makefile.am M contrib/file/src/Makefile.in M contrib/file/src/apprentice.c M contrib/file/src/apptype.c M contrib/file/src/ascmagic.c M contrib/file/src/asctime_r.c M contrib/file/src/asprintf.c M contrib/file/src/buffer.c M contrib/file/src/cdf.c M contrib/file/src/cdf_time.c M contrib/file/src/compress.c M contrib/file/src/ctime_r.c M contrib/file/src/der.c M contrib/file/src/dprintf.c M contrib/file/src/encoding.c M contrib/file/src/file.c M contrib/file/src/file.h M contrib/file/src/file_opts.h M contrib/file/src/fmtcheck.c M contrib/file/src/fsmagic.c M contrib/file/src/funcs.c M contrib/file/src/getline.c M contrib/file/src/getopt_long.c M contrib/file/src/gmtime_r.c M contrib/file/src/is_csv.c M contrib/file/src/is_json.c A contrib/file/src/is_simh.c M contrib/file/src/is_tar.c M contrib/file/src/localtime_r.c M contrib/file/src/magic.c M contrib/file/src/magic.h.in M contrib/file/src/memtest.c M contrib/file/src/pread.c M contrib/file/src/print.c M contrib/file/src/readcdf.c M contrib/file/src/readelf.c M contrib/file/src/seccomp.c M contrib/file/src/softmagic.c M contrib/file/src/strlcat.c M contrib/file/src/strlcpy.c M contrib/file/src/tar.h M contrib/file/src/vasprintf.c M contrib/file/tests/CVE-2014-1943.result A contrib/file/tests/HWP2016.hwp.result A contrib/file/tests/HWP2016.hwp.testfile A contrib/file/tests/HWP2016.hwpx.zip.result A contrib/file/tests/HWP2016.hwpx.zip.testfile A contrib/file/tests/HWP97.hwp.result A contrib/file/tests/HWP97.hwp.testfile M contrib/file/tests/JW07022A.mp3.result M contrib/file/tests/Makefile.am M contrib/file/tests/Makefile.in M contrib/file/tests/android-vdex-1.result M contrib/file/tests/android-vdex-2.result M contrib/file/tests/arj.result M contrib/file/tests/bcachefs.result A contrib/file/tests/bcachefs2.result A contrib/file/tests/bcachefs2.testfile M contrib/file/tests/cl8m8ocofedso.result A contrib/file/tests/cmd1.result A contrib/file/tests/cmd1.testfile A contrib/file/tests/cmd2.result A contrib/file/tests/cmd2.testfile A contrib/file/tests/cmd3.result A contrib/file/tests/cmd3.testfile A contrib/file/tests/cmd4.result A contrib/file/tests/cmd4.testfile M contrib/file/tests/dsd64-dff.result M contrib/file/tests/dsd64-dsf.result M contrib/file/tests/escapevel.result M contrib/file/tests/ext4.result M contrib/file/tests/fit-map-data.result M contrib/file/tests/gedcom.result M contrib/file/tests/hddrawcopytool.result A contrib/file/tests/hello-racket_rkt.result A contrib/file/tests/hello-racket_rkt.testfile M contrib/file/tests/issue311docx.result M contrib/file/tests/issue359xlsx.result A contrib/file/tests/jpeg-text.result A contrib/file/tests/jpeg-text.testfile M contrib/file/tests/json1.result M contrib/file/tests/json2.result M contrib/file/tests/json3.result M contrib/file/tests/json4.result M contrib/file/tests/json5.result M contrib/file/tests/json6.result M contrib/file/tests/json7.result M contrib/file/tests/json8.result M contrib/file/tests/jsonlines1.result M contrib/file/tests/matilde.arm.result A contrib/file/tests/multiple-A.magic A contrib/file/tests/multiple-B.magic A contrib/file/tests/multiple.flags A contrib/file/tests/multiple.result A contrib/file/tests/multiple.testfile M contrib/file/tests/pcjr.result M contrib/file/tests/pgp-binary-key-v2-phil.result M contrib/file/tests/pgp-binary-key-v3-lutz.result M contrib/file/tests/pgp-binary-key-v4-dsa.result M contrib/file/tests/pgp-binary-key-v4-ecc-no-userid-secret.result M contrib/file/tests/pgp-binary-key-v4-ecc-secret-key.result M contrib/file/tests/pgp-binary-key-v4-rsa-key.result M contrib/file/tests/pgp-binary-key-v4-rsa-no-userid-secret.result M contrib/file/tests/pgp-binary-key-v4-rsa-secret-key.result A contrib/file/tests/pnm1.result A contrib/file/tests/pnm1.testfile A contrib/file/tests/pnm2.result A contrib/file/tests/pnm2.testfile A contrib/file/tests/pnm3.result A contrib/file/tests/pnm3.testfile M contrib/file/tests/regex-eol.result A contrib/file/tests/registry-pol.result A contrib/file/tests/registry-pol.testfile M contrib/file/tests/test.c M contrib/file/tests/uf2.result A contrib/file/tests/xclbin.result A contrib/file/tests/xclbin.testfile M contrib/file/tests/zstd-3-skippable-frames.result M contrib/file/tests/zstd-dictionary-0.result M contrib/file/tests/zstd-dictionary-1.result M contrib/file/tests/zstd-dictionary-2.result M contrib/file/tests/zstd-skippable-frame-0.result M contrib/file/tests/zstd-skippable-frame-4.result M contrib/file/tests/zstd-skippable-frame-8.result M contrib/file/tests/zstd-skippable-frame-C.result M contrib/file/tests/zstd-v0.2-FF.result M contrib/file/tests/zstd-v0.3-FF.result M contrib/file/tests/zstd-v0.4-FF.result M contrib/file/tests/zstd-v0.5-FF.result M contrib/file/tests/zstd-v0.6-FF.result M contrib/file/tests/zstd-v0.7-00.result M contrib/file/tests/zstd-v0.7-21.result M contrib/file/tests/zstd-v0.7-22.result M contrib/file/tests/zstd-v0.8-00.result M contrib/file/tests/zstd-v0.8-01.result M contrib/file/tests/zstd-v0.8-02.result M contrib/file/tests/zstd-v0.8-03.result M contrib/file/tests/zstd-v0.8-16.result M contrib/file/tests/zstd-v0.8-20.result M contrib/file/tests/zstd-v0.8-21.result M contrib/file/tests/zstd-v0.8-22.result M contrib/file/tests/zstd-v0.8-23.result M contrib/file/tests/zstd-v0.8-F4.result M contrib/file/tests/zstd-v0.8-FF.result M lib/libmagic/Makefile M lib/libmagic/config.h ____________________________________________________________________________________________________________ Commit: aa2f56a6ecd6c6320965ac0d1309f737c406c5d2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=aa2f56a6ecd6c6320965ac0d1309f737c406c5d2 Author: Xin LI (Mon 9 Dec 2024 15:20:04 GMT) Committer: Xin LI (Sun 22 Dec 2024 07:36:33 GMT) MFC: MFV: xz 5.6.3 (cherry picked from commit 26743408e9ff53ac0e041407c359ed3c17c15596) M contrib/xz/ChangeLog M contrib/xz/THANKS M contrib/xz/src/common/tuklib_integer.h M contrib/xz/src/liblzma/api/lzma/container.h M contrib/xz/src/liblzma/api/lzma/version.h M contrib/xz/src/liblzma/check/crc32_table.c M contrib/xz/src/liblzma/check/crc_common.h M contrib/xz/src/liblzma/check/crc_x86_clmul.h M contrib/xz/src/liblzma/rangecoder/range_decoder.h M contrib/xz/src/liblzma/simple/arm64.c M contrib/xz/src/lzmainfo/lzmainfo.c M contrib/xz/src/xz/args.c M contrib/xz/src/xz/list.c M contrib/xz/src/xz/mytime.c M contrib/xz/src/xzdec/xzdec.c M lib/liblzma/config.h ____________________________________________________________________________________________________________ Commit: 45230e7f929898c129cd3e842670b0f20685177f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=45230e7f929898c129cd3e842670b0f20685177f Author: Xin LI (Tue 4 Jun 2024 02:14:43 BST) Committer: Xin LI (Sun 22 Dec 2024 07:36:32 GMT) MFC: MFV: xz 5.6.2. (cherry picked from commit 3b35e7ee8de9b0260149a2b77e87a2b9c7a36244) M contrib/xz/AUTHORS M contrib/xz/COPYING A contrib/xz/COPYING.0BSD M contrib/xz/ChangeLog M contrib/xz/README M contrib/xz/THANKS M contrib/xz/TODO M contrib/xz/doxygen/Doxyfile M contrib/xz/doxygen/update-doxygen M contrib/xz/src/common/mythread.h M contrib/xz/src/common/sysdefs.h M contrib/xz/src/common/tuklib_common.h M contrib/xz/src/common/tuklib_config.h M contrib/xz/src/common/tuklib_cpucores.c M contrib/xz/src/common/tuklib_cpucores.h M contrib/xz/src/common/tuklib_exit.c M contrib/xz/src/common/tuklib_exit.h M contrib/xz/src/common/tuklib_gettext.h M contrib/xz/src/common/tuklib_integer.h M contrib/xz/src/common/tuklib_mbstr.h M contrib/xz/src/common/tuklib_mbstr_fw.c M contrib/xz/src/common/tuklib_mbstr_width.c M contrib/xz/src/common/tuklib_open_stdxxx.c M contrib/xz/src/common/tuklib_open_stdxxx.h M contrib/xz/src/common/tuklib_physmem.c M contrib/xz/src/common/tuklib_physmem.h M contrib/xz/src/common/tuklib_progname.c M contrib/xz/src/common/tuklib_progname.h M contrib/xz/src/liblzma/api/lzma.h M contrib/xz/src/liblzma/api/lzma/base.h M contrib/xz/src/liblzma/api/lzma/bcj.h M contrib/xz/src/liblzma/api/lzma/block.h M contrib/xz/src/liblzma/api/lzma/check.h M contrib/xz/src/liblzma/api/lzma/container.h M contrib/xz/src/liblzma/api/lzma/delta.h M contrib/xz/src/liblzma/api/lzma/filter.h M contrib/xz/src/liblzma/api/lzma/hardware.h M contrib/xz/src/liblzma/api/lzma/index.h M contrib/xz/src/liblzma/api/lzma/index_hash.h M contrib/xz/src/liblzma/api/lzma/lzma12.h M contrib/xz/src/liblzma/api/lzma/stream_flags.h M contrib/xz/src/liblzma/api/lzma/version.h M contrib/xz/src/liblzma/api/lzma/vli.h M contrib/xz/src/liblzma/check/check.c M contrib/xz/src/liblzma/check/check.h A contrib/xz/src/liblzma/check/crc32_arm64.h M contrib/xz/src/liblzma/check/crc32_fast.c M contrib/xz/src/liblzma/check/crc32_small.c M contrib/xz/src/liblzma/check/crc32_table.c M contrib/xz/src/liblzma/check/crc32_table_be.h M contrib/xz/src/liblzma/check/crc32_table_le.h M contrib/xz/src/liblzma/check/crc32_tablegen.c M contrib/xz/src/liblzma/check/crc32_x86.S M contrib/xz/src/liblzma/check/crc64_fast.c M contrib/xz/src/liblzma/check/crc64_small.c M contrib/xz/src/liblzma/check/crc64_table.c M contrib/xz/src/liblzma/check/crc64_table_be.h M contrib/xz/src/liblzma/check/crc64_table_le.h M contrib/xz/src/liblzma/check/crc64_tablegen.c M contrib/xz/src/liblzma/check/crc64_x86.S A contrib/xz/src/liblzma/check/crc_common.h D contrib/xz/src/liblzma/check/crc_macros.h A contrib/xz/src/liblzma/check/crc_x86_clmul.h M contrib/xz/src/liblzma/common/alone_decoder.c M contrib/xz/src/liblzma/common/alone_decoder.h M contrib/xz/src/liblzma/common/alone_encoder.c M contrib/xz/src/liblzma/common/auto_decoder.c M contrib/xz/src/liblzma/common/block_buffer_decoder.c M contrib/xz/src/liblzma/common/block_buffer_encoder.c M contrib/xz/src/liblzma/common/block_buffer_encoder.h M contrib/xz/src/liblzma/common/block_decoder.c M contrib/xz/src/liblzma/common/block_decoder.h M contrib/xz/src/liblzma/common/block_encoder.c M contrib/xz/src/liblzma/common/block_encoder.h M contrib/xz/src/liblzma/common/block_header_decoder.c M contrib/xz/src/liblzma/common/block_header_encoder.c M contrib/xz/src/liblzma/common/block_util.c M contrib/xz/src/liblzma/common/common.c M contrib/xz/src/liblzma/common/common.h M contrib/xz/src/liblzma/common/easy_buffer_encoder.c M contrib/xz/src/liblzma/common/easy_decoder_memusage.c M contrib/xz/src/liblzma/common/easy_encoder.c M contrib/xz/src/liblzma/common/easy_encoder_memusage.c M contrib/xz/src/liblzma/common/easy_preset.c M contrib/xz/src/liblzma/common/easy_preset.h M contrib/xz/src/liblzma/common/file_info.c M contrib/xz/src/liblzma/common/filter_buffer_decoder.c M contrib/xz/src/liblzma/common/filter_buffer_encoder.c M contrib/xz/src/liblzma/common/filter_common.c M contrib/xz/src/liblzma/common/filter_common.h M contrib/xz/src/liblzma/common/filter_decoder.c M contrib/xz/src/liblzma/common/filter_decoder.h M contrib/xz/src/liblzma/common/filter_encoder.c M contrib/xz/src/liblzma/common/filter_encoder.h M contrib/xz/src/liblzma/common/filter_flags_decoder.c M contrib/xz/src/liblzma/common/filter_flags_encoder.c M contrib/xz/src/liblzma/common/hardware_cputhreads.c M contrib/xz/src/liblzma/common/hardware_physmem.c M contrib/xz/src/liblzma/common/index.c M contrib/xz/src/liblzma/common/index.h M contrib/xz/src/liblzma/common/index_decoder.c M contrib/xz/src/liblzma/common/index_decoder.h M contrib/xz/src/liblzma/common/index_encoder.c M contrib/xz/src/liblzma/common/index_encoder.h M contrib/xz/src/liblzma/common/index_hash.c M contrib/xz/src/liblzma/common/lzip_decoder.c M contrib/xz/src/liblzma/common/lzip_decoder.h M contrib/xz/src/liblzma/common/memcmplen.h M contrib/xz/src/liblzma/common/microlzma_decoder.c M contrib/xz/src/liblzma/common/microlzma_encoder.c M contrib/xz/src/liblzma/common/outqueue.c M contrib/xz/src/liblzma/common/outqueue.h M contrib/xz/src/liblzma/common/stream_buffer_decoder.c M contrib/xz/src/liblzma/common/stream_buffer_encoder.c M contrib/xz/src/liblzma/common/stream_decoder.c M contrib/xz/src/liblzma/common/stream_decoder.h M contrib/xz/src/liblzma/common/stream_decoder_mt.c M contrib/xz/src/liblzma/common/stream_encoder.c M contrib/xz/src/liblzma/common/stream_encoder_mt.c M contrib/xz/src/liblzma/common/stream_flags_common.c M contrib/xz/src/liblzma/common/stream_flags_common.h M contrib/xz/src/liblzma/common/stream_flags_decoder.c M contrib/xz/src/liblzma/common/stream_flags_encoder.c M contrib/xz/src/liblzma/common/string_conversion.c M contrib/xz/src/liblzma/common/vli_decoder.c M contrib/xz/src/liblzma/common/vli_encoder.c M contrib/xz/src/liblzma/common/vli_size.c M contrib/xz/src/liblzma/delta/delta_common.c M contrib/xz/src/liblzma/delta/delta_common.h M contrib/xz/src/liblzma/delta/delta_decoder.c M contrib/xz/src/liblzma/delta/delta_decoder.h M contrib/xz/src/liblzma/delta/delta_encoder.c M contrib/xz/src/liblzma/delta/delta_encoder.h M contrib/xz/src/liblzma/delta/delta_private.h M contrib/xz/src/liblzma/liblzma.pc.in M contrib/xz/src/liblzma/liblzma_generic.map M contrib/xz/src/liblzma/liblzma_linux.map M contrib/xz/src/liblzma/lz/lz_decoder.c M contrib/xz/src/liblzma/lz/lz_decoder.h M contrib/xz/src/liblzma/lz/lz_encoder.c M contrib/xz/src/liblzma/lz/lz_encoder.h M contrib/xz/src/liblzma/lz/lz_encoder_hash.h M contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h M contrib/xz/src/liblzma/lz/lz_encoder_mf.c M contrib/xz/src/liblzma/lzma/fastpos.h M contrib/xz/src/liblzma/lzma/fastpos_table.c M contrib/xz/src/liblzma/lzma/fastpos_tablegen.c M contrib/xz/src/liblzma/lzma/lzma2_decoder.c M contrib/xz/src/liblzma/lzma/lzma2_decoder.h M contrib/xz/src/liblzma/lzma/lzma2_encoder.c M contrib/xz/src/liblzma/lzma/lzma2_encoder.h M contrib/xz/src/liblzma/lzma/lzma_common.h M contrib/xz/src/liblzma/lzma/lzma_decoder.c M contrib/xz/src/liblzma/lzma/lzma_decoder.h M contrib/xz/src/liblzma/lzma/lzma_encoder.c M contrib/xz/src/liblzma/lzma/lzma_encoder.h M contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c M contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c M contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c M contrib/xz/src/liblzma/lzma/lzma_encoder_private.h M contrib/xz/src/liblzma/rangecoder/price.h M contrib/xz/src/liblzma/rangecoder/price_table.c M contrib/xz/src/liblzma/rangecoder/price_tablegen.c M contrib/xz/src/liblzma/rangecoder/range_common.h M contrib/xz/src/liblzma/rangecoder/range_decoder.h M contrib/xz/src/liblzma/rangecoder/range_encoder.h M contrib/xz/src/liblzma/simple/arm.c M contrib/xz/src/liblzma/simple/arm64.c M contrib/xz/src/liblzma/simple/armthumb.c M contrib/xz/src/liblzma/simple/ia64.c M contrib/xz/src/liblzma/simple/powerpc.c A contrib/xz/src/liblzma/simple/riscv.c M contrib/xz/src/liblzma/simple/simple_coder.c M contrib/xz/src/liblzma/simple/simple_coder.h M contrib/xz/src/liblzma/simple/simple_decoder.c M contrib/xz/src/liblzma/simple/simple_decoder.h M contrib/xz/src/liblzma/simple/simple_encoder.c M contrib/xz/src/liblzma/simple/simple_encoder.h M contrib/xz/src/liblzma/simple/simple_private.h M contrib/xz/src/liblzma/simple/sparc.c M contrib/xz/src/liblzma/simple/x86.c M contrib/xz/src/liblzma/validate_map.sh M contrib/xz/src/lzmainfo/lzmainfo.1 M contrib/xz/src/lzmainfo/lzmainfo.c M contrib/xz/src/xz/args.c M contrib/xz/src/xz/args.h M contrib/xz/src/xz/coder.c M contrib/xz/src/xz/coder.h M contrib/xz/src/xz/file_io.c M contrib/xz/src/xz/file_io.h M contrib/xz/src/xz/hardware.c M contrib/xz/src/xz/hardware.h M contrib/xz/src/xz/list.c M contrib/xz/src/xz/list.h M contrib/xz/src/xz/main.c M contrib/xz/src/xz/main.h M contrib/xz/src/xz/message.c M contrib/xz/src/xz/message.h M contrib/xz/src/xz/mytime.c M contrib/xz/src/xz/mytime.h M contrib/xz/src/xz/options.c M contrib/xz/src/xz/options.h M contrib/xz/src/xz/private.h A contrib/xz/src/xz/sandbox.c A contrib/xz/src/xz/sandbox.h M contrib/xz/src/xz/signals.c M contrib/xz/src/xz/signals.h M contrib/xz/src/xz/suffix.c M contrib/xz/src/xz/suffix.h M contrib/xz/src/xz/util.c M contrib/xz/src/xz/util.h M contrib/xz/src/xz/xz.1 M contrib/xz/src/xzdec/xzdec.1 M contrib/xz/src/xzdec/xzdec.c M lib/liblzma/Makefile M lib/liblzma/config.h M usr.bin/xz/Makefile ____________________________________________________________________________________________________________ Commit: ca6cd0e57cca4a39a2947c35b9e5f0ef11979fb5 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=ca6cd0e57cca4a39a2947c35b9e5f0ef11979fb5 Author: Matthew Nygard Dodd (Mon 18 Nov 2024 04:25:10 GMT) Committer: Vladimir Kondratyev (Sun 22 Dec 2024 03:49:07 GMT) hidraw(4): update hgd_actlen in HIDRAW_GET_REPORT ioctl HIDRAW_GET_REPORT ioctl is documented to update hgd_actlen on return with the number of bytes copied. It does not do this. Reviewed by: wulf PR: 282790 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282790 ) MFC after: 1 week (cherry picked from commit f4f46a2eef3be6d19c65a4ca4ee70f365dd5be4f) M sys/dev/hid/hidraw.c ____________________________________________________________________________________________________________ Commit: 05abe2c9076e35c353c755702e6cf4a6ea59eab7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=05abe2c9076e35c353c755702e6cf4a6ea59eab7 Author: Matthew Nygard Dodd (Mon 18 Nov 2024 04:15:01 GMT) Committer: Vladimir Kondratyev (Sun 22 Dec 2024 03:49:07 GMT) uhid(4): update ugd_actlen in USB_GET_REPORT ioctl USB_GET_REPORT ioctl is documented to update ugd_actlen on return with the number of bytes copied. It does not do this. Reviewed by: wulf PR: 282790 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282790 ) MFC after: 1 week (cherry picked from commit 0b5d86b38ae9aec92ef96b9227a404a2df3c9234) M sys/dev/usb/input/uhid.c ____________________________________________________________________________________________________________ Commit: a63708347d831e37c50cae291ece97d889c71728 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a63708347d831e37c50cae291ece97d889c71728 Author: Jose Luis Duran (Mon 18 Nov 2024 00:16:50 GMT) Committer: Jose Luis Duran (Sat 21 Dec 2024 17:05:24 GMT) nanobsd: Remove dependency on bsdlabel The bsdlabel utility is deprecated, gpart should be used instead: - Offset the first 16 sectors, just like bsdlabel did (used for metadata) - Use a freebsd-ufs partition type (regardless bsdlabel creating a '!0') Reviewed by: emaste, imp Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47653 (cherry picked from commit 87e87fecb139d60a00837f004de0d37dbecd205c) M tools/tools/nanobsd/legacy.sh ____________________________________________________________________________________________________________ Commit: 494120df401b9b6fdca1378f6e1e0da1722b9849 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=494120df401b9b6fdca1378f6e1e0da1722b9849 Author: Jose Luis Duran (Sun 17 Nov 2024 23:55:14 GMT) Committer: Jose Luis Duran (Sat 21 Dec 2024 17:05:08 GMT) geom: Allow BSD type '!0' partitions Allow the creation of '!0' partition types. Fix it by not considering "0" an invalid partition type. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47652 (cherry picked from commit accf71534c612b76ee2701f2dfcaa464748e527a) M sys/geom/part/g_part_bsd.c ____________________________________________________________________________________________________________ Commit: 15d5f84b1b7ccf6eebcff184b8e5f841a48c69ef URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=15d5f84b1b7ccf6eebcff184b8e5f841a48c69ef Author: Dmitry Morozovsky (Sat 30 Nov 2024 21:53:47 GMT) Committer: Dmitry Morozovsky (Sat 21 Dec 2024 11:54:51 GMT) services: fix typo ucp -> udp Fix two proto name typos MFC after: 2 weeks (cherry picked from commit 7aa7f4b5c324a0f698b3ae1e39856cc087a14e0c) M usr.sbin/services_mkdb/services ____________________________________________________________________________________________________________ Commit: 11c7eb30cc9b38d199c4686ad00071a678a1fc58 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=11c7eb30cc9b38d199c4686ad00071a678a1fc58 Author: Tobias Heider (Wed 4 Dec 2024 01:13:41 GMT) Committer: Mark Johnston (Wed 18 Dec 2024 14:15:46 GMT) pfkey: Fix some checks in kdebug_sadb() Besides not doing any sufficient check that the length of a parsed message is not bigger than the actual allocated buffer, kdebug_sadb() incorrectly compares ext->sadb_ext_len, the extension payload size in 8 byte chunks, with tlen, which is the full message payload size in bytes. This should compare PFKEY_UNUNIT64(ext->sadb_ext_len) with tlen instead. PR: 277456 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277456 ) MFC after: 2 weeks (cherry picked from commit 0dab21248bc9fab09e92b0c037303c921ebb1b8d) M sys/netipsec/key_debug.c ____________________________________________________________________________________________________________ Commit: 6b466bbd6134980985b67a68787e4258c0e49b88 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6b466bbd6134980985b67a68787e4258c0e49b88 Author: Jose Luis Duran (Fri 15 Nov 2024 04:54:09 GMT) Committer: Jose Luis Duran (Mon 16 Dec 2024 15:13:59 GMT) nanobsd: Fix typos Fix a number of typos in the code or comments. Files under dhcpd, embedded, pcengines, and rescue were intentionally omitted. These directories will be reviewed at a later date. PR: 269884 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269884 ) Reviewed by: imp, zlei Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47587 (cherry picked from commit 12cbad923dbcccb3d6f71a77ad3241508f186048) M tools/tools/nanobsd/Files/root/save_cfg M tools/tools/nanobsd/defaults.sh M tools/tools/nanobsd/fill_pkg.sh M tools/tools/nanobsd/mtree-dedup.awk ____________________________________________________________________________________________________________ Commit: 4ace066a9085e8b0e9febf7850b3c51cd9533f7a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4ace066a9085e8b0e9febf7850b3c51cd9533f7a Author: Jose Luis Duran (Fri 15 Nov 2024 04:28:01 GMT) Committer: Jose Luis Duran (Mon 16 Dec 2024 15:13:51 GMT) nanobsd: Fix cust_comconsole search patterns The current patterns are outdated, and may produce "offifexists", after e310437971b8 ("For video consoles, only launch a getty if the device exists."). Fix the expressions to: 1. Disable getty(8) on the virtual syscons(4) or vt(4) terminals (/dev/ttyv*). 2. Enable the use of the first serial port as the system console. Reviewed by: imp Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47586 (cherry picked from commit 0f7b0db5dd07e7c48285db4cac19e15fc9a42622) M tools/tools/nanobsd/defaults.sh ____________________________________________________________________________________________________________ Commit: a7e4493778b02af51344ab6d217942c2440d3736 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a7e4493778b02af51344ab6d217942c2440d3736 Author: Jose Luis Duran (Tue 12 Nov 2024 20:17:14 GMT) Committer: Jose Luis Duran (Mon 16 Dec 2024 15:13:44 GMT) nanobsd: Use the real path for NANO_PACKAGE_DIR As users may have the Pkg directory as a symbolic link to the NanoBSD "package dump directory". In commit 9af130ae8c03, cust_pkgng() was greatly improved, however as a side effect of using a nullfs mount, the directories and files must not be symlinks. Fix it by using NANO_PACKAGE_DIR realpath(). PR: 269884 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269884 ) Reviewed by: imp Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47532 (cherry picked from commit 4223c668e4b9ba71e2c6cfabbd66795729b7ff8b) M tools/tools/nanobsd/defaults.sh ____________________________________________________________________________________________________________ Commit: f5613e2d49523cb304638fcc322970128958f16f URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f5613e2d49523cb304638fcc322970128958f16f Author: Jose Luis Duran (Tue 12 Nov 2024 07:33:12 GMT) Committer: Jose Luis Duran (Mon 16 Dec 2024 15:13:37 GMT) nanobsd: Update fill_pkg.sh fill_pkg.sh is a script that links a package and its dependencies from a "package dump" directory (like /usr/ports/packages/All) to a specified directory (NANO_PACKAGE_DIR), for cust_pkgng()[*]. Update the script by: - Using `make package-name` instead of `make -V pkgname` - Looking for package files with *.pkg instead of *.txz - Adding a -c option that copies the files instead of linking them[*] [*] After 9af130ae8c03 cust_pkgng() cannot be used with a directory populated by fill_pkg.sh, because it uses a nullfs mount, which doesn't follow symlinks, therefore the links inside NANO_PACKAGE_DIR will not work. PR: 269884 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269884 ) Reviewed by: imp Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47531 (cherry picked from commit 4db04f5e3a9bd927ba1173bf8d3b6a70178eab5f) M tools/tools/nanobsd/fill_pkg.sh ____________________________________________________________________________________________________________ Commit: fb6f7d93218f29786e9552fd48d95526e78757c2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=fb6f7d93218f29786e9552fd48d95526e78757c2 Author: Jose Luis Duran (Sun 10 Nov 2024 06:50:07 GMT) Committer: Jose Luis Duran (Mon 16 Dec 2024 15:13:29 GMT) nanobsd.8: Chase usage string updates Update the manual page for NanoBSD to match its usage. Reviewed by: emaste, imp Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47505 (cherry picked from commit f6f311d8cdacdc964967e83c8f6377d8465806d5) M share/man/man8/nanobsd.8 ____________________________________________________________________________________________________________ Commit: a641dd41fcafade204d6b8dabcf235c32eacc70b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a641dd41fcafade204d6b8dabcf235c32eacc70b Author: Jose Luis Duran (Fri 8 Nov 2024 18:13:48 GMT) Committer: Jose Luis Duran (Mon 16 Dec 2024 15:13:19 GMT) nanobsd: Avoid read-only file system warnings The default setting of some loader or rc variables generate warnings because the file system is read-only: Set the following options to avoid printing these warnings: /boot/defaults/loader.conf: - hostuuid_load="NO" to disable loading /etc/hostid early at boot time - entropy_cache_load="NO" to disable loading cached entropy at boot time - kern.random.initial_seeding.disable_bypass_warnings="1" to disable logging a warning if the 'bypass_before_seeding' knob is enabled (enabled by default) and a request is submitted prior to initial seeding /etc/defaults/rc.conf: - kldxref_enable="NO" to disable building linker.hints files with kldxref(8) - entropy_boot_file="NO" to disable very early (used at early boot-time) entropy caching through reboots - entropy_dir="NO" to disable caching entropy via cron While here, move rc.conf options before sourcing vendor.conf, so they can be overridden. PR: 277601 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277601 ) Reviewed by: imp Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47502 (cherry picked from commit e5579f98c02ff64b0c305f6731c3557ba69c2d25) M tools/tools/nanobsd/defaults.sh ____________________________________________________________________________________________________________ Commit: 16fc8362986908ed125f4f451fdbf3a37e30b3de URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=16fc8362986908ed125f4f451fdbf3a37e30b3de Author: Jose Luis Duran (Thu 7 Nov 2024 14:32:01 GMT) Committer: Jose Luis Duran (Mon 16 Dec 2024 15:13:12 GMT) nanobsd: Fix parallel make The NANO_NCPU (number of CPUs) value gets ignored by the build script when setting the NANO_PMAKE (parallel make) value. Fix it by setting the NANO_PMAKE later in the process. PR: 277269 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277269 ) Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47476 (cherry picked from commit 3c5d19a40de7273bb478163639dd8532af425595) M tools/tools/nanobsd/defaults.sh M tools/tools/nanobsd/nanobsd.sh ____________________________________________________________________________________________________________ Commit: e6850fef72deb8f24ca27380565fc519c7ac2147 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e6850fef72deb8f24ca27380565fc519c7ac2147 Author: Jose Luis Duran (Thu 7 Nov 2024 14:16:50 GMT) Committer: Jose Luis Duran (Mon 16 Dec 2024 15:13:05 GMT) nanobsd: Add missing options to usage() -B suppress installs (both kernel and world) -I build disk image from existing build/install -W suppress installworld PR: 277269 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277269 ) Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47475 (cherry picked from commit 999f288a0eeb230d3655da94c1186ca03c0cc404) M tools/tools/nanobsd/defaults.sh ____________________________________________________________________________________________________________ Commit: 3a052d2d36ba46e842fe3aaed4d069e647f45ae7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=3a052d2d36ba46e842fe3aaed4d069e647f45ae7 Author: Dag-Erling Smørgrav (Mon 9 Dec 2024 19:44:34 GMT) Committer: Dag-Erling Smørgrav (Mon 16 Dec 2024 10:38:58 GMT) uniq: Correctly document the -D option. The -D option takes an optional argument; modify the usage message and the manual page's synopsis to correctly reflect this. Also update the tests to exercise -D with and without an argument. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D47999 (cherry picked from commit b93791f5e7b0246b121dd98c10d6563298d6b2b0) uniq: Fix off-by-one bug in -cD case. When printing only duplicated lines, the first line of each set is not printed until we encounter the second. When that happens, we need to increment the repetition count between printing the first and the second line, so that if we are also printing counts, we don't print the same (pre-increment) count twice. MFC after: 1 week PR: 275764 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275764 ) Reported by: Yu-Sheng Ma Submitted by: Daniel Tameling (original patch) Sponsored by: Klara, Inc. Reviewed by: tamelingdaniel_gmail.com, asomers, emaste Differential Revision: https://reviews.freebsd.org/D48000 (cherry picked from commit c3f8900e696998c410dc16f9bd9d45c24c413e6b) M usr.bin/uniq/tests/uniq_test.sh M usr.bin/uniq/uniq.1 M usr.bin/uniq/uniq.c ____________________________________________________________________________________________________________ Commit: 48d21d15a8f22c766f1651c0a244554f6b5d7af7 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=48d21d15a8f22c766f1651c0a244554f6b5d7af7 Author: Dag-Erling Smørgrav (Mon 9 Dec 2024 12:37:45 GMT) Committer: Dag-Erling Smørgrav (Mon 16 Dec 2024 10:38:57 GMT) strptime: Fix day-of-week calculation. The day-of-week calculation used the raw year value without adjusting for TM_YEAR_BASE, so it was off by one for 300 years out of every 400; it just happened to be correct for 1901 through 2000. It also used a loop where a simple addition would have sufficed. While here, simplify our version of Gauss's algorithm, and document that we assume the Gregorian calendar. MFC after: 1 week PR: 282916 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282916 ) Reviewed by: imp, allanjude, philip Differential Revision: https://reviews.freebsd.org/D47977 (cherry picked from commit 4285e024baa80f81d13cdcc016fdf0721fe57862) M etc/mtree/BSD.tests.dist M lib/libc/stdtime/strptime.3 M lib/libc/stdtime/strptime.c M lib/libc/tests/Makefile A lib/libc/tests/stdtime/Makefile A lib/libc/tests/stdtime/strptime_test.c ____________________________________________________________________________________________________________ Commit: 4d38c776eb090adb955c6bdc7b0885b0fa9c9960 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4d38c776eb090adb955c6bdc7b0885b0fa9c9960 Author: Zhenlei Huang (Mon 9 Dec 2024 17:14:08 GMT) Committer: Zhenlei Huang (Sun 15 Dec 2024 15:43:36 GMT) netinet: Use NULL for VNET_SYSINIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit ac51711cab6e55a99ee0a565fe0ae30c0305c854) (cherry picked from commit 005b6caf268c959e90d838a318f384656923977d) M sys/netinet/if_ether.c ____________________________________________________________________________________________________________ Commit: 1a584160e3f4e2c7db60b8a1ed7a4d0be2017216 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1a584160e3f4e2c7db60b8a1ed7a4d0be2017216 Author: Zhenlei Huang (Mon 9 Dec 2024 17:14:08 GMT) Committer: Zhenlei Huang (Sun 15 Dec 2024 15:43:35 GMT) rtsock: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit adc573c8e2179310777cef4d6bda19db2ae63dd5) (cherry picked from commit 8293bd6285401c3ef4310e4fc8bfb0e3cf132729) M sys/net/rtsock.c ____________________________________________________________________________________________________________ Commit: 32ce6f3365f7dbb787aa2c6cf1c9febd8489a4b1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=32ce6f3365f7dbb787aa2c6cf1c9febd8489a4b1 Author: Zhenlei Huang (Mon 9 Dec 2024 17:14:08 GMT) Committer: Zhenlei Huang (Sun 15 Dec 2024 15:43:35 GMT) routing: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit 12b2d68bed37e379929cd9b5e0afe34c387be360) (cherry picked from commit bca3a925b0bcb57bc48480fbc92fef257aeb1a72) M sys/net/route/route_tables.c ____________________________________________________________________________________________________________ Commit: f9ee60cd21c25833f02ca5895c293e7a015602ba URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f9ee60cd21c25833f02ca5895c293e7a015602ba Author: Zhenlei Huang (Mon 9 Dec 2024 17:14:07 GMT) Committer: Zhenlei Huang (Sun 15 Dec 2024 15:43:35 GMT) cuse: Use NULL for SYSUNINIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit 6854a1488932cd043da940b87eb956d6df7d8522) (cherry picked from commit 23c1619970ab1082b8275ffb914463f1c62c2f84) M sys/fs/cuse/cuse.c ____________________________________________________________________________________________________________ Commit: f6e0690dc9f2e8ba78ba74041eba4ff77091448a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=f6e0690dc9f2e8ba78ba74041eba4ff77091448a Author: Zhenlei Huang (Fri 6 Dec 2024 13:46:55 GMT) Committer: Zhenlei Huang (Sun 15 Dec 2024 15:43:34 GMT) init_main: Use TUNABLE_INT_FETCH to initialize verbose_sysinit It is too late to initialize verbose_sysinit via TUNABLE_INT, as TUNABLE_INT runs at the order of SI_SUB_TUNABLES, thus any subsystems those have order prior or equal to SI_SUB_TUNABLES are not logged. Reviewed by: kevans Fixes: c7962400c9a7 Add debug.verbose_sysinit tunable for VERBOSE_SYSINIT MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47907 (cherry picked from commit a7cfcb26451219d6f4e60c486c855adeea288397) (cherry picked from commit 9c6454fe7048ade86faa1a864b04c7b250a660ec) M sys/kern/init_main.c ____________________________________________________________________________________________________________ Commit: 642ade0a3d8244c4c0cf82a335c4e940cb300a96 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=642ade0a3d8244c4c0cf82a335c4e940cb300a96 Author: Kristof Provost (Thu 21 Nov 2024 20:33:41 GMT) Committer: Kristof Provost (Sat 14 Dec 2024 10:03:25 GMT) pfctl: clear statistic for specified addresses The ioctl DIOCRCLRASTATS provides the functionality of clearing stats not only for the whole table for for addresses stored in that table. The functionality was missing from pfctl, though. Add it now. PR: 282877 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282877 ) Obtained from: OpenBSD, kirill , e496dff3a7 MFC after: 3 weeks (cherry picked from commit 6463b6b59152fb1695bbe0de78f6e2675c5a765a) M sbin/pfctl/pfctl.8 M sbin/pfctl/pfctl.h M sbin/pfctl/pfctl_radix.c M sbin/pfctl/pfctl_table.c M tests/sys/netpfil/pf/table.sh ____________________________________________________________________________________________________________ Commit: 8176157d69b89a811f997cbbe490dfd57595f264 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=8176157d69b89a811f997cbbe490dfd57595f264 Author: Jessica Clarke (Fri 13 Dec 2024 21:37:00 GMT) Committer: Jessica Clarke (Fri 13 Dec 2024 21:37:00 GMT) mips: Extract HWREna configuration and call from APs The intent of mips_get_identity is to perform any feature detection and corresponding global system configuration, but currently it is also abused to set HWREna.UL on the BSP when available, with APs being left unconfigured. Extract that part out into its own function that gets called after mips_get_identity on the BSP, and call it on the APs from smp_init_secondary. This is a direct commit to stable/13 as mips no longer exists in main. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D48064 M sys/mips/include/md_var.h M sys/mips/mips/cpu.c M sys/mips/mips/mp_machdep.c ____________________________________________________________________________________________________________ Commit: 05150edd1e303d47362bef5d25e2fd5e66de092b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=05150edd1e303d47362bef5d25e2fd5e66de092b Author: Dmitry Salychev (Mon 18 Nov 2024 21:56:11 GMT) Committer: Dmitry Salychev (Fri 13 Dec 2024 20:02:28 GMT) dpaa2: Fix kernel built with ACPI_DEBUG PR: 282800 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282800 ) Reported by: phk Tested by: bz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47666 (cherry picked from commit c2dd2be344fbf59cf95f6773d4b09cc7dda0f876) M sys/dev/dpaa2/dpaa2_mc_acpi.c ____________________________________________________________________________________________________________ Commit: cd597b4bb194f7a0bd756b5299b40ad3607b1baf URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cd597b4bb194f7a0bd756b5299b40ad3607b1baf Author: Mark Johnston (Fri 6 Dec 2024 02:03:59 GMT) Committer: Mark Johnston (Fri 13 Dec 2024 01:39:46 GMT) cd9660: Make sure that struct ifid fits in generic filehandle structure File system specific *fid structures are copied into the generic struct fid defined in sys/mount.h. As such, they cannot be larger than struct fid. This patch packs the structure and checks via a __Static_assert(). Reported by: Kevin Miller Reviewed by: olce, imp, kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47879 (cherry picked from commit 205659c43d87bd42c4a0819fde8f81e8ebba068e) M sys/fs/cd9660/cd9660_vnops.c M sys/fs/cd9660/iso.h ____________________________________________________________________________________________________________ Commit: d7bf409a63501a28357a9a9ec24628e1208d530d URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=d7bf409a63501a28357a9a9ec24628e1208d530d Author: Jessica Clarke (Fri 13 Dec 2024 00:18:33 GMT) Committer: Jessica Clarke (Fri 13 Dec 2024 00:18:33 GMT) rtld-elf: Fix for mips with LLD 14+ As of LLD 14, it no longer falls back to the address of .text if it can't find the entry point, and instead just uses address 0. Since the mips port has always used rtld_start as its entry point symbol but has never set RTLD_ENTRY to match (instead getting the default .rtld_start), with LLD 14+ it ends up using an entry point of 0, i.e. reinterpreting various headers and metadata sections as code, and thus quickly dies, in my case with SIGILL. This has seemingly always been a warning with LLD even when it defaulted to .text, but that went unnoticed this whole time, until now. Fix this by specifying the right symbol name. This is a direct commit to stable/13 as mips no longer exists in main. M libexec/rtld-elf/mips/Makefile.inc ____________________________________________________________________________________________________________ Commit: e32b14ef10a7b0c3130ead9e676c8e6f261f0b69 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e32b14ef10a7b0c3130ead9e676c8e6f261f0b69 Author: Jessica Clarke (Thu 12 Dec 2024 21:19:04 GMT) Committer: Jessica Clarke (Thu 12 Dec 2024 21:19:04 GMT) mips/malta: Prefer _start over _locore for entry point symbol These are aliases, but it's probably nicer to use the same symbol as we use for the actual ELF entry point. This is a direct commit to stable/13 as mips no longer exists in main. M sys/mips/malta/malta_mp.c ____________________________________________________________________________________________________________ Commit: cc521bcf790bdcc76fddd619f35d0279f22e535a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=cc521bcf790bdcc76fddd619f35d0279f22e535a Author: Jessica Clarke (Thu 12 Dec 2024 21:07:14 GMT) Committer: Jessica Clarke (Thu 12 Dec 2024 21:07:14 GMT) mips/malta: Explicitly set AP entry point to _locore Otherwise we rely on the firmware implicitly ending up there without faulting. Perhaps the hardware this was tested on does so, but on QEMU this is not the case, as the AP will otherwise re-run bootloader code that tries to reconfigure PCI BARs and ends up faulting, so the AP is never seen by FreeBSD to have started. This matches Linux's arch/mips/kernel/smp-mt.c:vsmp_boot_secondary, which unconditionally writes to TCRestart (this register), albeit using a separate entry point, whilst ours is shared. This is a direct commit to stable/13 as mips no longer exists in main. Obtained from: CheriBSD (diagnosis; patch rewritten from scratch) M sys/mips/malta/malta_mp.c ____________________________________________________________________________________________________________ Commit: 1e502fc1c4215ac61db04598eb0a15d0e1ff7d6a URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1e502fc1c4215ac61db04598eb0a15d0e1ff7d6a Author: Baptiste Daroussin (Wed 20 Nov 2024 13:14:43 GMT) Committer: Baptiste Daroussin (Thu 12 Dec 2024 16:02:48 GMT) sh(1): -l is only valid in cli option not as set -l (cherry picked from commit 0df81552d74d2c188a9323ffe18f6ebe799b86f9) M bin/sh/options.c ____________________________________________________________________________________________________________ Commit: 6e1b857b89d4e22fe711eef45e2e32e6b6606a0b URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6e1b857b89d4e22fe711eef45e2e32e6b6606a0b Author: Baptiste Daroussin (Wed 20 Nov 2024 10:48:39 GMT) Committer: Baptiste Daroussin (Thu 12 Dec 2024 16:02:48 GMT) sh(1): add -l option -l is required by LSB for login shell, all other shells: bash, zsh, oksh, mksh, ... implements it. with -l sh will act as a login shell and read the profile. MFC After: 1 week Obtained From: dash (3b7c8442bfe7c2fd0a6b0415df6ddf66a399fd55) Reviewed by: kib, lme Differential Revision: https://reviews.freebsd.org/D47681 (cherry picked from commit 65f5dd42f11cdcb7716e6cdd09fac2314c144c1f) M bin/sh/sh.1 ____________________________________________________________________________________________________________ Commit: 973a9a36fd56fefa44ce2ab22eb67bb2077c1f84 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=973a9a36fd56fefa44ce2ab22eb67bb2077c1f84 Author: Baptiste Daroussin (Wed 20 Nov 2024 10:48:39 GMT) Committer: Baptiste Daroussin (Thu 12 Dec 2024 16:00:48 GMT) sh(1): add -l option -l is required by LSB for login shell, all other shells: bash, zsh, oksh, mksh, ... implements it. with -l sh will act as a login shell and read the profile. MFC After: 1 week Obtained From: dash (3b7c8442bfe7c2fd0a6b0415df6ddf66a399fd55) Reviewed by: kib, lme Differential Revision: https://reviews.freebsd.org/D47681 (cherry picked from commit 65f5dd42f11cdcb7716e6cdd09fac2314c144c1f) M bin/sh/main.c M bin/sh/options.c M bin/sh/options.h M bin/sh/sh.1 ____________________________________________________________________________________________________________ Commit: a8e22567d3fa660c9f61daa3c9c8f0f587df6fb0 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=a8e22567d3fa660c9f61daa3c9c8f0f587df6fb0 Author: Dimitry Andric (Fri 6 Dec 2024 17:26:41 GMT) Committer: Dimitry Andric (Wed 11 Dec 2024 08:17:06 GMT) Merge llvm-project release/19.x llvmorg-19.1.5-0-gab4b5a2db582 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.5-0-gab4b5a2db582, a.k.a. 19.1.5 release. PR: 280562 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280562 ) MFC after: 3 days (cherry picked from commit 71ac745d76c3ba442e753daff1870893f272b29d) M contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp M contrib/llvm-project/clang/lib/Interpreter/IncrementalExecutor.h M contrib/llvm-project/clang/lib/Interpreter/Interpreter.cpp M contrib/llvm-project/clang/lib/Interpreter/Wasm.cpp M contrib/llvm-project/clang/lib/Interpreter/Wasm.h M contrib/llvm-project/libcxx/include/__config M contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp M contrib/llvm-project/llvm/include/llvm/Analysis/MemorySSAUpdater.h M contrib/llvm-project/llvm/lib/Analysis/MemorySSAUpdater.cpp M contrib/llvm-project/llvm/lib/Analysis/ScalarEvolution.cpp M contrib/llvm-project/llvm/lib/CodeGen/MachineLICM.cpp M contrib/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp M contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp M contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp M contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td M contrib/llvm-project/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp M contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp M contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.h M contrib/llvm-project/llvm/lib/Target/Mips/MipsMSAInstrInfo.td M contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp M contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h M contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp M contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp M contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp M contrib/llvm-project/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp M contrib/llvm-project/llvm/lib/Transforms/Scalar/LICM.cpp M contrib/llvm-project/llvm/lib/Transforms/Utils/Local.cpp M contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp M contrib/llvm-project/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp M lib/clang/include/VCSVersion.inc M lib/clang/include/clang/Basic/Version.inc M lib/clang/include/lld/Common/Version.inc M lib/clang/include/lldb/Version/Version.inc M lib/clang/include/llvm/Config/config.h M lib/clang/include/llvm/Config/llvm-config.h M lib/clang/include/llvm/Support/VCSRevision.h ____________________________________________________________________________________________________________ Commit: 9d8a178b38ed0953f2beaa49c0dd3981cce56179 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=9d8a178b38ed0953f2beaa49c0dd3981cce56179 Author: Jose Luis Duran (Sun 1 Dec 2024 19:05:58 GMT) Committer: Kyle Evans (Tue 10 Dec 2024 23:06:16 GMT) pw: tests: add a test for -M with a pre-existing home directory Previous versions of pw(8) wouldn't chmod the home directory if it already existed prior to user creation, rendering adduser(8) -M ineffective in some cases. Add a test to cover that situation. PR: 280099 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280099 ) Reviewed by: kevans (cherry picked from commit f7cf62cf728a942e494a5b58438600998606617a) M usr.sbin/pw/tests/pw_useradd_test.sh ____________________________________________________________________________________________________________ Commit: 1eaaa55f2ba9b45dfd955743a9bc5cbe7a6437f3 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=1eaaa55f2ba9b45dfd955743a9bc5cbe7a6437f3 Author: Kyle Evans (Sun 1 Dec 2024 19:05:57 GMT) Committer: Kyle Evans (Tue 10 Dec 2024 23:06:15 GMT) pw: set the user's home directory mode if it existed The adduser(8) prompt allows one to set the mode of a new home directory, but pw(8) doesn't honor the -M mode if the home directory already exists at creation time. It doesn't seem to make sense to ignore the mode (which may lead to a security issue on the system being configured) when we'll happily chown an existing directory, so fix the inconsistency. PR: 280099 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280099 ) Reviewed by: des, jlduran (previous version) (cherry picked from commit 6a7238fd7c60f35191eadaa026d3d395c6140c47) M usr.sbin/adduser/adduser.8 M usr.sbin/pw/cpdir.c ____________________________________________________________________________________________________________ Commit: 4bb1a558a2811a27b1211579cb257a11df49c0e1 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=4bb1a558a2811a27b1211579cb257a11df49c0e1 Author: Kyle Evans (Tue 19 Nov 2024 19:51:27 GMT) Committer: Kyle Evans (Tue 10 Dec 2024 23:06:11 GMT) daemon: stop rebuilding the kqueue every restart of the child We populate the kqueue with all of four kevents: three signal handlers and one for read of the child pipe. Every time we start the child, we rebuild this kqueue from scratch for the child and tear it down before we exit and check if we need to restart the child. As a consequence, we effectively drop any of the signals we're interested in between restarts. Push the kqueue out into the daemon state to avoid losing any signal events in the process, and reimplement the restart timer in terms of kqueue timers. The pipe read event will be automatically deleted upon last close, which leaves us with only the signal events that really get retained between restarts of the child. PR: 277959 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277959 ) Reviewed by: des, markj (cherry picked from commit bc1dfc316a2bba97773a14b96f5e976a52524be4) M usr.sbin/daemon/daemon.c ____________________________________________________________________________________________________________ Commit: 57c60ec86246804a3df5c50ecfd921b39febcfd2 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=57c60ec86246804a3df5c50ecfd921b39febcfd2 Author: Kyle Evans (Tue 19 Nov 2024 19:51:27 GMT) Committer: Kyle Evans (Tue 10 Dec 2024 23:02:40 GMT) daemon: tests: add a test for missed SIGTERM This is somewhaht hard to test reliably, but we'll give it a shot. Startup a sleep(1) daemon with a hefty restart delay. In refactoring of daemon(8), we inadvertently started dropping SIGTERMs that came in while we were waiting to restart the child, so we employ the strategy: - Pop the child sleep(1) first - Wait for sleep(1) to exit (pid file truncated) - Pop the daemon(8) with a SIGTERM - Wait for daemon(8) to exit The pidfile is specifically truncated outside of the event loop so that we don't have a kqueue to catch it in the current model. PR: 277959 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277959 ) Reviewed by: des, markj (cherry picked from commit 9ab59e900c1dd693b4d14285389a035e81341789) M usr.sbin/daemon/tests/daemon_test.sh ____________________________________________________________________________________________________________ Commit: 067e3791d6151973eaae70ab767ce5f53fbef3f6 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=067e3791d6151973eaae70ab767ce5f53fbef3f6 Author: Kyle Evans (Tue 19 Nov 2024 19:51:26 GMT) Committer: Kyle Evans (Tue 10 Dec 2024 23:02:36 GMT) daemon: truncate the pidfile when we're waiting to restart child We need to be able to test some more restart behavior that depends on knowing specifically where we're at (inside the event loop or outside of the event loop). Truncate the pidfile until the process is restarted to give the test a clean marker rather than having to add arbitrary delays and hoping for the best. Reviewed by: des, markj (cherry picked from commit aa8722cc18e4620ea5e7b0a4917207ed1508393d) M usr.sbin/daemon/daemon.c M usr.sbin/daemon/tests/daemon_test.sh ____________________________________________________________________________________________________________ Commit: e5e44726d5afdb260893a3b4e0be025f6dd74bd4 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=e5e44726d5afdb260893a3b4e0be025f6dd74bd4 Author: Kyle Evans (Tue 26 Nov 2024 04:04:48 GMT) Committer: Kyle Evans (Tue 10 Dec 2024 20:03:14 GMT) kern: restore signal mask before ast() for pselect/ppoll It's possible to take a signal after pselect/ppoll have set their return value, but before we actually return to userland. This results in taking a signal without reflecting it in the return value, which weakens the guarantees provided by these functions. Switch both to restore the signal mask before we would deliver signals on return to userland. If a signal was received after the wait was over, then we'll just have the signal queued up for the next time it comes unblocked. The modified signal mask is retained if we were interrupted so that ast() actually handles the signal, at which point the signal mask is restored. des@ has a test case demonstrating the issue in D47738 which will follow. Reported by: des Reviewed by: des (earlier version), kib Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D47741 (cherry picked from commit ccb973da1f1b65879eade8e65cdd2885e125f90e) M sys/kern/sys_generic.c ____________________________________________________________________________________________________________ Commit: 6608a478cddb98c1ad52ec0abae5240915fb2c57 URL: https://git.freebsd.catflap.org/src/stable-13/commit/?id=6608a478cddb98c1ad52ec0abae5240915fb2c57 Author: Jessica Clarke (Tue 10 Sep 2024 18:54:44 BST) Committer: Brooks Davis (Mon 9 Dec 2024 21:47:08 GMT) depend-cleanup.sh: Extend clean_dep to support a custom regex This will avoid having to duplicate the loop every time the default regex isn't good enough, and will be used by upcoming commits. (cherry picked from commit cc30f4ae6790cf4f19bc4787d7528dfea79ef27a) Pull Request: https://github.com/freebsd/freebsd-src/pull/1543 M tools/build/depend-cleanup.sh ___________________________________________________________________________________________________________