HardenedBSD/src 9d99689sys/modules/ath10k Makefile, sys/modules/brcm80211/brcmfmac Makefile

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+46-40sys/modules/brcm80211/brcmfmac/Makefile
+29-31sys/modules/rtw88/Makefile
+29-28sys/modules/rtw89/Makefile
+26-18sys/modules/mt76/Makefile.inc
+20-18sys/modules/ath10k/Makefile
+20-16sys/modules/mt76/mt7921/Makefile
+170-15111 files not shown
+304-23717 files

HardenedBSD/src e9708dcsys/modules/ath10k Makefile, sys/modules/brcm80211/brcmfmac Makefile

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+46-40sys/modules/brcm80211/brcmfmac/Makefile
+29-31sys/modules/rtw88/Makefile
+29-28sys/modules/rtw89/Makefile
+26-18sys/modules/mt76/Makefile.inc
+20-18sys/modules/ath10k/Makefile
+20-16sys/modules/mt76/mt7921/Makefile
+170-15111 files not shown
+304-23717 files

HardenedBSD/src e8166d7sys/modules/ath10k Makefile, sys/modules/brcm80211/brcmfmac Makefile

LinuxKPI wlan drivers: update makefiles to not use WITH_

Up to now the LinuxKPI wlan drivers were using local variables starting
with a WITH_ prefix in their Makefiles.
That is likely to collide with other mechanisms like WITH_ and WITHOUT_
from src.conf.
Adjust the local variables to use a driver name prefix for now to control
what is built and what is not.
These variables are mainly for the time of development so we can
turn off/on a feature or bus attachment while working on it.  Otherwise
they are there for documentation purposes.  The only reason one would
change them locally would be if someone was to build a very custom
image and not want certain bits (e.g., USB support) being compiled into
the modules.

While here, try to harmonize some parts of the Makefiles.

Suggested by:   imp
Discussed with: imp

    [4 lines not shown]
DeltaFile
+46-40sys/modules/brcm80211/brcmfmac/Makefile
+29-31sys/modules/rtw88/Makefile
+29-28sys/modules/rtw89/Makefile
+26-18sys/modules/mt76/Makefile.inc
+20-18sys/modules/ath10k/Makefile
+20-16sys/modules/mt76/mt7921/Makefile
+170-15111 files not shown
+304-23717 files

HardenedBSD/src 697bdfeshare/man/man4 asmc.4, sys/dev/asmc asmc.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-68usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
+67-0sys/dev/asmc/asmc.c
+22-3sys/fs/nfsserver/nfs_nfsdserv.c
+6-18usr.sbin/bluetooth/rtlbtfw/main.c
+6-18sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
+11-2share/man/man4/asmc.4
+112-1094 files not shown
+120-11410 files

HardenedBSD/src 333b805share/man/man4 asmc.4, sys/dev/asmc asmc.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-68usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
+67-0sys/dev/asmc/asmc.c
+22-3sys/fs/nfsserver/nfs_nfsdserv.c
+6-18sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
+6-18usr.sbin/bluetooth/rtlbtfw/main.c
+11-2share/man/man4/asmc.4
+112-1094 files not shown
+120-11410 files

HardenedBSD/src b5815eesys/fs/nfsserver nfs_nfsdserv.c

nfs_nfsdsocket.c: Allow Copy/Clone from a read-only fs

For some server file system types, such as ZFS, a Copy/Clone
operation can be done across file systems of the same file
system type.

However, without this patch, the Copy/Clone will fail with
EROFS if the input file is on a read-only mounted file system.
This happens because Copy/Clone will try to do a VOP_SETATTR()
of atime to set the atime.

This patch pretends the VOP_SETATTR() of atime worked for
read-only file systems.  It fixes a problem when copying
files from a ZFS snapshot.

PR:     294010
MFC after:      2 weeks
DeltaFile
+22-3sys/fs/nfsserver/nfs_nfsdserv.c
+22-31 files

