FreeBSD/src 3d246dbcrypto/openssh sshd-auth.c sshd-session.c

blocklist: Add back probes

The banner exchange was moved to the sshd-auth process in upstream
commit bb781f02d4efd178e329a62a838962bee16e3e9b.  Add it back.

Add back fatal exit probe.

NetBSD PR:      bin/60270 (GNATS)
Reviewed by:    emaste
Fixes:          2574974648c6 ("OpenSSH: Update to 10.3p1")
Differential Revision:  https://reviews.freebsd.org/D57027
DeltaFile
+4-1crypto/openssh/sshd-auth.c
+4-1crypto/openssh/sshd-session.c
+8-22 files

FreeBSD/src 72ab129sys/amd64/amd64 genassym.c, sys/i386/i386 genassym.c

x86: remove sys/mount.h from genassym.c

The header is not needed, and causes some issues with build because it
requires vnode_if.h generated due to transient dependency from vnode.h.

While there, remove unneeded explicit sys/cdefs.h and sys/param.h usage.

Reported and tested by:         thierry
Fixes:  1d5e4020e36e ("vnode: add VIRF_KNOTE flag")
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+0-3sys/amd64/amd64/genassym.c
+0-3sys/i386/i386/genassym.c
+0-62 files

FreeBSD/src c9b5ce2sys/netlink/route rt.c

rtnetlink: Check for allocation failure in nlattr_get_multipath()

Check for alloction failure on `npt_alloc()` for RTA_MULTIPATH
attributes in `nlattr_get_multipath()`.

Reported by:    Joshua Rogers of AISLE Research Team
Reviewed by:    markj
MFC after:      3 days
Differential Revision: https://reviews.freebsd.org/D56954

(cherry picked from commit 188631e43a1a5d2985156141c2e244a925670683)
(cherry picked from commit 3e2308d57080a2345e3db1139683368b504ee0bd)
DeltaFile
+4-0sys/netlink/route/rt.c
+4-01 files

FreeBSD/src 44be923sys/netlink/route rt.c

rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get

Fix length validation of RTA_MULTIPATH attributes in
nlattr_get_multipath() by making sure the user request is align.

PR:             295102
Reported by:    Robert Morris <rtm at lcs.mit.edu>
Reviewed by:    markj
Fixes:          7e5bf68495cc ("netlink: add netlink support")
MFC after:      3 days
Differential Revision: https://reviews.freebsd.org/D56963

(cherry picked from commit 4329663a861ef74796b79b6b0872cfe10d31c591)
(cherry picked from commit 2c6617658f0cabb1e83a47da02882454e4210bd9)
DeltaFile
+2-2sys/netlink/route/rt.c
+2-21 files

FreeBSD/src 3e2308dsys/netlink/route rt.c

rtnetlink: Check for allocation failure in nlattr_get_multipath()

Check for alloction failure on `npt_alloc()` for RTA_MULTIPATH
attributes in `nlattr_get_multipath()`.

Reported by:    Joshua Rogers of AISLE Research Team
Reviewed by:    markj
MFC after:      3 days
Differential Revision: https://reviews.freebsd.org/D56954

(cherry picked from commit 188631e43a1a5d2985156141c2e244a925670683)
DeltaFile
+4-0sys/netlink/route/rt.c
+4-01 files

FreeBSD/src 2c66176sys/netlink/route rt.c

rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get

Fix length validation of RTA_MULTIPATH attributes in
nlattr_get_multipath() by making sure the user request is align.

PR:             295102
Reported by:    Robert Morris <rtm at lcs.mit.edu>
Reviewed by:    markj
Fixes:          7e5bf68495cc ("netlink: add netlink support")
MFC after:      3 days
Differential Revision: https://reviews.freebsd.org/D56963

(cherry picked from commit 4329663a861ef74796b79b6b0872cfe10d31c591)
DeltaFile
+2-2sys/netlink/route/rt.c
+2-21 files

FreeBSD/src 755c1e0sys/amd64/amd64 cpu_switch.S efirt_support.S

kernel: address executable stack warnings in amd64 gcc build

Mark assembly files as not requiring executable stacks.

Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D56946
DeltaFile
+2-0sys/amd64/amd64/cpu_switch.S
+2-0sys/amd64/amd64/efirt_support.S
+2-0sys/amd64/amd64/exception.S
+2-0sys/amd64/amd64/kexec_tramp.S
+2-0sys/amd64/amd64/locore.S
+2-0sys/amd64/amd64/mpboot.S
+12-09 files not shown
+30-015 files

