FreeBSD/src 6bb3f20sys/kern kern_ktrace.c

ktrace: do not enqueue request if the process' ktrioparams are freed

The p_ktrioparms are freed on termination of tracing.  Any ktr requests
added to the queue after that would hang there and leak on the struct
proc recycling, or trigger an assert in the process destructor for debug
builds.

Reported and tested by: pho
Reviewed by:    markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54804
DeltaFile
+8-2sys/kern/kern_ktrace.c
+8-21 files

FreeBSD/src b19f74ccrypto/openssh includes.h

openssh: Include <fcntl.h> explicitly in includes.h

This was previously included due to nested includes in Heimdal's
headers.  Without this, the build fails with an error due to redefining
AT_FDCWD.

clang:

In file included from crypto/openssh/sshd-session.c:46:
/usr/obj/.../tmp/usr/include/fcntl.h:232:9: error: 'AT_FDCWD' macro redefined [-Werror,-Wmacro-redefined]
  232 | #define AT_FDCWD                -100
      |         ^
crypto/openssh/openbsd-compat/bsd-misc.h:69:10: note: previous definition is here
   69 | # define AT_FDCWD (-2)
      |          ^

GCC (can't be disabled):

In file included from crypto/openssh/sshd-session.c:46:

    [14 lines not shown]
DeltaFile
+3-0crypto/openssh/includes.h
+3-01 files

FreeBSD/src 7904194crypto/openssh ssh_namespace.h, crypto/openssh/openbsd-compat libressl-api-compat.c

openssh: Don't include an unused EVP_CIPHER_CTX_get_iv() stub

This stub isn't actually used on modern versions of OpenSSL for which
OpenSSH uses EVP_CIPHER_CTX_get_updated_iv instead via a wrapper macro.

However, the wrapper macro conflicted with the existing namespace
macro triggering an error on GCC:

In file included from crypto/openssh/sshd-session.c:65:
crypto/openssh/openbsd-compat/openssl-compat.h:71:11: error: "EVP_CIPHER_CTX_get_iv" redefined [-Werror]
   71 | #  define EVP_CIPHER_CTX_get_iv EVP_CIPHER_CTX_get_updated_iv
      |           ^~~~~~~~~~~~~~~~~~~~~
In file included from <command-line>:
crypto/openssh/ssh_namespace.h:12:9: note: this is the location of the previous definition
   12 | #define EVP_CIPHER_CTX_get_iv                   Fssh_EVP_CIPHER_CTX_get_iv
      |         ^~~~~~~~~~~~~~~~~~~~~

The error was masked on clang due to MIT krb5 adding a blanket
-Wno-macro-redefined.  Building sshd-session without Kerberos support

    [6 lines not shown]
DeltaFile
+5-3crypto/openssh/openbsd-compat/libressl-api-compat.c
+0-1crypto/openssh/ssh_namespace.h
+5-42 files

FreeBSD/src e5e98c2crypto/openssh monitor.c sshd-session.c

openssh: blocklist: Use NetBSD probes

Use NetBSD probe locations for consistency.  We have submitted all
improved or missing probes, keeping them synchronized with NetBSD (our
blocklist upstream) should simplify upgrades and maintenance, as the
locations of these probes are a moving target, depending on upstream
OpenSSH changes.

Additionally, use BLACKLIST_AUTH_FAIL exclusively for now.  At the time
of this commit BLACKLIST_BAD_USER, is a no-op.  However, it will change
in a future upgrade.

Also, enhance blacklist notification messages for better debugging by
making them more descriptive.

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

    [5 lines not shown]
DeltaFile
+12-2crypto/openssh/monitor.c
+9-4crypto/openssh/sshd-session.c
+4-2crypto/openssh/auth.c
+1-4crypto/openssh/auth2.c
+2-2crypto/openssh/auth-pam.c
+0-2crypto/openssh/packet.c
+28-166 files

FreeBSD/src 7ca599acrypto/openssh ChangeLog sshd-auth.c, crypto/openssh/regress/misc/ssh-verify-attestation ssh-verify-attestation.c

OpenSSH: Update to 10.0p2

Full release notes are available at
https://www.openssh.com/txt/release-10.0

Selected highlights from the release notes:

Potentially-incompatible changes

- This release removes support for the weak DSA signature algorithm.
  [This change was previously merged to FreeBSD main.]

- This release has the version number 10.0 and announces itself as
  "SSH-2.0-OpenSSH_10.0".  Software that naively matches versions using
  patterns like "OpenSSH_1*" may be confused by this.

- sshd(8): this release removes the code responsible for the user
  authentication phase of the protocol from the per-connection
  sshd-session binary to a new sshd-auth binary.

    [17 lines not shown]
DeltaFile
+1,864-1,164crypto/openssh/ChangeLog
+888-0crypto/openssh/sshd-auth.c
+433-411crypto/openssh/moduli
+433-0crypto/openssh/regress/misc/ssh-verify-attestation/ssh-verify-attestation.c
+260-140crypto/openssh/sshd.c
+120-212crypto/openssh/sshd-session.c
+3,998-1,927128 files not shown
+6,483-3,098134 files

FreeBSD/src 466bad4share/man/man5 src.conf.5, tools/build/options WITHOUT_SOUND

src.conf.5: Add WITHOUT_SOUND description

Fixes: f74f891581bc ("src.opts: Introduce MK_SOUND")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+6-1share/man/man5/src.conf.5
+4-0tools/build/options/WITHOUT_SOUND
+10-12 files

FreeBSD/src 2d8ec3bkrb5/lib/krb5 version.map

krb5: Fix another GCC build issue

Fixes:          1876de606eb8
X-MFC with:     1876de606eb8
MFC after:      2 weeks
DeltaFile
+0-4krb5/lib/krb5/version.map
+0-41 files

FreeBSD/src c592d54sys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: fix build for non-debug kernels

lkpi_nl80211_band_name() is only available under LINUXKPI_DEBUG_80211.
IMPROVE in theory should be as well or defined to nothing but we cannot
do that in cfg80211.h mac80211.h where we possibly (re-)define this.

Put an #ifdef around the IMPROVE call for now (untested).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Fixes:          768332d61948
Reported by:    CI
DeltaFile
+2-0sys/compat/linuxkpi/common/src/linux_80211.c
+2-01 files

FreeBSD/src b3647e2usr.bin/netstat inet.c

netstat: fix a segfault with --libxo

Fix a segfault when printing the "protocol" field.  The field-format and
encoding-format were expecting different numbers of arguments.

Also, fix the width of the tcp-state field in encoded output.

PR:             292228
Fixes:          c2b08c13c20 netstat: add support for UDP-Lite endpoints
Sponsored by:   ConnectWise
Reviewed by:    tuexen, js, des
Differential Revision: https://reviews.freebsd.org/D54567

(cherry picked from commit 3b6615ec0332f901fcc9e9307f78717424f09c1e)
DeltaFile
+5-6usr.bin/netstat/inet.c
+5-61 files

FreeBSD/src 3b5c296tests/sys/fs/fusefs mockfs.cc

fusefs: Fix further intermittency in the BadServer.ShortWrite test case

After being unmounted, the mockfs server would occasionally read from
/dev/fuse again, if the main function didn't exit fast enough, getting
an ENODEV error.  Handle that appropriately.

Reported by:    Siva Mahadevan <me at svmhdvn.name>
Fixes:          d86025c1d49c84c4dc8c3635c83c078ad56e5a53
Reviewed by:    Siva Mahadevan <me at svmhdvn.name>
Differential Revision: https://reviews.freebsd.org/D54331

(cherry picked from commit f51e9d0e0988df58c94db586ab5c8b5fd091c004)
DeltaFile
+5-1tests/sys/fs/fusefs/mockfs.cc
+5-11 files

FreeBSD/src 3b44f04sbin/geom/core geom.c

gpart: "gpart --libxo:JP list" duplicates attribute keys

Add leaf-list modifier to attrib as it's possible to have multiple
attributes on a gpart provider.

I purposely made it so that the normal output still says "attrib:" just
so we don't break any scripts people may be using to parse the output,
but the libxo output now says "attribute" just like `gpart show` will do
once https://reviews.freebsd.org/D53950 is merged.

PR:             291377
Reviewed by:    asomers
Sponsored by:   ConnectWise
Differential Revision: https://reviews.freebsd.org/D54080

(cherry picked from commit a0347b0f3a6088872c29eddb85154478d543dffb)
DeltaFile
+6-2sbin/geom/core/geom.c
+6-21 files

FreeBSD/src 8e1c85ftools/build/mk OptionalObsoleteFiles.inc

OptionalObsoleteFiles.inc: Treat compat runtime loaders as libraries

Binaries require the runtime loader to use shared libraries, and
removing the runtime loader in `make delete-old` while leaving the
libraries around makes it impossible to use those shared libraries.
Treat rtld as a de facto dependency of shared libraries to ensure it
is not removed until the corresponding shared libraries are removed.

Differential Revision:  https://reviews.freebsd.org/D52210
DeltaFile
+1-1tools/build/mk/OptionalObsoleteFiles.inc
+1-11 files

FreeBSD/src 8d82dafsys/netinet sctp_bsd_addr.c

sctp: support bridge interfaces

Reported by:    Timo Völker
Tested by:      Timo Völker
MFC after:      3 days
DeltaFile
+1-0sys/netinet/sctp_bsd_addr.c
+1-01 files

FreeBSD/src eced166tools/tools/nanobsd legacy.sh

nanobsd: Avoid unnecessary subshell execution

Mimic c99bb5747f5e ("nanobsd: minor formatting cleanup") and cleanup
_create_code_slice(), somehow I missed it when rebasing.

No functional change intended.

Fixes:          ecc039be7fdd ("nanobsd: Add a NO_ROOT build option")
MFC after:      3 days
DeltaFile
+2-2tools/tools/nanobsd/legacy.sh
+2-21 files

FreeBSD/src aed4089tools/tools/nanobsd defaults.sh

nanobsd: Use NANO_DEF_{UNAME,GNAME}

Prefer to use NANO_DEF_UNAME and NANO_DEF_GNAME instead of a fixed
"root/wheel".

Fixes:          61ac7309c366 ("nanobsd: Add a provisional populate_part function")
MFC after:      3 days
DeltaFile
+2-2tools/tools/nanobsd/defaults.sh
+2-21 files

FreeBSD/src 9b91d49tools/build/options makeman.lua

makeman.lua: Update for src.conf in the src tree

Copy the text change from the shell makeman to makeman.lua.

Fixes: dd8c666d8b78 ("src.sys.mk: Support src.conf in SRCTOP")
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 2619d439fa860db734dbbf4b153c5ac9b15c7e49)
DeltaFile
+5-2tools/build/options/makeman.lua
+5-21 files