HardenedBSD/src be035d7share/mk bsd.sys.mk, stand defs.mk Makefile.inc

HBSD: Disable retpolines for the bootloader

We've been building the bootloader with retpolines. With the latest
OpenZFS import, the addition of retpolines now causes the loader to be
too large in size, preventing a successful build.

Applying retpolines to the bootloader doesn't make sense, anyways. An
attacker able to exploit speculative execution vulnerabilities at the
bootloader stage has already won the game.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
Fixes:          8a62a2a5659d1839d8799b4274c04469d7f17c78
(cherry picked from commit 718049e7660f65ad46974e6f8534633158b7195d)
Signed-off-by: Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+2-0share/mk/bsd.sys.mk
+2-0stand/defs.mk
+1-0stand/Makefile.inc
+5-03 files

HardenedBSD/src 1c10825share/man/man4 asmc.4

asmc(4): Bump manpage date after edition

Fixes:          5d7862fb998f ("asmc(4): Add support for backlight(9) interface")
MFC after:      1 month
DeltaFile
+1-1share/man/man4/asmc.4
+1-11 files

HardenedBSD/src f3fc362sys/netgraph/bluetooth/drivers/ubt ng_ubt_rtl.c, usr.sbin/bluetooth/rtlbtfw rtlbtfw.conf main.c

bluetooth: remove redundant 0x0bda entries from ng_ubt_rtl, rtlbtfw

Generic Realtek vendor rules already match all 0x0bda Bluetooth devices.
Remove the redundant per-product entries from ng_ubt_rtl.c,
rtlbtfw main.c, and rtlbtfw.conf.

Reviewed by:    wulf
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D56137
DeltaFile
+0-68usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
+6-18sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
+6-18usr.sbin/bluetooth/rtlbtfw/main.c
+12-1043 files

HardenedBSD/src 5d7862fshare/man/man4 asmc.4, sys/dev/asmc asmc.c asmcvar.h

asmc(4): Add support for backlight(9) interface

MFC after:      1 month
DeltaFile
+66-0sys/dev/asmc/asmc.c
+10-1share/man/man4/asmc.4
+2-1sys/modules/asmc/Makefile
+2-0sys/dev/asmc/asmcvar.h
+80-24 files

HardenedBSD/src 056e290sys/dev/asmc asmc.c

asmc(4): Add PnP record

To load asmc(4) automagically on boot with devd(8).

MFC after:      1 month
DeltaFile
+1-0sys/dev/asmc/asmc.c
+1-01 files

HardenedBSD/src 63ecedbrelease/packages/ucl caroot.ucl

packages: Fix caroot deinstall command

The correct syntax is 'post-deinstall', not 'post-uninstall'.

MFC after:      3 days (stable/15 only)
Reviewed by:    jlduran, des
Differential Revision:  https://reviews.freebsd.org/D56109
Sponsored by:           https://www.patreon.com/bsdivy
DeltaFile
+1-1release/packages/ucl/caroot.ucl
+1-11 files

HardenedBSD/src 5812415sys/dev/dpaa2 dpaa2_ni.c

dpaa2: Perform bus_dma pre-write sync before enqueue operation

Without a proper synchronization payload of the egress TCP segments
can be corrupted as tuexen@ described in
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292006#c31.

This patch is indirectly related to 292006 because a properly enabled
and announced support for the TX checksum offloading hides potentially
corrupted frame payload.

NOTE: Returned back with updated placeholders.

PR:             292006
Reported by:    tuexen@
Reviewed by:    tuexen@
Tested by:      dsl@, tuexen@
Differential Revision:  https://reviews.freebsd.org/D56144
MFC after:      3 days
DeltaFile
+3-3sys/dev/dpaa2/dpaa2_ni.c
+3-31 files

HardenedBSD/src c78e653sys/dev/dpaa2 dpaa2_ni.c

Revert "dpaa2: Perform bus_dma pre-write sync before enqueue operation"

