HardenedBSD/src a287884sys/dev/ice ice_lib.c, sys/dev/nvme nvme_ns.c nvme.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+7-9sys/dev/nvme/nvme_ns.c
+11-0tests/sys/net/if_bridge_test.sh
+4-3sys/dev/ice/ice_lib.c
+2-2usr.sbin/freebsd-update/freebsd-update.sh
+2-2sys/dev/nvme/nvme.h
+2-2sys/dev/nvme/nvme_ctrlr.c
+28-185 files not shown
+31-1911 files

HardenedBSD/src 1a480d1release/scripts pkg-stage.sh

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-3release/scripts/pkg-stage.sh
+0-31 files

HardenedBSD/src b4496c2release/scripts pkg-stage.sh, sys/dev/ice ice_lib.c

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        release/scripts/pkg-stage.sh (unresolved)
DeltaFile
+7-9sys/dev/nvme/nvme_ns.c
+11-0tests/sys/net/if_bridge_test.sh
+4-3sys/dev/ice/ice_lib.c
+2-2sys/dev/nvme/nvme.h
+2-2usr.sbin/freebsd-update/freebsd-update.sh
+4-0release/scripts/pkg-stage.sh
+30-165 files not shown
+34-1911 files

HardenedBSD/src ced7461usr.sbin/freebsd-update freebsd-update.sh

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
DeltaFile
+2-2usr.sbin/freebsd-update/freebsd-update.sh
+2-21 files

HardenedBSD/src 90eda62release/scripts pkg-stage.sh

release: Include comms/usbmuxd to DVD to ensure ipheth(4) works

PR:             291370
Reviewed by:    emaste, aokblast, dch
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54074
DeltaFile
+1-0release/scripts/pkg-stage.sh
+1-01 files

HardenedBSD/src f5b8123sys/dev/nvme nvme_ns.c

nvme: Improve error message for invalid format value

Improve the wording of the invalid namespace value. Reword the comment
and move a line of code to the block it logically belongs to.

No functional changes intended.

Sponsored by:           Netflix
Differential Revision:  https://reviews.freebsd.org/D51393
DeltaFile
+5-7sys/dev/nvme/nvme_ns.c
+5-71 files

HardenedBSD/src 10efa7csys/dev/nvd nvd.c, sys/dev/nvme nvme.h nvme_ctrlr.c

nvme: Rename NVME_NS_ADDED to NVME_NS_ALIVE and _CHANGED to _DELTA

NVME_NS_ADDED will conflict with a later change, so change it here.
Likewise NVME_NS_CHANGED.

Sponsored by:           Netflix
DeltaFile
+2-2sys/dev/nvme/nvme.h
+2-2sys/dev/nvme/nvme_ctrlr.c
+2-2sys/dev/nvme/nvme_ns.c
+1-1sys/dev/nvd/nvd.c
+7-74 files

HardenedBSD/src c6212b7sys/dev/ice ice_lib.c ice_adminq_cmd.h

ice(4): Add support for 40G maximal PMD speed

E823 backplane devices may support 40G as maximal PMD speed.
Extend port topology reading logic to handle this case.
While at that fix indentation according to FreeBSD style(9).

Signed-off-by: Krzysztof Galazka <krzysztof.galazka at intel.com>

Tested by:      gowtham.kumar.ks_intel.com
Approved by:    kbowling (mentor), erj (mentor)
Sponsored by:   Intel Corporation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53587
DeltaFile
+4-3sys/dev/ice/ice_lib.c
+1-0sys/dev/ice/ice_adminq_cmd.h
+5-32 files

HardenedBSD/src 112a691sys/compat/linuxkpi/dummy/include/linux percpu-defs.h percpu.h

linuxkpi: Add dummy <linux/percpu{,-defs}.h>

There are no consumers right now except the upcoming <linux/eventfd.h>.
This is meant to reproduce the same includes as Linux, in case consumers
of <linux/eventfd.h> implicitly rely on namespace pollution.

Reviewed by:    bz, emaste
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D50851
DeltaFile
+0-0sys/compat/linuxkpi/dummy/include/linux/percpu-defs.h
+0-0sys/compat/linuxkpi/dummy/include/linux/percpu.h
+0-02 files

HardenedBSD/src bc14dcdtests/sys/net if_bridge_test.sh

tests/if_bridge: mark several tests as requring vlan(4) or gif(4)

This makes them "skip" instead of "fail" if the module is not present.
DeltaFile
+11-0tests/sys/net/if_bridge_test.sh
+11-01 files

