HardenedBSD/src 0be0796sys/sys priv.h

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+5-10sys/sys/priv.h
+5-101 files

HardenedBSD/src 28ddc54sys/contrib/dev/athk/ath12k mac.c debugfs_htt_stats.c

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

Conflicts:
        sys/sys/priv.h (unresolved)
DeltaFile
+9,336-1,825sys/contrib/dev/athk/ath12k/mac.c
+6,178-0sys/contrib/dev/athk/ath12k/debugfs_htt_stats.c
+4,684-353sys/contrib/dev/athk/ath12k/wmi.c
+2,346-505sys/contrib/dev/athk/ath12k/dp_mon.c
+2,076-0sys/contrib/dev/athk/ath12k/debugfs_htt_stats.h
+1,814-206sys/contrib/dev/athk/ath12k/wmi.h
+26,434-2,889171 files not shown
+46,377-8,560177 files

HardenedBSD/src 9a86008sys/compat/linux linux_socket.c linux_socket.h, sys/kern kern_event.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+61-0sys/compat/linux/linux_socket.c
+23-15sys/kern/kern_event.c
+5-5usr.sbin/bhyve/iov.c
+2-2usr.sbin/bhyve/iov.h
+1-0sys/compat/linux/linux_socket.h
+92-225 files

HardenedBSD/src 75ff0b3sys/compat/linux linux_socket.c linux_socket.h, sys/kern kern_event.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+61-0sys/compat/linux/linux_socket.c
+23-15sys/kern/kern_event.c
+5-5usr.sbin/bhyve/iov.c
+2-2usr.sbin/bhyve/iov.h
+1-0sys/compat/linux/linux_socket.h
+92-225 files

HardenedBSD/src 0b4f0e0sys/kern kern_event.c

kqueue: compare against the size in kqueue_expand

This is a cosmetic change, rather than a functional one: comparing the
knlistsize against the fd requires a little bit of mental gymnastics to
confirm that this is fine and not doing unnecessary work in some cases.

Notably, one must consider that kq_knlistsize only grows in KQEXTENT
chunks, which means that concurrent threads trying to grow the kqueue
to consecutive fds will usually not result in the list being replaced
twice.  One can also more clearly rule out classes of arithmetic
problems in the final `else` branch.

Reviewed by:    kib, markj
Differential Revision:  https://reviews.freebsd.org/D56209
DeltaFile
+6-4sys/kern/kern_event.c
+6-41 files

HardenedBSD/src 306c904sys/kern kern_event.c

kqueue: add some kn_knlist assertions around knlist_(add|remove)

We currently assert that kn_status is accurate, but there's more room
for error.  Neither of these are very likely, but currently we'd blow up
in SLIST*() macros instead of providing more obvious diagnostics.  It's
perhaps only worth testing these because knlist_remove() requires
getting logic across both f_attach() and f_detach() correct.

Reviewed by:    kib, markj
Differential Revision:  https://reviews.freebsd.org/D56211
DeltaFile
+4-0sys/kern/kern_event.c
+4-01 files

HardenedBSD/src ff1050dsys/kern kern_event.c

kqueue: simplify knote_fdclose()

The influx logic in knote_fdclose() is a little misguided, the resulting
wakeup() call should always be redundant: knote_drop_detached() will
always issue a wakeup before it returns, so anything waiting on *that*
knote that had entered fluxwait should have been woken up then.  This is
the obvious divergence from the other influx/wakeup pattern in the
implementation, which will kn_influx-- and then issue the wakeup after
it has processed all of the knotes it can make progress on.

While we're here, the kq_knlist cannot shrink, so we can avoid that
condition in the loop and avoid potentially excessive wakeups from
fluxwait on kqueues that we didn't touch.

Reviewed by:    kib, markj
Differential Revision:  https://reviews.freebsd.org/D56210
DeltaFile
+12-10sys/kern/kern_event.c
+12-101 files

HardenedBSD/src 14d0bafsys/kern kern_event.c

kqueue: avoid a possible fork-deadlock

kqueue_fork_copy() is likely to have transitioned at least one knote
through a flux state, so we should check whether we need to wake
anything up on the way out to avoid a possible deadlock.

This was a part of D56210, but we'll close the review with the next
commit.