FreeBSD/src 7eb71fdsys/riscv/iommu iommu_pmap.c

riscv: fix GENERIC-NODEBUG build

Reported by:    bz
DeltaFile
+12-0sys/riscv/iommu/iommu_pmap.c
+12-01 files

FreeBSD/src 8dd4330tests/sys/arch/amd64 ptrace-sce-tamper.c

amd64/ptrace-sce-tamper test: get rid of PT_TRACE_ME

PT_TRACE_ME is only useful in combination with exec and there is no
exec in this test.

Signed-off-by:  Alex S <iwtcex at gmail.com>
MFC after:      1 week
DeltaFile
+2-1tests/sys/arch/amd64/ptrace-sce-tamper.c
+2-11 files

FreeBSD/src 61df4berelease/tools ec2-small.conf

EC2: Don't enable firstboot_pkgs in small flavour

The EC2 "base" flavour installs the devel/py-awscli package at boot
time by default; we don't do this in the "small" flavour, so the
default behaviour was to update the FreeBSD-ports repository and
then do nothing with it.

Turn off firstboot_pkgs by default; if someone is using the "small"
flavour of AMIs and wants to install packages at instance launch
time, they simply need to add 'firstboot_pkgs_enable="YES"' to
/etc/rc.conf (which they must already be editing via user-data, in
order to provide the list of packages they want installed).

Sponsored by:   Amazon
MFC after:      3 days
MFC to:         stable/15
Relnotes:       EC2 "small" images now have firstboot_pkgs_enable="NO".
DeltaFile
+1-1release/tools/ec2-small.conf
+1-11 files

FreeBSD/src 5f60d8asys/riscv/conf NOTES

riscv: Add IOMMU to NOTES

Reported by:    bz, ivy
Fixes:          bcecad2c24aa ("riscv: IOMMU support")
DeltaFile
+1-0sys/riscv/conf/NOTES
+1-01 files

FreeBSD/src 9d0b771sbin/pfctl parse.y, tests/sys/netpfil/pf names.sh

pfctl: relax interface name requirement

The FreeBSD network stack, for better or worse, does not impose any
requirements on interface names. As such it's valid for an interface
name to start with a number (or indeed, be something like '⭐').

Allow this in pfctl, and add a test case for the specific case of
interface names starting with a number.

Note that we don't support UTF-8 names fully, so those may still fail.

PR:             295064
MFC after:      1 week
Sponsored by:   Rubicon Communications, LLC ("Netgate")

(cherry picked from commit 4e7c1ff95a5187faee524055f22c4cf4134d1147)
DeltaFile
+40-0tests/sys/netpfil/pf/names.sh
+1-1sbin/pfctl/parse.y
+41-12 files

FreeBSD/src 1dc1b95. ObsoleteFiles.inc, etc/mtree BSD.usr.dist

mtree: Remove unused MANSUBDIRs

MFC after:      3 days
Fixes:          809504f331fd ("man: Kill off MANSUBDIRs")
Reviewed by:    ziaee
Differential Revision:  https://reviews.freebsd.org/D57029
DeltaFile
+0-8etc/mtree/BSD.usr.dist
+1-0ObsoleteFiles.inc
+1-82 files

FreeBSD/src 1836330sys/dev/thunderbolt nhi.c router.c

thunderbolt: make code -Wunused clean

This change modifies code paths and uses `__diagused` to address `-Wunused`
issues that occur when `THUNDERBOLT_DEBUG` == `0`.

MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D55575
DeltaFile
+11-7sys/dev/thunderbolt/nhi.c
+7-4sys/dev/thunderbolt/router.c
+3-3sys/dev/thunderbolt/tb_debug.c
+1-1sys/dev/thunderbolt/tb_acpi_pcib.c
+1-1sys/dev/thunderbolt/tb_debug.h
+1-1sys/dev/thunderbolt/tb_pcib.c
+24-176 files

FreeBSD/src 96eaa68sys/net80211 ieee80211_node.c _ieee80211.h

net80211: define a type for rssi values

Due to net80211 keeping values in 0.5dBm relative to the noise floor
an int8_t is not good enough to prevent a double wrap around, which
means the reported rssi values can be wrong (see D50928 or likely
a commit in the future for more information).