FreeBSD/src 9fb909dtests/sys/fs/fusefs Makefile, tests/sys/fs/tarfs tarfs_test.sh

tests: Increase timeout

Bump the timeout value, to avoid cutoff on emulated architectures on
ci.freebsd.org.

Reported by:    Jenkins
Reviewed by:    ngie
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54550

(cherry picked from commit 47015e4546619151f9bff548a3758b72286d04ed)
(cherry picked from commit a551b0524953cbfa4f1035c6d968623e64f4436a)
(cherry picked from commit a4f0a60e05293f3f517324f3ebc41046a79a9feb)
DeltaFile
+1-1tests/sys/fs/fusefs/Makefile
+1-1tests/sys/fs/tarfs/tarfs_test.sh
+1-1tests/sys/geom/class/eli/reentrancy_test.sh
+1-1tests/sys/mac/portacl/Makefile
+1-1tests/sys/netpfil/pf/rules_counter.sh
+1-1tests/sys/kern/jailmeta.sh
+6-61 files not shown
+7-67 files

FreeBSD/src 3830c62tests/sys/netpfil/pf rules_counter.sh

pf tests: give rules_counter:4G more time

Sponsored by:   Rubicon Communications, LLC ("Netgate")

(cherry picked from commit 8217075f9ecb12fa9a4cf746541b9d3e1dc57e79)
DeltaFile
+1-0tests/sys/netpfil/pf/rules_counter.sh
+1-01 files