HardenedBSD/src ff61b38lib/libpfctl libpfctl.c, sbin/pfctl pfctl_radix.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+107-1sys/netpfil/pf/pf_nl.c
+90-0lib/libpfctl/libpfctl.c
+1-40sys/netinet/tcp_sack.c
+8-13usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
+1-19sbin/pfctl/pfctl_radix.c
+16-0sys/netpfil/pf/pf_nl.h
+223-7313 files not shown
+271-10919 files

HardenedBSD/src 5380a2blib/libpfctl libpfctl.c, sbin/pfctl pfctl_radix.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+107-1sys/netpfil/pf/pf_nl.c
+90-0lib/libpfctl/libpfctl.c
+1-40sys/netinet/tcp_sack.c
+8-13usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
+1-19sbin/pfctl/pfctl_radix.c
+16-0sys/netpfil/pf/pf_nl.h
+223-7313 files not shown
+271-10919 files

HardenedBSD/src 0ea8930lib/libc/locale xlocale_private.h, libexec/rtld-elf rtld.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+39-8share/man/man9/device_get_children.9
+11-10sys/sys/bus.h
+18-0sys/kern/subr_bus.c
+2-4lib/libc/locale/xlocale_private.h
+1-1libexec/rtld-elf/rtld.c
+1-0share/man/man9/Makefile
+72-236 files

HardenedBSD/src 0519d17contrib/sqlite3 sqlite3.c sqlite3.h, lib/libc/locale xlocale_private.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+122-81contrib/sqlite3/sqlite3.c
+45-45contrib/sqlite3/sqlite3.h
+39-8share/man/man9/device_get_children.9
+11-10sys/sys/bus.h
+18-0sys/kern/subr_bus.c
+2-4lib/libc/locale/xlocale_private.h
+237-1485 files not shown
+242-15211 files

HardenedBSD/src 8f0b210sys/modules/dtb/am335x Makefile

Update path for TI Am335x device trees

Since Linux DTS has been starting to using vendor subdirs we need
to update this aswell.

Approved by: manu (mentor)
Differential revision: https://reviews.freebsd.org/D53890
DeltaFile
+7-7sys/modules/dtb/am335x/Makefile
+7-71 files

HardenedBSD/src 5c7176busr.sbin/certctl certctl.8

certctl.8: Prefer the new TRUSTDESTDIR variable

With the reimplementation in C of certctl, the environment variable
previously known as CERTDESTDIR was renamed to TRUSTDESTDIR for
consistency.

Although the previous variable is still valid, prefer the new one, as it
is described in the manual page, while the old one is not.

Reviewed by:    des
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D54044
DeltaFile
+2-2usr.sbin/certctl/certctl.8
+2-21 files

HardenedBSD/src 9c5b56asys/dts/arm ufw.dts

sys/dts/arm/ufs.dts: fix compile error

Fix compile error due to the include file am33xx.dtsi has been moved.
The Linux device-tree archive has split the general directory
(ARM/ARM64...) into vendor specific subdirectories since Linux 6.5.

Reviewed by: kp
Approved by: manu (mentor)
Differential revision: https://reviews.freebsd.org/D53894
DeltaFile
+1-1sys/dts/arm/ufw.dts
+1-11 files

HardenedBSD/src 8291ea8sys/netinet6 nd6_rtr.c

netinet6: use IF_ADDR_LOCK instead of IF_AFDATA_LOCK in defrtr_ipv6_only_ifp