In order to address the problem and not break the userspace API,
start by defining a type within the kernel and use that.  In a
next step we will then update the int8_t to int16_t to avoid the
problem up to the ioctl code.  This will then allow us to work
on the the user space API indepedently (see PR 293016 for possible
impact outside the base system).

No functional changes intended.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    adrian
Differential Revision: https://reviews.freebsd.org/D57021
DeltaFile
+9-9sys/net80211/ieee80211_node.c
+10-5sys/net80211/_ieee80211.h
+4-3sys/net80211/ieee80211_wds.c
+3-3sys/net80211/ieee80211_var.h
+2-2sys/net80211/ieee80211_mesh.c
+2-2sys/net80211/ieee80211_node.h
+30-249 files not shown
+47-3915 files

FreeBSD/src d201e4esys/dev/wtap if_wtap.c

wtap: use typed rssi and noise floor values

Adjust the rssi and nf arguments to typed int8_t and adjust the maths
for rssi to be consistant with what net80211 expects.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    lwhsu, adrian
Differential Revision: https://reviews.freebsd.org/D57020
DeltaFile
+12-2sys/dev/wtap/if_wtap.c
+12-21 files

FreeBSD/src 355989bsbin/route route.8

route.8: Describe weight modifier

Describe `-weight` argument in the route manual.

Reviewed by: glebius, ziaee
Differential Revision: https://reviews.freebsd.org/D56246
DeltaFile
+12-1sbin/route/route.8
+12-11 files

FreeBSD/src 0a2f768share/man/man4 iwlwifi.4 iwlwififw.4

man: iwlwifi/rtw88/rtw89: update man pages for Linux v7.0 based updates

For all:
- harmonize Copyright/license section according to style.9 and used
  SPDX only.
- mention that the current generation of the driver is based on
  Linux version 7.0.
- make linuxkpi.4 and linuxkpi_wlan.4 .Xr as the man pages do exist
  these days.

iwlwifi: update the card/chipset names supported (while we still can)
iwlwififw: leave a comment only that we can no longer update the
  man page and it will be removed in the future.
rtw88: update supported chipsets and add note to BUGS sections
rtw89: update supported chipsets and add note to BUGS sections

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    ziaee
Differential Revision: https://reviews.freebsd.org/D57019
DeltaFile
+91-99share/man/man4/iwlwifi.4
+6-22share/man/man4/iwlwififw.4
+18-9share/man/man4/rtw88.4
+19-7share/man/man4/rtw89.4
+134-1374 files

FreeBSD/src 394f8ffsys/sys jail.h

jail: replace PR_ALLOW_ALL_STATIC hex constant with symbolic OR

No functional change intended.

Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D57014
DeltaFile
+9-1sys/sys/jail.h
+9-11 files

FreeBSD/src 6531070crypto/openssh FREEBSD-upgrade

openssh: Add reference for another local patch

A bug fix was committed locally and submitted upstream.  Document it in
our upgrade instructions, as these sometimes take a long time before
getting merged.

Sponsored by:   The FreeBSD Foundation
DeltaFile
+5-0crypto/openssh/FREEBSD-upgrade
+5-01 files

FreeBSD/src 9354e20share/man/man4 pcm.4, sys/dev/sound/pcm dsp.c

sound: Force-disable hw.snd.compat_linux_mmap by default

Eventually this hack will be removed, so start by disabling it by
default.

Sponsored by:   The FreeBSD Foundation
MFC after:      12 months
Reviewed by:    emaste
Pull Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/29
DeltaFile
+1-1share/man/man4/pcm.4
+1-1sys/dev/sound/pcm/dsp.c
+2-22 files

FreeBSD/src b9c10eeshare/man/man4 pcm.4, sys/dev/sound/pcm dsp.c

sound: Improve hw.snd.compat_linux_mmap

- Reject PROT_EXEC in all cases when Linux support is not compiled in.
- Define sysctl only when Linux support is compiled in.
- Document better.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    emaste
Pull Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/29
DeltaFile
+17-9share/man/man4/pcm.4
+7-10sys/dev/sound/pcm/dsp.c
+24-192 files

FreeBSD/src 7765843sys/dev/sound/pcm dsp.c

sound: Fix lock order reversal in dsp_poll()

chn_poll() may hold both rdch and wrch channel locks while calling
chn_trigger(rdch).  chn_trigger() switches the lock order from
"channel -> dsp dev" to "dsp dev -> channel" by temporarily dropping
the channel lock before acquiring the dsp lock.