Fixes:  b11289f87123f ("kqueuex(2): add KQUEUE_CPONFORK")
Reviewed by:    kib, markj
DeltaFile
+1-1sys/kern/kern_event.c
+1-11 files

HardenedBSD/src 5d4a39dsys/compat/linux linux_socket.c linux_socket.h

compat/linux: map TCP_USER_TIMEOUT sockopt into TCP_MAXUNACKTIME

After reading both manual pages, our TCP_MAXUNACKTIME is fairly
similar to the TCP_USER_TIMEOUT, the only considerable difference
is ours is in seconds and linux's in milliseconds.

Round up linux's in setsockopt(2) to a next whole second and
clamp ours getter to UINT_MAX ms.

Reviewed by:    tuexen, glebius
Differential Revision: https://reviews.freebsd.org/D56168
MFC after:      2 weeks
Sponsored by:   Sippy Software, Inc.
DeltaFile
+61-0sys/compat/linux/linux_socket.c
+1-0sys/compat/linux/linux_socket.h
+62-02 files

HardenedBSD/src 970e0dbusr.sbin/bhyve iov.c iov.h

bhyve/virtio: Fix comparison of integer expressions of different signedness

It's a bit silly to have iov_to_buf() and buf_to_iov() return a ssize_t
to begin with, just to be able to return -1 for error. Change this to
size_t and use 0 as an error indicator, which won't require any changes
to the code using these functions.

While here, switch iov_to_buf() to use reallocf() instead of realloc().

Reviewed by: jhb
Fixes: 2a514d377b37 ("bhyve/virtio-scsi: Preallocate all I/O requests")
Differential Revision: https://reviews.freebsd.org/D55800
DeltaFile
+5-5usr.sbin/bhyve/iov.c
+2-2usr.sbin/bhyve/iov.h
+7-72 files

HardenedBSD/src 4fed52fstand/efi/loader main.c

loader(8): embedded MD should be the most preferred currdev

A loader built with MD_IMAGE_SIZE is almost always meant for use with
its embedded image and should try that as currdev before anything else.
Recent changes (d69fc3a9dc71, 784150fd2535) seem to have relaxed the ZFS
code's search for a rootfs and exposed this problem.

Reviewed by:    imp, tsoome
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D55979

(cherry picked from commit 0661997cea165e951e4e215e6aed41596d8b1d52)
DeltaFile
+9-9stand/efi/loader/main.c
+9-91 files

HardenedBSD/src d32b7d3sbin/route route_netlink.c, sys/compat/linuxkpi/common/include/linux sysfs.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+25-9sys/compat/linuxkpi/common/include/linux/sysfs.h
+4-0sys/fs/cd9660/cd9660_rrip.c
+2-1sbin/route/route_netlink.c
+1-1usr.sbin/rtadvd/config.c
+32-114 files

HardenedBSD/src 733f5e5sbin/route route_netlink.c, sys/compat/linuxkpi/common/include/linux sysfs.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+25-9sys/compat/linuxkpi/common/include/linux/sysfs.h
+4-0sys/fs/cd9660/cd9660_rrip.c
+2-1sbin/route/route_netlink.c
+1-1usr.sbin/rtadvd/config.c
+32-114 files

HardenedBSD/src d0afeadsys/fs/cd9660 cd9660_rrip.c

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
DeltaFile
+4-0sys/fs/cd9660/cd9660_rrip.c
+4-01 files

HardenedBSD/src 759d8a1sbin/route route_netlink.c

route(8): Show weight of nexthop in multipath routes

Reviewed by: zlei, markj
Differential Revision: https://reviews.freebsd.org/D56202
DeltaFile
+2-1sbin/route/route_netlink.c
+2-11 files

HardenedBSD/src 5bb0f63sys/compat/linuxkpi/common/include/linux sysfs.h

linuxkpi: Handle bin attributes in sysfs attribute groups

For instance, this is used by DRM drivers to declare the EDID property
of an GPU output connector:

    sysctl -b sys.device.drmn1.card0.card0-DP-1.edid | edid-decode

    ...
    Block 0, Base EDID:
      EDID Structure Version & Revision: 1.4
      Vendor & Product Identification:
        Manufacturer: SAM
        Model: 29814
        Serial Number: 810635354 (0x3051505a)
        Made in: week 15 of 2025
    ...