This reverts commit 968164eb650fd986f293512a3faac5c1c9e4d51f.
DeltaFile
+3-3sys/dev/dpaa2/dpaa2_ni.c
+3-31 files

HardenedBSD/src 968164esys/dev/dpaa2 dpaa2_ni.c

dpaa2: Perform bus_dma pre-write sync before enqueue operation

Without a proper synchronization payload of the egress TCP segments
can be corrupted as tuexen@ described in
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292006#c31.

This patch is indirectly related to 292006 because a properly enabled
and announced support for the TX checksum offloading hides potentially
corrupted frame payload.

PR:             292006
Reported by:    tuexen@
Reviewed by:    ...
Tested by:      dsl@
Differential Revision:  <https://reviews.freebsd.org/D###>
MFC after:      3 days
DeltaFile
+3-3sys/dev/dpaa2/dpaa2_ni.c
+3-31 files

HardenedBSD/src 6ea32d0share/man/man5 src.conf.5, share/mk src.opts.mk

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+107-29sys/dev/usb/input/ukbd.c
+105-30sys/dev/hid/hkbd.c
+18-1share/man/man5/src.conf.5
+8-3sys/dev/evdev/evdev_utils.c
+8-0share/mk/src.opts.mk
+2-5sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+248-687 files not shown
+259-7213 files

HardenedBSD/src 157cf79share/man/man5 src.conf.5, share/mk src.opts.mk

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+107-29sys/dev/usb/input/ukbd.c
+105-30sys/dev/hid/hkbd.c
+18-1share/man/man5/src.conf.5
+8-3sys/dev/evdev/evdev_utils.c
+8-0share/mk/src.opts.mk
+2-5sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+248-687 files not shown
+259-7213 files

HardenedBSD/src 0d9676eshare/man/man5 src.conf.5, share/mk src.opts.mk

mk: Disable blacklist when disabling blocklist

WITHOUT_BLOCKLIST, when set, should enforce WITHOUT_BLACKLIST.
This fixes the build when WITHOUT_BLOCKLIST=yes is set.

Reported by:    ivy
Reviewed by:    ivy
Fixes:          7238317403b9 ("blocklist: Rename blacklist to blocklist")
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D56118
DeltaFile
+18-1share/man/man5/src.conf.5
+8-0share/mk/src.opts.mk
+26-12 files

HardenedBSD/src 4f0d0edlibexec Makefile

libexec: Add pkg-serve directory

Add pkg-serve to the list of subdirectories in the Makefile.

Reviewed by:    bapt
Fixes:          b42e852e89cb ("pkg-serve(8): serve pkg repositories over TCP via inetd (8)")
Differential Revision:  https://reviews.freebsd.org/D56009
DeltaFile
+1-0libexec/Makefile
+1-01 files

HardenedBSD/src 920ad3csys/dev/usb/input ukbd.c

ukbd(4): make debug guard consistent with hkbd(4)

Signed-off-by: Toby Slight <tslight at pm.me>

Reviewed by:    wulf
MFC after:      1 month
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1998
DeltaFile
+3-1sys/dev/usb/input/ukbd.c
+3-11 files

HardenedBSD/src bb8230fsys/dev/hid hkbd.c, sys/dev/usb/input ukbd.c

hkbd(4): add some extra handy fn key bindings

- Fn+S for ScrollLock as it's very useful to have ScrollLock on
  FreeBSD's TTY.
- Fn+P for PrtSc/SysRq, as it's another very handy but sadly missing
  key on Macbooks.
- Some other Fn+<key> combinations duplicating existing keys.

Apply the change to ukbd(4) as well.

Signed-off-by: Toby Slight <tslight at pm.me>

Reviewed by:    wulf
MFC after:      1 month
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1998
DeltaFile
+10-0sys/dev/hid/hkbd.c
+10-0sys/dev/usb/input/ukbd.c
+20-02 files