However, only rdch was unlocked during the transition while wrch
remained locked. Since wrch is also a channel lock and witness had
already established the lock order requirement:

    dsp dev -> channel

witness reports a lock order reversal when pcm_lock() is acquired while
wrch is still held.

Avoid holding rdch and wrch simultaneously during chn_trigger()
lock-order switching by only keeping the channel locks when needed.


    [7 lines not shown]
DeltaFile
+4-3sys/dev/sound/pcm/dsp.c
+4-31 files

FreeBSD/src bcd50feshare/man/man5 style.mdoc.5

style.mdoc: Explain why not to abuse Nm

MFC after:              3 days
Reviewed by:            0mp
Differential Revision:  https://reviews.freebsd.org/D55299
DeltaFile
+6-0share/man/man5/style.mdoc.5
+6-01 files

FreeBSD/src ae0fd05sbin/mount mount.8, share/man/man4 p9fs.4

p9fs.4: Cross-reference mount(8)

MFC after:      3 days
DeltaFile
+3-2share/man/man4/p9fs.4
+2-1sbin/mount/mount.8
+5-32 files

FreeBSD/src e0c3d21usr.sbin/bhyve bhyve.8

bhyve.8: Improve readability by not breaking -f's synopsis

MFC after:      3 days
DeltaFile
+1-1usr.sbin/bhyve/bhyve.8
+1-11 files

FreeBSD/src 7abddbbusr.sbin/bhyve bhyve.8

bhyve.8: Fix formatting of -G's "w" prefix

"w" is a command modifier, not an argument. Use Cm.

Fixes:  2cdff9918e79 byhve: add option to specify IP address for gdb
MFC after:      3 days
DeltaFile
+4-4usr.sbin/bhyve/bhyve.8
+4-41 files

FreeBSD/src b999544sys/amd64/linux linux_vdso_gtod.c, sys/amd64/linux32 linux32_vdso_gtod.c

linux: Fix some problems with header pollution

- Avoid including sys/proc.h in linux_vdso_gtod.c.  It's not needed, but
  the implicit inclusion of sys/param.h via sys/ucred.h->bsm/audit.h was
  bringing in some required definitions.
- Include a couple of required headers: sys/time.h (for struct bintime),
  and limits.h (for INT_MAX).
- Move some helpers from linux.h, which depend on sys/param.h for NODEV,
  to the one CU where they're actually used.

No functional change intended.

Reviewed by:    imp, kib, emaste
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D56982
DeltaFile
+0-50sys/compat/linux/linux.h
+46-0sys/compat/linux/linux_stats.c
+3-1sys/arm64/linux/linux_vdso_gtod.c
+3-1sys/i386/linux/linux_vdso_gtod.c
+3-1sys/amd64/linux/linux_vdso_gtod.c
+3-1sys/amd64/linux32/linux32_vdso_gtod.c
+58-546 files

FreeBSD/src 73ec43arelease/tools ec2-small.conf basic-cloudinit.conf

Cloud releases: More firstboot_pkg_upgrade

Update a couple more cloudware images which I forgot about earlier.

Approved by:    re (cperciva)
Reviewed by:    ziaee
Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade")
Differential Revision:  https://reviews.freebsd.org/D57006

(cherry picked from commit 4080419d9a2d88d44d20baaf3ea01934561819c1)
(cherry picked from commit 1ae97c95d025277fb542936b0a2686180dd4a7b7)
DeltaFile
+6-3release/tools/ec2-small.conf
+4-3release/tools/basic-cloudinit.conf
+10-62 files

FreeBSD/src 10c4498release/tools ec2-base.conf gce.conf

Cloud releases: Switch to firstboot_pkg_upgrade

Cloud images are deployed with base system packages. Introduce a
firstboot package auto updater to patch the base system on first boot.

Approved by:    re (cperciva)
MFC after:              1 hour
MFC to:                 stable/15
Reviewed by:            cperciva
Sponsored by:           Google Cloud
Differential Revision:  https://reviews.freebsd.org/D56890

(cherry picked from commit 464a351267dc0d1843b919dd72ad1c70c24815ce)
(cherry picked from commit 0bb2b2a45f3c0c147d7c55e010be45e55af8df87)
DeltaFile
+6-3release/tools/ec2-base.conf
+3-2release/tools/gce.conf
+3-2release/tools/azure.conf
+12-73 files