FreeBSD/src c670af3sys/net80211 ieee80211_ht.c

net80211: correct return code for ieee80211_ampdu_request()

We used to return the result of (*ic_send_action) directly but
ieee80211_ampdu_request() returns 1 on success and 0 on error,
which is contrary to the result of (*ic_send_action).  Deal with
that accordingly and update the documentation of the function.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D54794
DeltaFile
+13-5sys/net80211/ieee80211_ht.c
+13-51 files

FreeBSD/src 768332dsys/compat/linuxkpi/common/include/linux ieee80211.h, sys/compat/linuxkpi/common/include/net cfg80211.h

LinuxKPI: 802.11: factor out rate logic for mandatory channels

I was looking at rate work for another problem and found more flags
in ath9k (which we will likely never need).  The documentation then
revealed the "mandatory" flags as well and with discussions about
cfg80211 going on I decided to use the momentum and split our
"supp_rates" setup between lkpi_lsta_alloc() and wiphy_register().

There should be no functional change.

While there also initialize max_rc_amsdu_len.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+86-24sys/compat/linuxkpi/common/src/linux_80211.c
+12-1sys/compat/linuxkpi/common/include/linux/ieee80211.h
+2-2sys/compat/linuxkpi/common/include/net/cfg80211.h
+100-273 files

FreeBSD/src 6637e8fkrb5/lib/krb5 Makefile

krb5: Fix gcc14 build

Fixes:          1876de606eb8
X-MFC with:     1876de606eb8
MFC After:      2 weeks
DeltaFile
+0-2krb5/lib/krb5/Makefile
+0-21 files

FreeBSD/src 96acaa9sys/compat/freebsd32 freebsd32.h, sys/sys abi_compat.h

compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches

uint64_t is 4-byte aligned on i386, but is 8-bytes aligned on all other
32bit arches FreeBSD supports.  Provide the freebsd32_uint64_t type and
the FU64_CP() macro, which are intended to be used where 32bit ABI uses
(u)int64_t type, and do proper layout and copying for the aggregate type.

