HardenedBSD/src 46701fasys/net rtsock.c

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)
(cherry picked from commit df932377e7dd7dc536fa14612d9e80aa3554772e)
Signed-off-by: Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+2-2sys/net/rtsock.c
+2-21 files

HardenedBSD/src f62e80esys/net rtsock.c

Merge remote-tracking branch 'origin/freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2sys/net/rtsock.c
+2-21 files

HardenedBSD/src c617708share/man/man5 src.conf.5

HBSD: Resolve merge conflict

Regen src.conf.5.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-5share/man/man5/src.conf.5
+1-51 files

HardenedBSD/src 5339846sbin/camcontrol camcontrol.c, share/man/man4 ffs.4

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+178-177sys/sys/elf_common.h
+29-0sbin/camcontrol/camcontrol.c
+5-10usr.sbin/bhyve/iov.c
+11-2sys/netinet/tcp_stacks/rack.c
+3-2share/man/man4/ffs.4
+2-2usr.sbin/ngctl/main.c
+228-1933 files not shown
+231-1969 files

HardenedBSD/src 28f4e57sbin/camcontrol camcontrol.c, share/man/man4 ffs.4

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+178-177sys/sys/elf_common.h
+29-0sbin/camcontrol/camcontrol.c
+5-10usr.sbin/bhyve/iov.c
+11-2sys/netinet/tcp_stacks/rack.c
+3-2share/man/man4/ffs.4
+2-2usr.sbin/ngctl/main.c
+228-1933 files not shown
+231-1969 files

HardenedBSD/src c8e27a6sbin/geom/core geom.c, share/man/man5 src.conf.5

Merge remote-tracking branch 'origin/freebsd/15-stable/main' into hardened/15-stable/main

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+40-39sbin/geom/core/geom.c
+31-21sys/kern/vfs_mount.c
+8-0share/man/man5/src.conf.5
+3-0tools/build/options/WITH_IPFILTER_IPFS
+1-2usr.sbin/syslogd/tests/syslogd_format_test_common.sh
+1-0sys/riscv/conf/GENERIC
+84-626 files

HardenedBSD/src 9063968sys/netinet/tcp_stacks rack.c

Mitigate a case where TCP rack can send an extra ack.

Rack will in theory send an extra rate limited ack when we get to a closing state (sending a FIN) so that
if we have only 1 packet outstanding we might encourage the connection to close out. However it does this
always which is not always wise. Change it so that it only does that if its been more than an srtt since
we have had some activity i.e. a send or a receive of a packet.
Reviewed by:tuexen, rscheff
Differential Revision:<https://reviews.freebsd.org/D55459>
DeltaFile
+11-2sys/netinet/tcp_stacks/rack.c
+11-21 files

HardenedBSD/src df93237sys/net rtsock.c

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)
DeltaFile
+2-2sys/net/rtsock.c
+2-21 files

HardenedBSD/src f3be7dfsys/net rtsock.c

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")
DeltaFile
+2-2sys/net/rtsock.c
+2-21 files

HardenedBSD/src 0ff08b8sys/sys elf_common.h

elf_common.h: Sort SHT_ entries

Reviewed by:    jrtc27
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55488
DeltaFile
+3-2sys/sys/elf_common.h
+3-21 files

HardenedBSD/src d7d4da9usr.sbin/bhyve iov.c

bhyve: Fix truncate_iov()

The implementation was simply wrong.  It would always just return the
first entry in the iovec, even if the requested length is larger than
that first entry.

Note, this function will be removed soon, see D53468.

Reported by:    Vinod p n <vinod272 at gmail.com>
Reviewed by:    des, emaste, Hans Rosenfeld <rosenfeld at grumpf.hope-2000.org>
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D55438
DeltaFile
+5-10usr.sbin/bhyve/iov.c
+5-101 files

HardenedBSD/src f4f9054sbin/camcontrol camcontrol.c

camcontrol: Print 'transport revision'

As described in Serial ATA Revision 3.5a

