HardenedBSD/src 0a609c0. ObsoleteFiles.inc, bin/mv mv.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+508-0bin/mv/tests/mv_test.sh
+0-295bin/mv/tests/legacy_test.sh
+15-22bin/mv/mv.c
+3-0release/tools/oci-image-minimal.conf
+3-0ObsoleteFiles.inc
+1-1bin/mv/tests/Makefile
+530-3186 files

HardenedBSD/src e9da7d7. ObsoleteFiles.inc, bin/mv mv.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+508-0bin/mv/tests/mv_test.sh
+0-295bin/mv/tests/legacy_test.sh
+15-22bin/mv/mv.c
+3-0release/tools/oci-image-minimal.conf
+3-0ObsoleteFiles.inc
+1-1bin/mv/tests/Makefile
+530-3186 files

HardenedBSD/src e13a08asys/dev/gpio gpiospi.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+2-2sys/dev/gpio/gpiospi.c
+2-21 files

HardenedBSD/src 3bcbd39sys/dev/gpio gpiospi.c

gpiospi: Fix module dependencies.

MFC after:      3 days
Reviewed by:    ray
Differential Revision:  https://reviews.freebsd.org/D47570

(cherry picked from commit 79af8f72b3aff993703778423e83320df0953a37)
DeltaFile
+2-2sys/dev/gpio/gpiospi.c
+2-21 files

HardenedBSD/src ca1f1d2release/tools oci-image-minimal.conf

release: Add missing dependencies in the minimal OCI image

The pkg-bootstrap binary depends on fetch.

Reviewed by:    cperciva, emaste, bapt
Differential Revision:  https://reviews.freebsd.org/D47661
MFC after:      1 day
DeltaFile
+3-0release/tools/oci-image-minimal.conf
+3-01 files

HardenedBSD/src d4fb598bin/mv/tests mv_test.sh

mv: Add test cases for command-line options.

Sponsored by:   Klara, Inc.
Reviewed by:    asomers
Differential Revision:  https://reviews.freebsd.org/D47582
DeltaFile
+117-0bin/mv/tests/mv_test.sh
+117-01 files

HardenedBSD/src 2822a79. ObsoleteFiles.inc, bin/mv/tests mv_test.sh legacy_test.sh

mv: Convert tests to ATF.

Sponsored by:   Klara, Inc.
Reviewed by:    asomers, markj
Differential Revision:  https://reviews.freebsd.org/D47569
DeltaFile
+391-0bin/mv/tests/mv_test.sh
+0-295bin/mv/tests/legacy_test.sh
+3-0ObsoleteFiles.inc
+1-1bin/mv/tests/Makefile
+395-2964 files

HardenedBSD/src dc6105ebin/mv mv.c

mv: More style nits.

Sponsored by:   Klara, Inc.
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D47568
DeltaFile
+15-22bin/mv/mv.c
+15-221 files

HardenedBSD/src ad4e3cesys/dev/ath if_ath_tx.c, sys/dev/usb usbdevs

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+28-19usr.sbin/ppp/ppp.8
+10-0sys/net80211/ieee80211.h
+5-0sys/dev/usb/wlan/if_uath.c
+2-2sys/dev/ath/if_ath_tx.c
+2-1sys/dev/usb/usbdevs
+47-225 files

HardenedBSD/src 712a59esys/dev/ath if_ath_tx.c, sys/dev/usb usbdevs

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+28-19usr.sbin/ppp/ppp.8
+10-0sys/net80211/ieee80211.h
+5-0sys/dev/usb/wlan/if_uath.c
+2-2sys/dev/ath/if_ath_tx.c
+2-1sys/dev/usb/usbdevs
+47-225 files

HardenedBSD/src da79664bin/ps ps.1, sys/dev/mlx5/mlx5_en mlx5_en_main.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+16-4sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+6-0sys/dev/sound/driver.c
+1-4sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c
+1-1bin/ps/ps.1
+24-94 files

HardenedBSD/src ab2dfb9bin/ps ps.1

ps.1: remove stray tab which breaks columns alignment

(cherry picked from commit 645f8bcba9c8cf4eac69cc66d4112800a496193f)
DeltaFile
+1-1bin/ps/ps.1
+1-11 files

HardenedBSD/src 8925ea5sys/dev/mlx5/mlx5_en mlx5_en_main.c

mlx5en: improve reporting of kernel TLS, IPSEC offload, and ratelimit caps

Sponsored by:   NVidia networking

(cherry picked from commit de7a92756f0ab50e5e243ce9ac680e27f5c41370)
DeltaFile
+16-4sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+16-41 files

HardenedBSD/src 842a2c1sys/dev/usb/wlan if_uath.c

uath: flush data/commands to the firmware before changing channel / state

The driver wasn't stable - it would start fine, but during scan
it would eventually hang and no further command endpoint transfers
would complete.