Reviewed by:    des, emaste
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54663
DeltaFile
+10-1sys/compat/freebsd32/freebsd32.h
+8-0sys/sys/abi_compat.h
+18-12 files

FreeBSD/src be1b2dasys/compat/freebsd32 freebsd32.h, sys/sys abi_compat.h

sys/abi_compat.h: fix UB for bintime32 handling

Do not cast and then access potentially unaligned uint64_t in the BT_CP()
macro.  Use freebsd32_uint64_t type and FU64_CP() for the frac member.

Noted by:       des
Reviewed by:    des, emaste
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54663
DeltaFile
+1-1sys/compat/freebsd32/freebsd32.h
+1-1sys/sys/abi_compat.h
+2-22 files

FreeBSD/src 1876de6krb5/lib/crypto version.map, krb5/lib/gssapi version.map

krb5: Expose missing symbols

Add symbols found in the port but not in base. This requires replacing
a shared libkrb5profile.so with libkrb5profile.a (with -fPIC so it can
be used by shared libraries). We do this by making libkrb5profile
INTERNALLIB.

Base currently has libkrb5profile in a shared library. The patch moves
those functions to the various "consumer" libraries as the port does.

Symbols that should be in the other libraries are in libkrb5profile.so.
This is causing some ports issues.

PR:             291695
Reported by:    michaelo, markj,  Chris Inacio <inacio at andrew.cmu.edu>
Tested by:      michaelo
Fixes:          ae07a5805b19
Reviewed by:    michaelo (previous version)
MFC after:      2 weeks
Differential revision:  https://reviews.freebsd.org/D54323
DeltaFile
+1,196-0krb5/lib/krb5/version.map
+308-0krb5/lib/gssapi/version.map
+148-0krb5/plugins/kdb/db2/version.map
+128-0krb5/plugins/preauth/pkinit/version.map
+0-74krb5/util/profile/version.map
+59-0krb5/lib/crypto/version.map
+1,839-7458 files not shown
+2,103-11164 files

FreeBSD/src af46d30usr.bin/netstat inet.c

netstat: Remove padding from cc and stack fields

Trim white space padding that gets added libxo fields cc and stack when
using -C and -c.

The padding is only visible if you're using multiple stacks or
congestion algorithms.

PR:             292262
Reviewed by:    asomers, tuexen
Approved by:    asomers (mentor)
Differential Revision:  https://reviews.freebsd.org/D54709

(cherry picked from commit faa31fc0e7acc1c53bba2b69a63e9ff55d24faf7)
DeltaFile
+2-2usr.bin/netstat/inet.c
+2-21 files

FreeBSD/src 01ffd45usr.bin/netstat inet.c

netstat: Remove padding from cc and stack fields

Trim white space padding that gets added libxo fields cc and stack when
using -C and -c.

The padding is only visible if you're using multiple stacks or
congestion algorithms.

PR:             292262
Reviewed by:    asomers, tuexen
Approved by:    asomers (mentor)
Differential Revision:  https://reviews.freebsd.org/D54709

(cherry picked from commit faa31fc0e7acc1c53bba2b69a63e9ff55d24faf7)
DeltaFile
+2-2usr.bin/netstat/inet.c
+2-21 files

FreeBSD/src f5eb24d. cam.h debug.c

rtw89: update Realtek's rtw89 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ).
DeltaFile
+106-340cam.h
+299-0debug.c
+180-51core.c
+184-16mac.c
+144-26rtw8852c.c
+118-51fw.c
+1,031-48434 files not shown
+2,095-71840 files

FreeBSD/src 225a2dc. bf.c bf.h

rtw88: update Realtek's rtw88 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ).
DeltaFile
+7-1bf.c
+7-0bf.h
+3-1sdio.c
+2-0rtw8822cu.c
+2-0rtw8822bu.c
+21-25 files

FreeBSD/src 3161220. mt76.h util.h, mt7915 mcu.c

mt76: update Mediatek's mt76 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ).
DeltaFile
+265-0mt7925/regd.c
+143-41mt7915/mcu.c
+157-2mt76.h
+99-54mt7996/main.c
+3-149mt7925/init.c
+115-0util.h
+782-246207 files not shown
+1,901-676213 files

FreeBSD/src a482969fw/api rx.h nvm-reg.h, mld rx.c mac80211.c

iwlwifi: update Intel's mvm/mld drivers

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ).
DeltaFile
+913-796mld/rx.c
+286-0fw/api/rx.h
+164-0mvm/utils.c
+7-127fw/api/nvm-reg.h
+70-33mld/mac80211.c
+46-54mld/mlo.c
+1,486-1,01060 files not shown
+1,894-1,24866 files