Reviewed by:    bz, emaste, wulf
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55176
DeltaFile
+25-9sys/compat/linuxkpi/common/include/linux/sysfs.h
+25-91 files

HardenedBSD/src 607f6beusr.sbin/rtadvd config.c

rtadvd: Fix validation of the MTU parameter when parsing config

MFC after:      1 week
DeltaFile
+1-1usr.sbin/rtadvd/config.c
+1-11 files

HardenedBSD/src df99d3fsys/dev/acpica acpi_spmc.c, sys/dev/bce if_bce.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+25-5sys/dev/acpica/acpi_spmc.c
+11-5sys/dev/vmm/vmm_dev.c
+8-0sys/kern/kern_jail.c
+1-1sys/powerpc/aim/mmu_oea.c
+1-1sys/dev/bce/if_bce.c
+1-1sys/i386/i386/pmap.c
+47-138 files not shown
+55-2114 files

HardenedBSD/src 88c0e00sys/amd64/amd64 pmap.c, sys/arm/arm pmap-v6.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+25-5sys/dev/acpica/acpi_spmc.c
+11-5sys/dev/vmm/vmm_dev.c
+8-0sys/kern/kern_jail.c
+1-1sys/riscv/riscv/pmap.c
+1-1sys/amd64/amd64/pmap.c
+1-1sys/arm/arm/pmap-v6.c
+47-138 files not shown
+55-2114 files

HardenedBSD/src 683f7a8sys/dev/acpica acpi_spmc.c

acpi_spmc: Call new MS turn on display DSM

Microsoft added a new function index (turn on display, 9) to their DSM
set. This revision calls this, which fixes S0ix on certain machines,
such as the Lenovo Yoga Slim 7i Aura, who's ECs use this method as a
trigger to restore power to certain devices.

