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/amd64/linux/linux_vdso_gtod.c
+3-1sys/amd64/linux32/linux32_vdso_gtod.c
+3-1sys/arm64/linux/linux_vdso_gtod.c
+3-1sys/i386/linux/linux_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

FreeBSD/src ac2daabsys/conf newvers.sh

15.1: Update to BETA3

Approved by:    re (implicit)
Sponsored by:   OpenSats Initiative
DeltaFile
+1-1sys/conf/newvers.sh
+1-11 files

FreeBSD/src a02091dshare/man/man7 freebsd-base.7

freebsd-base.7: Document adding a local repo

Approved by:    re (cperciva)
MFC after:              1 day
Discussed with:         bcr, ivy, kevans, ngie
Differential Revision:  https://reviews.freebsd.org/D56608

(cherry picked from commit c4af3f13a4e9932968d92872aaf22312a6e79e4e)
(cherry picked from commit 635743c6ec35f11434339f79222fb0a259ed8bfb)
DeltaFile
+22-1share/man/man7/freebsd-base.7
+22-11 files

FreeBSD/src 409247asys/contrib/openzfs/lib/libzfs/os/linux libzfs_mount_os.c, sys/contrib/openzfs/module/os/linux/zfs zpl_super.c zfs_vfsops.c

zfs: merge openzfs/zfs at 6330a45b0 (zfs-2.4-release) into stable/15

OpenZFS 2.4.2

Notable upstream pull request merges:
 #18208 6f14581e1 Cleanup allocation class selection
 #18235 7590972f7 Prevent range tree corruption race by updating
                  dnode_sync()
 #18255 b06caaeec range_tree: use zfs_panic_recover() for partial-overlap
                  remove
 #18258 33961142a Fix deadlock on dmu_tx_assign() from vdev_rebuild()
 #18262 02ed09106 Fix check for .cfi_negate_ra_state on aarch64
 #18263 9f92266b7 Fix redundant declaration of dsl_pool_t
 #18276 3862aadf7 Fix vdev_rebuild_range() tx commit
 #18290 a94b137aa FreeBSD: Improve dmesg kernel message prefix
 #18294 938c8c98b draid: fix data corruption after disk clear
 #18310 b40cd9191 Fix s_active leak in zfsvfs_hold() when z_unmounted is
                  true
 #18380 9b8ccbd2c draid: fix import failure after disks replacements

    [16 lines not shown]
DeltaFile
+619-118sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c
+24-207sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c
+152-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded2.ksh
+143-0sys/contrib/openzfs/lib/libzfs/os/linux/libzfs_mount_os.c
+136-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded1.ksh
+126-0sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c
+1,200-325313 files not shown
+3,284-867319 files

FreeBSD/src 635743cshare/man/man7 freebsd-base.7

freebsd-base.7: Document adding a local repo

MFC after:              1 day
Discussed with:         bcr, ivy, kevans, ngie
Differential Revision:  https://reviews.freebsd.org/D56608

(cherry picked from commit c4af3f13a4e9932968d92872aaf22312a6e79e4e)
DeltaFile
+22-1share/man/man7/freebsd-base.7
+22-11 files

FreeBSD/src 074c42a. RELNOTES

RELNOTES: Add an entry for commit b92b9da33006
DeltaFile
+5-0RELNOTES
+5-01 files

FreeBSD/src 1ae97c9release/tools ec2-small.conf basic-cloudinit.conf

Cloud releases: More firstboot_pkg_upgrade

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

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

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

FreeBSD/src 0bb2b2arelease/tools ec2-base.conf azure.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.

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)
DeltaFile
+6-3release/tools/ec2-base.conf
+3-2release/tools/azure.conf
+3-2release/tools/gce.conf
+12-73 files

FreeBSD/src b92b9dasys/fs/nfs nfsproto.h, sys/fs/nfsserver nfs_nfsdport.c

nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes

Without this patch, the maximum setting for
vfs.nfsd.srvmaxio was 1Mbyte.  This patch increases
that to 4Mbytes.

The same as for any setting above 128Kbytes, settings up to
4Mbytes require that kern.ipc.maxsockbuf be increased.
(A message generated after setting vfs.nfsd.srvmaxio via
the /etc/rc.conf variable nfs_server_maxio will indicate
the minimum setting, which will be somewhat greater than
four times the setting of vfs.nfsd.srvmaxio.)

Requested by:   Cedric Blancher <cedric.blancher at gmail.com>
MFC after:      2 weeks
Fixes:  13d3bd165e22 ("subr_uio.c: Remove a KASSERT() for large NFS server I/O")
DeltaFile
+3-2sys/fs/nfsserver/nfs_nfsdport.c
+3-0sys/fs/nfs/nfsproto.h
+6-22 files

FreeBSD/src 13d3bd1sys/kern subr_uio.c

subr_uio.c: Remove a KASSERT() for large NFS server I/O