After adding some debugging and looking at the logs I noticed that
things went sideways once a /data/ frame was sent.  The channel
change config happened between the data frame being sent and
being completed.

My guess is that the firmware doesn't like a channel change
and reset whilst there's pending data frames.  Checking the Linux
driver I found that it was doing a flush before a channel change,
and we're doing it afterwards.  This acts like a fence around
ensuring scheduled TX work has completed.  In net80211 the
transmit path and the control path aren't serialised, so it's
very often the case that ioctls, state changes, etc occur
whilst in parallel there are frame transmits being scheduled.

    [19 lines not shown]
DeltaFile
+4-0sys/dev/usb/wlan/if_uath.c
+4-01 files

HardenedBSD/src 7098b90sys/dev/usb usbdevs, sys/dev/usb/wlan if_uath.c

usb: fix the ID for the dual-band Wistron AR5523 USB NIC

Use the correct ID, as I have one of these NICs.
Add the previous one back in case it's out there in the wild.

@emaste did a bit of a dig into the product numbers.
@sam did change the ID from 0x0828 -> 082a in a commit
a long while back. It's worth reading the code review for
further details.

However, I do have one of these NICs and I verified that
it indeed has the given ID, and with some follow-up work
to fix some race conditions, it works fine in 2GHz 11bg
and 5GHz 11a operation.

Differential Revision:  https://reviews.freebsd.org/D47654

Obtained from:  Linux, drivers/net/wireless/ath/ar5523/ar5523.c
DeltaFile
+2-1sys/dev/usb/usbdevs
+1-0sys/dev/usb/wlan/if_uath.c
+3-12 files

HardenedBSD/src 1375790sys/dev/ath if_ath_tx.c, sys/net80211 ieee80211.h

net80211: add IEEE80211_IS_QOS_NULL()

This will be useful when fixing up the sequence number generation
and checks, as the rules around how sequence numbers are generated
have been clarified in 802.11-2016 and later.  QoS-NULL frames are
explicitly marked as "any sequence number".

But for now, just create a macro and use it in the one place
it's currently being used as a check - ath(4).

* Add IEEE80211_IS_QOS_NULL().
* Change the "will this frame go into the TX block-ack window" check
  in the ath(4) transmit path.  Note this changes the check to be
  more specific, but both paths already had previous checks to ensure
  they're QoS data frames.

Locally tested:

* ath(4), AR9380, STA mode w/ AMPDU TX/RX enabled and negotiated

    [2 lines not shown]
DeltaFile
+10-0sys/net80211/ieee80211.h
+2-2sys/dev/ath/if_ath_tx.c
+12-22 files

HardenedBSD/src 8b29ab3sys/netpfil/ipfilter/netinet ip_fil_freebsd.c

ipfilter: Avoid holding a lock while stopping

Avoid calling _callout_stop_safe with a non-sleepable lock held when
detaching by initializing callout_init_rw() with CALLOUT_SHAREDLOCK, and
avoiding re-initialization inside the timer function.