Reviewed by:    mav
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2044
DeltaFile
+29-0sbin/camcontrol/camcontrol.c
+29-01 files

HardenedBSD/src 9ed56cdusr.sbin/ngctl ngctl.8

ngctl.8: fix incorrect synopsis

Tiny manpage bug I caused in D50241
I left a line in the manpage that shouldn't be there.

MFC after:      3 days
Fixes:          72d01e62b082 ("netgraph: teach ngctl to attach and run itself in a jail")
Reviewed by:    des, markj
Differential Revision:  https://reviews.freebsd.org/D55485
DeltaFile
+0-1usr.sbin/ngctl/ngctl.8
+0-11 files

HardenedBSD/src 6c4777cusr.sbin/ngctl main.c

ngctl: Fix getline loop

I misremembered when I wrote this code: getline() returns -1 on EOF, not
zero, so the loop condition and the error check are both incorrect
(though in practice getline() will never return 0).

MFC after:      3 days
Fixes:          3cbdcabf714d ("ngctl: Modernize code somewhat")
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D55487
DeltaFile
+2-2usr.sbin/ngctl/main.c
+2-21 files

HardenedBSD/src b7ef4f4sys/sys elf_common.h

sys: Restore sorting in sys/elf_common.h

These various definitions are meant to be kept sorted by machine prefix.

Fixes:  2bb61497ca76 ("elf_common.h: Add definitions for LoongArch ELF files")
DeltaFile
+175-175sys/sys/elf_common.h
+175-1751 files

HardenedBSD/src f0b8355share/man/man4 ffs.4 Makefile

ffs.4: Mlink to ufs.4

PR:             293423
MFC after:      3 days
Requested by:   bms
DeltaFile
+3-2share/man/man4/ffs.4
+1-0share/man/man4/Makefile
+4-22 files

HardenedBSD/src d3fec16sbin/geom/core geom.c

sbin/geom: Convert err/warn() to xo_err/warn() and style(9) fixes

Finishing up the libxo conversion of geom by switching err(3) to their
libxo equivalents.

While here, fix some style(9) issues. There are still a few left, but at
least they're fewer now.

Reviewed by:    asomers
Approved by:    asomers (mentor)
Sponsored by:   ConnectWise
Differential Revision:  https://reviews.freebsd.org/D54938

(cherry picked from commit 821243b3877d90290ba519f2aeccf6f48430db32)
DeltaFile
+40-39sbin/geom/core/geom.c
+40-391 files

HardenedBSD/src 72a1252lib/libjail jail.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-1lib/libjail/jail.c
+1-11 files

HardenedBSD/src 41cd9bdlib/libjail jail.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1lib/libjail/jail.c
+1-11 files

HardenedBSD/src 686280clib/libjail jail.c

libjail: avoid a double-free in the MAC label bits

As written, we'll repeatedly jps_free() the first element, which is
obviously bogus.  Fix it to index appropriately.

Fixes:  db3b39f063d9f ("libjail: extend struct handlers [...]")
DeltaFile
+1-1lib/libjail/jail.c
+1-11 files

HardenedBSD/src 5d6dfa5share/man/man5 src.conf.5

src.conf.5: regen documenting WITH_IPFILTER_IPFS

(cherry picked from commit b9b1262a8ef95857101e538145703894e3b880b7)
DeltaFile
+5-1share/man/man5/src.conf.5
+5-11 files

HardenedBSD/src f981908tools/build/options WITH_IPFILTER_IPFS

options: describe WITH_IPFILTER_IPFS

Add a description for WITH_IPFILTER_IPFS.

Fixes:          0ff0c19e7f70 ("ipfilter: Disable ipfs(8) by default")
(cherry picked from commit c112ad75605ccdfcb8bbce2f57b0e7a077f057f8)
DeltaFile
+3-0tools/build/options/WITH_IPFILTER_IPFS
+3-01 files

HardenedBSD/src 7ae432esys/kern vfs_mount.c

vfs_mount.c: Don't call VFS_MOUNT() if only exports are being updated