When the NFS server is set to allow an I/O size greater
than 1Mbyte (not allowed in FreeBSD's main yet), a
KASSERT() in allocuio() can fail when:
zfs_freebsd_write()->zfs_write()->zfs_uiocopy()
->cloneuio()->allocuio()
is called for a large NFS server write.

Since the userland API callers to allocuio() already
check that the size does not exceed UIO_MAXIOV,
there does not seem to be a need to a KASSERT()
here.

Removing the KASSERT() allows NFS server writes
of greater than 1Mbyte to work, once the NFS code
is patched to allow them.

Reviewed by:    kib

    [2 lines not shown]
DeltaFile
+0-2sys/kern/subr_uio.c
+0-21 files

FreeBSD/src 4080419release/tools ec2-small.conf basic-cloudinit.conf

Cloud releases: More firstboot_pkg_upgrade

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

Reviewed by:    ziaee
Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade")
Differential Revision:  https://reviews.freebsd.org/D57006
DeltaFile
+6-3release/tools/ec2-small.conf
+4-3release/tools/basic-cloudinit.conf
+10-62 files

FreeBSD/src 464a351release/tools ec2-base.conf azure.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.

MFC after:              1 hour
MFC to:                 stable/15
Reviewed by:            cperciva
Sponsored by:           Google Cloud
Differential Revision:  https://reviews.freebsd.org/D56890
DeltaFile
+6-3release/tools/ec2-base.conf
+3-2release/tools/azure.conf
+3-2release/tools/gce.conf
+12-73 files

FreeBSD/src 2ebec3clibexec/nuageinit nuage.lua nuageinit, libexec/nuageinit/tests nuageinit.sh

nuageinit: fix command injection and related issues

- Add shell_escape() helper to safely escape shell arguments
- Apply shell_escape to all user-controlled values in shell commands:
  adduser (usershow, useradd, lock, primary_group, groups)
  addgroup (groupshow, groupadd, members)
  exec_change_password (usermod)
  settimezone (tzsetup root and timezone)
  install_package (pkg package names)
- Escape double quotes in hostname when writing rc.conf.d/hostname
- Add missing 'local' declaration for resolvconf_command in nameservers()
- Escape interface name in resolvconf -a command
- Change open_resolvconf_conf() from 'w' to 'a' mode to prevent
  data loss when nameservers() is called multiple times
- Clean up stale resolvconf.conf at the start of each boot
  (skip on postnet to preserve config written by first call)

Approved by:    re (cperciva)
MFC After: 1 day

    [3 lines not shown]
DeltaFile
+28-15libexec/nuageinit/nuage.lua
+15-2libexec/nuageinit/nuageinit
+3-3libexec/nuageinit/tests/nuageinit.sh
+46-203 files

FreeBSD/src 09a53a5. Makefile.inc1

Make "make update-packages" idempotent

If the user runs "make update-packages" without bumping BRANCH, then it
isn't possible to copy packages from the old location to the new one
(because the two locations are the same).  So just skip that step.

Approved by:    re (cperciva)
Sponsored by:           ConnectWise
PR:                     295085
Reviewed by:            ivy, emaste
Differential Revision:  https://reviews.freebsd.org/D56872

(cherry picked from commit bd1e789b8452a8c2f166a3b4defb95330c71dadd)
(cherry picked from commit 89a0148521aefe0a190d4b62749186c705962d32)
DeltaFile
+3-1Makefile.inc1
+3-11 files

FreeBSD/src 39fcfccsys/kern uipc_usrreq.c, sys/sys ucred.h

Fix LOCAL_PEERCRED in 32-bit compat mode

Previously the cr_pid field would be incorrectly copied to userland, due
to a size mismatch between the structure as defined in 32-bit vs 64-bit
builds.  Fix it by converting the structure before copying it to
userland.

Approved by:    re (cperciva)
PR:             294833
Sponsored by:   ConnectWise
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D56675

(cherry picked from commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d)
(cherry picked from commit 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd)
DeltaFile
+19-2sys/kern/uipc_usrreq.c
+11-0sys/sys/ucred.h
+30-22 files

FreeBSD/src 8c8ec2crelease/scripts pkg-stage.sh

pkg-stage.sh: Add ext2 and ntfs

Having these packages available on release media may help users who
need to sneakernet other packages (e.g. firmware) from systems running
Linux or Windows.

Approved by:    re (cperciva)
Suggested by:   vladlen, ziaee
MFC after:      3 days

(cherry picked from commit 6881fd278d80ac63b4d511fc130a79ff16d1bb48)
(cherry picked from commit 01d5910b8766671afdbd9e274fd62b397aca9e1a)
DeltaFile
+2-0release/scripts/pkg-stage.sh
+2-01 files

FreeBSD/src 5457f05release/tools oci-image-static.conf

release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf

Instructions in /etc/pkg/FreeBSD.conf and elsewhere recommend putting
changes in /usr/local/etc/pkg/repos/FreeBSD.conf so bring OCI containers
into line as well.

Reviewed by:    dfr, ivy
Differential Revision:  https://reviews.freebsd.org/D54090

Approved by:    re (cperciva)
MFC after:      5 days
Sponsored by:   SkunkWerks, GmbH

(cherry picked from commit c73ae67348998a0056145e88debbea9ff6860c4f)
(cherry picked from commit d889f6c466d4cec73c34bc71093d08b25e321071)
DeltaFile
+1-5release/tools/oci-image-static.conf
+1-51 files

FreeBSD/src 8484cb4sys/fs/fdescfs fdesc_vnops.c

fdescfs: do not change vnode type on VOP_GETATTR()

Approved by:    re (cperciva)
PR:     294768

(cherry picked from commit fbecfc4aa028964f972a0457809aa041d415f61b)
(cherry picked from commit 5af938fb03d004ef97621f4c9319446f2fb8f77c)
DeltaFile
+0-1sys/fs/fdescfs/fdesc_vnops.c
+0-11 files