See commit 229ecbaac6b3 ("ACPI: x86: s2idle: Invoke Microsoft _DSM
Function 9 (Turn On Display)") on Linux.

Also see the following:
https://learn.microsoft.com/en-us/windows-hardware/design/device-experiences/modern-standby-firmware-notifications#turn-on-display-notification-function-9

Reviewed by:    olce
Approved by:    olce
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D56062
DeltaFile
+20-5sys/dev/acpica/acpi_spmc.c
+20-51 files

HardenedBSD/src 0307db7sys/dev/acpica acpi_spmc.c

acpi_spmc: Fail probe if acpi_spmc device already attached

We cannot have more than one SPMC device.

Reviewed by:    olce
Approved by:    olce
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D56062
DeltaFile
+5-0sys/dev/acpica/acpi_spmc.c
+5-01 files

HardenedBSD/src 0dbbed2sys/netinet6 ip6_mroute.c

ip6_mroute: Fix the type name in sysctl_mfctable()

No functional change since apparently it's fine to compute the size of
a pointer type when the base type is undefined.

Fixes:  0bb9c2b665d9 ("ip6_mroute: FIBify")
DeltaFile
+1-1sys/netinet6/ip6_mroute.c
+1-11 files

HardenedBSD/src f3c7723sys/dev/vmm vmm_dev.c, sys/kern kern_jail.c

vmm: Restore the ability to create VMs as root in a jail

The new PRIV_VMM_CREATE and DESTROY permissions should be allowed by
jails, so need to be added to the list in prison_priv_check().  Then,
modify vmmdev_create() to verify that the jail was created with the
allow.vmm flag.  This is already verified when opening /dev/vmmctl, but
checking again doesn't hurt and ensures that one can't pass the
allow.vmm policy by passing a vmmctl fd along a unix domain socket from
outside the jail.

Rename vmm_priv_check() to vmm_jail_priv_check() to make the function's
purpose more clear.

Reported by:    novel
Reviewed by:    bnovkov
Fixes:          d4c05edd410e ("vmm: Add privilege checks to vmmctl operations")
Differential Revision:  https://reviews.freebsd.org/D56119
DeltaFile
+11-5sys/dev/vmm/vmm_dev.c
+8-0sys/kern/kern_jail.c
+19-52 files

HardenedBSD/src c6a1c12sys/amd64/amd64 pmap.c, sys/arm/arm pmap-v6.c

pmap: Do not use PMAP_LOCK_INIT with kernel_pmap

The kernel_pmap lock is a bit special: it does not need the DUPOK flag,
and it really belongs to a different lock class.  If it belongs to the
same class as regular pmap locks, then witness may report warnings when
performing UMA allocations under a regular pmap lock, if the allocation
triggers a pmap_growkernel() call.

Replace instances of PMAP_LOCK_INIT(kernel_pmap) with inline mtx_init()
calls to silence some witness warnings for harmless behaviour I see with
some uncommitted test programs.

Reviewed by:    alc, kib
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D56185
DeltaFile
+1-1sys/amd64/amd64/pmap.c
+1-1sys/arm/arm/pmap-v6.c
+1-1sys/arm64/arm64/pmap.c
+1-1sys/i386/i386/pmap.c
+1-1sys/powerpc/aim/mmu_oea.c
+1-1sys/powerpc/aim/mmu_oea64.c
+6-63 files not shown
+9-99 files

HardenedBSD/src f3b59bfsys/dev/bce if_bce.c

bce: Fix SYSCTL_IN error check in bce_sysctl_nvram_write()

The condition after SYSCTL_IN was inverted: success (error == 0) returned
immediately and skipped the NVRAM write path, while failure fell through.
Return only when SYSCTL_IN fails.

Signed-off-by: Weixie Cui <cuiweixie at gmail.com>
Reviewed-by: ngie
Pull-Request: https://github.com/freebsd/freebsd-src/pull/2113
DeltaFile
+1-1sys/dev/bce/if_bce.c
+1-11 files

HardenedBSD/src 79b00a4. Makefile.inc1, contrib/xz ChangeLog

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+477-0contrib/xz/ChangeLog
+347-0sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c
+21-0contrib/xz/src/liblzma/common/index.c
+9-10contrib/xz/src/common/tuklib_integer.h
+6-6Makefile.inc1
+12-0sys/arm/broadcom/bcm2835/bcm2835_firmware.h
+872-1620 files not shown
+921-3826 files

HardenedBSD/src eca6e7acontrib/xz ChangeLog, contrib/xz/src/common tuklib_integer.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+477-0contrib/xz/ChangeLog
+347-0sys/arm/broadcom/bcm2835/raspberrypi_virtgpio.c
+21-0contrib/xz/src/liblzma/common/index.c
+9-10contrib/xz/src/common/tuklib_integer.h
+12-0sys/arm/broadcom/bcm2835/bcm2835_firmware.h
+7-3lib/liblzma/config.h
+873-1313 files not shown
+902-2319 files

HardenedBSD/src 7176f76contrib/xz ChangeLog THANKS, contrib/xz/src/common tuklib_integer.h

MFV: xz 5.8.3.

Security:       CVE-2026-34743

(cherry picked from commit f81c1f4339cd20ea89dad51c0f7d96e0e34313a9)
DeltaFile
+477-0contrib/xz/ChangeLog
+21-0contrib/xz/src/liblzma/common/index.c
+9-10contrib/xz/src/common/tuklib_integer.h
+7-3lib/liblzma/config.h
+10-0contrib/xz/src/xz/main.c
+5-0contrib/xz/THANKS
+529-139 files not shown
+541-2215 files

HardenedBSD/src f81c1f4contrib/xz ChangeLog THANKS, contrib/xz/src/common tuklib_integer.h

MFV: xz 5.8.3.

Security:       CVE-2026-34743
MFC after:      3 days
DeltaFile
+477-0contrib/xz/ChangeLog
+21-0contrib/xz/src/liblzma/common/index.c
+9-10contrib/xz/src/common/tuklib_integer.h
+7-3lib/liblzma/config.h
+10-0contrib/xz/src/xz/main.c
+5-0contrib/xz/THANKS
+529-139 files not shown
+541-2215 files

HardenedBSD/src 788f701. ChangeLog THANKS, src/common tuklib_integer.h tuklib_gettext.h

Vendor import of xz 5.8.3 (trimmed)
DeltaFile
+477-0ChangeLog
+21-0src/liblzma/common/index.c
+9-10src/common/tuklib_integer.h
+10-0src/xz/main.c
+5-0THANKS
+2-2src/common/tuklib_gettext.h
+524-129 files not shown
+535-2015 files