PR#293198 reports a hang within ZFS when exports
are being updated concurrently with a VOP_SETEXTATTR().
The hang appears to be caused by mishandling of the
z_teardown_lock, but fixing handling of this lock appears
to be a major effort. Since the hang occurs when
VFS_MOUNT() acquires a write/exclusive z_teardown_lock,
which rarely occurs, except when exports are being updated,
this patch avoids the VFS_MOUNT() call for this case.

Avoiding a VFS_MOUNT() call fixes the hang for the case
reported by PR#293198 and is also an optimization.
As such, this patch avoids the VFS_MOUNT() call when only exports
are being updated similar to what was already being done
within vnet prisons.

PR:     293198

(cherry picked from commit 935cf3284f520c90a63baaadb762caaa30084f5c)
DeltaFile
+31-21sys/kern/vfs_mount.c
+31-211 files

HardenedBSD/src 4791189usr.sbin/syslogd/tests syslogd_format_test_common.sh

syslogd/tests: use kern.features to detect INET support

This fixes INET feature detection with kernel configs
that do not include the kern.conftxt sysctl, such as
riscv64 currently[0].

[0] https://ci.freebsd.org/view/Test/job/FreeBSD-main-riscv64-test/16514/testReport/usr.sbin.syslogd/syslogd_forwarded_format_test/O_flag_bsd_forwarded_legacy/

Reviewed by:    markj
Approved by:    emaste (mentor)
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55383

(cherry picked from commit c721ceeb3ef0b29d06e6c3c634579f3bc85cc28b)
DeltaFile
+1-2usr.sbin/syslogd/tests/syslogd_format_test_common.sh
+1-21 files

HardenedBSD/src 86a8a67sys/riscv/conf GENERIC

riscv: GENERIC: enable KERN_TLS

This unskips 585 sys/kern/ktls_test testcases[0] in CI. All 585 tests currently pass.

[0] https://ci.freebsd.org/view/Test/job/FreeBSD-main-riscv64-test/16514/testReport/sys.kern/

Approved by:            emaste (mentor)
MFC after:              3 days
Sponsored by:           The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55376

(cherry picked from commit 1e649491b8567151270095fda3bce8faea394952)
DeltaFile
+1-0sys/riscv/conf/GENERIC
+1-01 files

HardenedBSD/src 869908busr.bin/less lesspipe.sh

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-1usr.bin/less/lesspipe.sh
+1-11 files

HardenedBSD/src 653a013usr.bin/less lesspipe.sh

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1usr.bin/less/lesspipe.sh
+1-11 files

HardenedBSD/src 0ef5177secure/lib/libcrypto/man/man3 Makefile, share/man/man4 multicast.4

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+22-4share/man/man4/multicast.4
+0-1secure/lib/libcrypto/man/man3/Makefile
+22-52 files

HardenedBSD/src 49ab036share/man/man4 multicast.4

multicast.4: Fix disabling multicast forwarding

Reviewed by: markj, glebius
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D55266

(cherry picked from commit f2c2e5b0bf9def01b10651b9802fa38d07d9d265)
DeltaFile
+22-4share/man/man4/multicast.4
+22-41 files

HardenedBSD/src b0476eesecure/lib/libcrypto/man/man3 Makefile

OpenSSL: install EVP_CIPHER_CTX_get_app_data.3 once

A separate EVP_CIPHER_CTX_get_app_data.3 was added in the OpenSSL 3.5.5
import, but the link to EVP_EncryptInit.3 was still being installed
which stomped on the file and created inconsistent entries in the METALOG.

Reviewed by:    emaste
Found by:       package_check script in Cirrus-CI
Fixes:          1731fc70f734 ("OpenSSL: update vendor sources to match 3.5.5 content")
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D55332

(cherry picked from commit c4130a8a84e1ce0fc9c05d2b48f83e66ade302aa)
DeltaFile
+0-1secure/lib/libcrypto/man/man3/Makefile
+0-11 files