It is not clear what exactly this function is locking against.  Seems
like just use some generic interface lock.  The IF_AFDATA_LOCK goes
away soon together with if_afdata[], so put at least something in its
place.  Note that this code is dead anyway (#ifdef EXPERIMENTAL).
DeltaFile
+9-6sys/netinet6/nd6_rtr.c
+9-61 files

HardenedBSD/src 59062fdsys/netinet6 scope6.c

netinet6: use IF_ADDR_LOCK instead of IF_AFDATA_LOCK

It is not clear what exactly this function is locking against.  Seems
like just use some generic interface lock.  The IF_AFDATA_LOCK goes
away soon together with if_afdata[], so put at least something in its
place.
DeltaFile
+9-5sys/netinet6/scope6.c
+9-51 files

HardenedBSD/src f78b139lib/ncurses/tinfo ncurses_cfg.h, share/man/man7 freebsd-base.7

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+122-1sys/dev/usb/controller/xhcireg.h
+29-1share/man/man7/freebsd-base.7
+3-3sys/dev/usb/controller/xhci.c
+3-1sys/dev/usb/controller/xhci_pci.c
+2-2sys/cam/scsi/scsi_all.c
+1-1lib/ncurses/tinfo/ncurses_cfg.h
+160-92 files not shown
+162-118 files

HardenedBSD/src 68c9bf7sys/sys bus.h

bus: Apply consistent style to prototypes

Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.

(cherry picked from commit 6facc476f3056037f8b5cdb5546554ab3a887463)
DeltaFile
+10-10sys/sys/bus.h
+10-101 files

HardenedBSD/src 3cbf647share/man/man9 device_get_children.9 Makefile, sys/kern subr_bus.c

bus: Add device_has_children predicate

Add a device_has_children() function which can be used to check if a
device has children without allocating a list of them which we aren't
going to use, or even counting them.

Also modify device_get_children() so it can be used to query the count
without allocating a list.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    imp, markj
Differential Revision:  https://reviews.freebsd.org/D53918

(cherry picked from commit 330d4437f2100fc05e576763f4f6a7198080663a)
DeltaFile
+39-8share/man/man9/device_get_children.9
+18-0sys/kern/subr_bus.c
+1-0share/man/man9/Makefile
+1-0sys/sys/bus.h
+59-84 files

HardenedBSD/src 74b10f0libexec/rtld-elf rtld.c

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)
DeltaFile
+1-1libexec/rtld-elf/rtld.c
+1-11 files

HardenedBSD/src 844f76clib/libc/locale xlocale_private.h

libc: Simplify __get_locale()

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    fuz
Differential Revision:  https://reviews.freebsd.org/D53908

(cherry picked from commit 5af240c54bd2d9548536c904e841499e1651bcc8)
DeltaFile
+2-4lib/libc/locale/xlocale_private.h
+2-41 files

HardenedBSD/src 69e0415usr.bin/fsync fsync.c

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
DeltaFile
+1-1usr.bin/fsync/fsync.c
+1-11 files

HardenedBSD/src 4c2295csys/sys bus.h

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
DeltaFile
+1-1sys/sys/bus.h
+1-11 files

HardenedBSD/src 27ff0bblib/libc/tests/gen limits_test.c

libc/limits_test: add no-op testcase to satisfy kyua

This test suite is purely tested with compile-time assertions, so
it needs a dummy runtime test to ensure that kyua reports the
file as passing.

Pull Request:   https://github.com/freebsd/freebsd-src/pull/1915
Sponsored by:   The FreeBSD Foundation
Reviewed by:    fuz
Approved by:    markj (mentor)
MFC after:      1 month
Signed-off-by:  Siva Mahadevan <me at svmhdvn.name>
DeltaFile
+4-1lib/libc/tests/gen/limits_test.c
+4-11 files

HardenedBSD/src e37206acontrib/sqlite3 sqlite3.c sqlite3.h

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)
DeltaFile
+122-81contrib/sqlite3/sqlite3.c
+45-45contrib/sqlite3/sqlite3.h
+1-1contrib/sqlite3/VERSION
+1-1contrib/sqlite3/sqlite3.pc.in
+1-1contrib/sqlite3/sqlite3rc.h
+170-1295 files

HardenedBSD/src 9155d4bsys/netinet tcp_sack.c tcp_input.c, sys/netinet/tcp_stacks rack.c

tcp: retire do_newsack - always adhere to RFC6675 SACK

Depreciation notice for net.inet.tcp.newsack is in 15.0.
Remove this tunable for HEAD, streamlining the code slightly.

Reviewed by:    tuexen, cc, nickbanks_netflix.com, #transport
Sponsored by:   NetApp, Inc.
Differential Revision: https://reviews.freebsd.org/D54072
DeltaFile
+1-40sys/netinet/tcp_sack.c
+3-8sys/netinet/tcp_input.c
+2-2sys/netinet/tcp_stacks/rack.c
+0-2sys/netinet/tcp_var.h
+6-524 files

HardenedBSD/src 45b2360sys/cam/scsi scsi_all.c, sys/dev/pci pci.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+122-1sys/dev/usb/controller/xhcireg.h
+3-3sys/dev/usb/controller/xhci.c
+2-2sys/cam/scsi/scsi_all.c
+3-1sys/dev/usb/controller/xhci_pci.c
+1-1sys/dev/pci/pci.c
+1-1usr.sbin/bhyve/pci_xhci.c
+132-91 files not shown
+133-107 files