HardenedBSD/src 1033253sys/dev/hid hkbd.c, sys/dev/usb/input ukbd.c

hkbd(4): be more cautious & explicit about Apple vendor checking

Apply the changes to ukbd(4) as well.

Signed-off-by: tslight <tslight at pm.com>

Reviewed by:    wulf
MFC after:      1 month
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1998
DeltaFile
+34-29sys/dev/hid/hkbd.c
+31-26sys/dev/usb/input/ukbd.c
+1-1sys/modules/hid/hkbd/Makefile
+66-563 files

HardenedBSD/src 40f55easys/dev/hid hkbd.c, sys/dev/usb/input ukbd.c

ukbd(4): backport Apple function keys support from hkbd(4)

and expose eject in addition to fn.

Signed-off-by: tslight <tslight at pm.com>

Reviewed by:    wulf
MFC after:      1 month
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1998
DeltaFile
+81-20sys/dev/usb/input/ukbd.c
+10-6sys/dev/hid/hkbd.c
+91-262 files

HardenedBSD/src f54caa0sys/dev/evdev evdev_utils.c, sys/dev/hid hkbd.c hid.h

hkbd(4): fix handling of apple function keys in hid and evdev

Signed-off-by: tslight <tslight at pm.com>

Reviewed by:    wulf
MFC after:      1 month
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1998
DeltaFile
+72-16sys/dev/hid/hkbd.c
+8-3sys/dev/evdev/evdev_utils.c
+2-0sys/dev/hid/hid.h
+82-193 files

HardenedBSD/src d82bcf5sys/netgraph/bluetooth/drivers/ubt ng_ubt.c ng_ubt_intel.c, usr.sbin/bluetooth/iwmbtfw iwmbtfw.8 iwmbtfw.conf

bluetooth: add device IDs for Intel AX411 and BE200 adapters

Add USB product IDs for Intel AX411 (0x0035) and BE200 (0x0036)
Bluetooth adapters to ng_ubt_intel, ng_ubt, iwmbtfw, and iwmbtfw.conf.

Both chips use the same TLV-based firmware protocol as the existing
9260/9560 entries.  Newer Blazar-generation chips (BE201, BE202,
Whale Peak 2) are omitted as they require IML support not yet
implemented in iwmbtfw.

Signed-off-by: Christos Longros <chris.longros at gmail.com>

Reviewed by:    wulf
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56122
DeltaFile
+2-5sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+2-2usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8
+2-0sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c
+1-1usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf
+2-0usr.sbin/bluetooth/iwmbtfw/main.c
+9-85 files

HardenedBSD/src 39fe758sys/amd64/amd64 exec_machdep.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+28-1sys/amd64/amd64/exec_machdep.c
+28-11 files

HardenedBSD/src 38e0ac0sys/amd64/amd64 exec_machdep.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+28-1sys/amd64/amd64/exec_machdep.c
+28-11 files

HardenedBSD/src 7d1285esys/amd64/amd64 exec_machdep.c

amd64 sendsig(): explicitly copy registers from trapframe to ucontext

With the IDT event delivery, previously reserved fields in tf_cs and
tf_ss are guaranteed to be zero. With FRED, these fields are not zero,
which affects the values copied to userspace.

Reviewed by:    markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D56141
DeltaFile
+28-1sys/amd64/amd64/exec_machdep.c
+28-11 files

HardenedBSD/src b84418fsys/dev/usb usbdevs, usr.sbin/syslogd syslogd.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+22-0usr.sbin/syslogd/tests/syslogd_test.sh
+7-0sys/dev/usb/usbdevs
+1-1usr.sbin/syslogd/syslogd.c
+30-13 files

HardenedBSD/src cda272asys/dev/usb usbdevs, usr.sbin/syslogd syslogd.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+22-0usr.sbin/syslogd/tests/syslogd_test.sh
+7-0sys/dev/usb/usbdevs
+1-1usr.sbin/syslogd/syslogd.c
+30-13 files