PR:             282478
Reviewed by:    cy, emaste, jhb, markj
Tested by:      cy
Approved by:    emaste (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D47530

(cherry picked from commit 1fa6daaafd74c1a457dcfe26e0a5943b5441dc9d)
(cherry picked from commit a0618fbe19dfedcdf01b4c232fe6669ae19505c4)
(cherry picked from commit 650900cc2f607458d32d333bd7ab0aa10be13ba4)
DeltaFile
+1-4sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c
+1-41 files

HardenedBSD/src 2fb5f13sys/dev/sound driver.c

sound: Include ai2s and davbus for PowerPC

Include PowerPC ai2s and davbus sound modules in the metadriver.

Reviewed by:    christos, emaste
Approved by:    emaste (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D47467

(cherry picked from commit cdd3234186b19e1b9d7cfc985ef8d247552b0f11)
DeltaFile
+6-0sys/dev/sound/driver.c
+6-01 files

HardenedBSD/src 21ca690usr.sbin/ppp ppp.8

ppp.8: Fix typo cuad0 -> cuau0

Fix a typo that was missed probably because it was capitalized.
Mark up with .Pa and fix capitalization.

Specify that cuaUX and cuauX are for USB and UART attachments
respectively.

- Silence most lint warnings
- Update outdated links
- Minor style fixes
- Some igor(1) warnings were ignored on purpose

PR:             248359
Reviewed by:    imp, mhorne, Alexander Ziaee <concussious.bugzilla at runbox.com>
Approved by:    emaste (mentor)
Fixes:  839f11a4fe18 ("A number of places in the source tree still reference cuad.* after sio(4) was deprecated by uart(4).")
MFC after:      1 week
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1515
DeltaFile
+28-19usr.sbin/ppp/ppp.8
+28-191 files

HardenedBSD/src 64ec00dsys/net rtsock.c, usr.sbin/bsdinstall/scripts wlanconfig

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+21-16sys/net/rtsock.c
+2-1usr.sbin/bsdinstall/scripts/wlanconfig
+23-172 files

HardenedBSD/src 548378fsys/net rtsock.c, usr.sbin/bsdinstall/scripts wlanconfig

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+21-16sys/net/rtsock.c
+2-1usr.sbin/bsdinstall/scripts/wlanconfig
+23-172 files

HardenedBSD/src 29ffca5libexec/rc rc.conf, libexec/rc/rc.d ipfilter

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+23-4sbin/ipf/libipf/load_poolnode.c
+21-2sbin/ipf/libipf/load_hashnode.c
+7-1libexec/rc/rc.d/ipfilter
+1-0libexec/rc/rc.conf
+52-74 files

HardenedBSD/src ced92easbin/ipf/libipf load_poolnode.c

ipfilter: Close a bracket in the poolnode error message

When a node in a tree is discovered in error, i.e. duplicate, the
IP address of the node is printed but no closing bracket completes
the node in the message. Fix this.

(cherry picked from commit 858a7a27f5c82c8364a0eb8bf1d9f0b1315422aa)
DeltaFile
+1-0sbin/ipf/libipf/load_poolnode.c
+1-01 files

HardenedBSD/src 17c21e9sbin/ipf/libipf load_poolnode.c

ipfilter: Support printing of IPv6 addresses in error message

Replace inet_ntoa(3) with inet_ntop(3). This supporting the printing of
IPv6 IP addresses in addition to IPv4 IP addresses in error message.

(cherry picked from commit 3a2cb65b6e6dc1e71013db27ce143eb8670a1755)
DeltaFile
+22-4sbin/ipf/libipf/load_poolnode.c
+22-41 files

HardenedBSD/src 43d49c1sbin/ipf/libipf load_hashnode.c

ipfilter: Include the IP address in error message

Include the IP address in the message when a hashnode add error occurs.
This helps to identify the ippool.conf statement that the error occurred.

(cherry picked from commit 9da30a23a5ecae151ae1db045354fab105c69e12)
DeltaFile
+21-2sbin/ipf/libipf/load_hashnode.c
+21-21 files

HardenedBSD/src c6385basbin/ipf/libipf load_poolnode.c

ipfilter: Print the pool name when adding a poolnode fails

Printing the pool node (IP address) only leads to speculation which
pool the failed add occurred. This is especially useful when the same
IP address is listed in multiple pools.

(cherry picked from commit 470c680cfbf5f6cd9ac392b210b97b41d02cd969)
DeltaFile
+2-2sbin/ipf/libipf/load_poolnode.c
+2-21 files

HardenedBSD/src 3b032c0libexec/rc rc.conf, libexec/rc/rc.d ipfilter

ipfilter: Set ipf -T optionlist at boot

There is no easy way to set ipfilter optionlist variables during boot.
Add plumbing to the rc script to support this.

PR:                     130555
Reviewed by:            jlduran
Differential Revision:  https://reviews.freebsd.org/D47346

(cherry picked from commit 8d6feaaaa26f444abb209360e52b993e39cb81bb)
DeltaFile
+7-1libexec/rc/rc.d/ipfilter
+1-0libexec/rc/rc.conf
+8-12 files

HardenedBSD/src d469483sbin/ipf/libipf load_poolnode.c

ipfilter: Avoid overrunning the message buffer

Avoid overrunning the message buffer when printing an ippool btree error.
We do this in two ways. First we increase the message buffer from 80 to
255 bytes and secondly we replace strcat(3) with strlcat(3).

(cherry picked from commit 42935716286e7887bfeb9dd8daea72d6a5d40908)
DeltaFile
+2-2sbin/ipf/libipf/load_poolnode.c
+2-21 files

HardenedBSD/src f9d3c2asbin/ipf/libipf load_hashnode.c

ipfilter: Print the hash name when adding a hashnode fails

As with when printing errors for failed poolnodes, printing the hash
node (IP address) only leads to speculation which hash pool the failed
add occurred. This is especially useful when the same IP address is
listed in multiple hash pools.

(cherry picked from commit 8aae4220d76602f22291d7567ba0c61b9aa8c188)
DeltaFile
+1-1sbin/ipf/libipf/load_hashnode.c
+1-11 files

HardenedBSD/src 5399052usr.sbin/bsdinstall/scripts wlanconfig

bsdinstall: wlanconfig: fix interface UP on (re-)starting wpa_supplicant

Make sure an interface is back up before (re-)starting wpa_supplicant
in wlanconfig not relying on wpa to UP the interface (though we fixed
that).

Sponsored by:   The FreeBSD Foundation
Reviewed by:    emaste (in D47491)
MFC after:      3 days
Differential Revision: https://reviews.freebsd.org/D47491
DeltaFile
+2-1usr.sbin/bsdinstall/scripts/wlanconfig
+2-11 files