HardenedBSD/src 411014fsys/kern kern_jail.c kern_sysctl.c, sys/sys priv.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+8-2sys/kern/kern_jail.c
+6-4sys/kern/kern_sysctl.c
+1-0sys/sys/priv.h
+15-63 files

HardenedBSD/src 029621fsys/kern kern_sysctl.c kern_jail.c, sys/sys priv.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+6-4sys/kern/kern_sysctl.c
+8-2sys/kern/kern_jail.c
+1-0sys/sys/priv.h
+15-63 files

HardenedBSD/src 7d1d9ccsys/kern kern_sysctl.c, sys/sys priv.h

sysctl: Do not serialize requests when running as root

Bugs or unexpected behaviour can cause a user thread to block in a
sysctl handler for a long time.  "procstat -kka" is the most useful tool
to see why this might happen, but it can block on sysctlmemlock too.

Since the purpose of this lock is merely to ensure userspace can't wire
too much memory, don't require it for requests from privileged threads.

PR:             282994
Reviewed by:    kib, jhb
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D47842
DeltaFile
+6-4sys/kern/kern_sysctl.c
+1-0sys/sys/priv.h
+7-42 files

HardenedBSD/src 8cf955fsys/kern kern_jail.c

jail: Handle jail removal in a dedicated thread

Otherwise a deadlock is possible: the system taskqueue thread removes a
prison and calls vnet_destroy(), vnet_vlan_uninit() destroys the if_vlan
cloner, the vlan_clone_destroy() callback calls taskqueue_drain() on the
thread taskqueue.

Fix the problem by introducing a new thread for jail removals.

Ideally, the taskqueue interface would let consumers define queues
without having to map them to threads, as that'd make it possible to
avoid such deadlocks without extra threads; for now, this is the only
solution.

Reviewed by:    jamie
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D47991
DeltaFile
+8-2sys/kern/kern_jail.c
+8-21 files

HardenedBSD/src 1b889b7sys/geom/part g_part_bsd.c, tools/tools/nanobsd legacy.sh

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+3-2tools/tools/nanobsd/legacy.sh
+1-1sys/geom/part/g_part_bsd.c
+4-32 files

HardenedBSD/src 0520d2etools/tools/nanobsd legacy.sh

nanobsd: Remove dependency on bsdlabel

The bsdlabel utility is deprecated, gpart should be used instead:

  - Offset the first 16 sectors, just like bsdlabel did (used for
    metadata)
  - Use a freebsd-ufs partition type (regardless bsdlabel creating a
    '!0')

Reviewed by:    emaste, imp
Approved by:    emaste (mentor)
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D47653

(cherry picked from commit 87e87fecb139d60a00837f004de0d37dbecd205c)
DeltaFile
+3-2tools/tools/nanobsd/legacy.sh
+3-21 files

HardenedBSD/src a7d5652sys/geom/part g_part_bsd.c

geom: Allow BSD type '!0' partitions

Allow the creation of '!0' partition types.

Fix it by not considering "0" an invalid partition type.

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

(cherry picked from commit accf71534c612b76ee2701f2dfcaa464748e527a)
DeltaFile
+1-1sys/geom/part/g_part_bsd.c
+1-11 files

HardenedBSD/src 9ef8fb3usr.sbin/services_mkdb services

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+2-2usr.sbin/services_mkdb/services
+2-21 files

HardenedBSD/src 859e098usr.sbin/services_mkdb services

services: fix typo ucp -> udp

Fix two proto name typos

MFC after:      2 weeks

(cherry picked from commit 7aa7f4b5c324a0f698b3ae1e39856cc087a14e0c)
DeltaFile
+2-2usr.sbin/services_mkdb/services
+2-21 files

HardenedBSD/src b65f99fusr.sbin/hbsd-update hbsd-update

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+18-0usr.sbin/hbsd-update/hbsd-update
+18-01 files

HardenedBSD/src 6f44a23usr.sbin/hbsd-update hbsd-update

Merge branch 'northboot-hardened/current/master-patch-45250' into 'hardened/current/master'

HBSD: Check kern.securelevel before installing update

See merge request hardenedbsd/HardenedBSD!98
DeltaFile
+18-0usr.sbin/hbsd-update/hbsd-update
+18-01 files

HardenedBSD/src 746c875sbin/devd devd.conf.5, sys/dev/rtwn if_rtwnvar.h if_rtwn.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+56-1sbin/devd/devd.conf.5
+20-0sys/dev/rtwn/rtl8192c/r92c_beacon.c
+12-0sys/dev/rtwn/rtl8188e/r88e_beacon.c
+9-0sys/dev/rtwn/rtl8812a/r12a_beacon.c
+4-0sys/dev/rtwn/if_rtwnvar.h
+3-0sys/dev/rtwn/if_rtwn.c
+104-110 files not shown
+114-116 files

HardenedBSD/src f63bf58sbin/devd devd.conf.5, sys/dev/rtwn if_rtwnvar.h if_rtwn.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+56-1sbin/devd/devd.conf.5
+20-0sys/dev/rtwn/rtl8192c/r92c_beacon.c
+12-0sys/dev/rtwn/rtl8188e/r88e_beacon.c
+9-0sys/dev/rtwn/rtl8812a/r12a_beacon.c
+4-0sys/dev/rtwn/if_rtwnvar.h
+3-0sys/dev/rtwn/if_rtwn.c
+104-110 files not shown
+114-116 files

HardenedBSD/src 46640c6sys/fs/msdosfs msdosfs_vnops.c, sys/fs/tmpfs tmpfs_vnops.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+2-0sys/fs/msdosfs/msdosfs_vnops.c
+2-0sys/fs/tmpfs/tmpfs_vnops.c
+2-0sys/fs/udf/udf_vnops.c
+2-0sys/ufs/ffs/ffs_vnops.c
+8-04 files

HardenedBSD/src efe6a09sys/fs/msdosfs msdosfs_vnops.c, sys/fs/tmpfs tmpfs_vnops.c

fs: Add static asserts for the size of fid structures

File system specific *fid structures are copied into the generic
struct fid defined in sys/mount.h.
As such, they cannot be larger than struct fid.

This patch adds _Static_assert()s to check for this.

ZFS and fuse already have _Static_assert()s.

(cherry picked from commit 91b5592a1e1af97480d615cf508be05b5674d2f3)
DeltaFile
+2-0sys/fs/msdosfs/msdosfs_vnops.c
+2-0sys/fs/tmpfs/tmpfs_vnops.c
+2-0sys/fs/udf/udf_vnops.c
+2-0sys/ufs/ffs/ffs_vnops.c
+8-04 files

HardenedBSD/src 9efd215sys/dev/rtwn if_rtwnvar.h if_rtwn.c, sys/dev/rtwn/rtl8188e r88e_beacon.c

rtwn: create a new HAL routine for enabling STA mode beacon processing

For some NICs (notably the rtl8192cu that I'm working on) the
firmware rate adaptation requires beacon processing to be enabled.

Instead of making assumptions in the if_rtwn beacon routines (and
honestly all of that should be in the HAL too), create a HAL method
for enabling/disabling beacon processing specifically in STA mode.

Since this isn't necessarily required for all NICs (notably the RTL8188E
NICs, where some will do firmware rate control and some will require
driver rate control), only enable it for the RTL8192CU and RT8192EU.

The RTL8188E and RTL8812/RTL8821 just have no-op routines for now.

Locally tested:

* RTL8192CU, STA mode


    [2 lines not shown]
DeltaFile
+20-0sys/dev/rtwn/rtl8192c/r92c_beacon.c
+12-0sys/dev/rtwn/rtl8188e/r88e_beacon.c
+9-0sys/dev/rtwn/rtl8812a/r12a_beacon.c
+4-0sys/dev/rtwn/if_rtwnvar.h
+3-0sys/dev/rtwn/if_rtwn.c
+1-0sys/dev/rtwn/rtl8192c/r92c.h
+49-09 files not shown
+58-015 files

HardenedBSD/src 1fc7922sbin/devd devd.conf.5

devd.conf(5): explain difference between internal and shell variables

devd.conf by default considers many variables as internal, possibly
expanding them to an empty string.  Shell variables thus need to be
wrapped into braces.

Reviewed by:    imp, Andre Albsmeier
MFC after:      1 week
Differential Revision:  <https://reviews.freebsd.org/D48154>
DeltaFile
+56-1sbin/devd/devd.conf.5
+56-11 files

HardenedBSD/src 740bd3bshare/man/man5 pf.conf.5, sys/fs/nullfs null_vfsops.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+10-10share/man/man5/pf.conf.5
+0-5sys/fs/nullfs/null_vfsops.c
+10-152 files

HardenedBSD/src 5acb5ddshare/man/man5 pf.conf.5, sys/fs/nullfs null_vfsops.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+10-10share/man/man5/pf.conf.5
+0-5sys/fs/nullfs/null_vfsops.c
+10-152 files

HardenedBSD/src 725003dshare/man/man5 pf.conf.5

pf.conf.5: Fix endpoint-independent description

The description of the endpoint-independent option accidentally ended up
in the middle of map-e-portset's text.

Fixes: 390dc369efaa ("pf: Add support for endpoint independent NAT bindings for UDP")

Reviewed by:    kp
Sponsored by:   Tailscale
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D48158
DeltaFile
+10-10share/man/man5/pf.conf.5
+10-101 files

HardenedBSD/src 709989bsys/fs/nullfs null_vfsops.c

nullfs: stop lying about mount flags in statfs(2)

Flags should not propagate from the lower fs.  Behavior for the upper fs
is determined by flags from its mount point structure.  When lower fs
acts according to its mount configuration, it is reported up as VOP
errors.

PR:     283425
Reviewed by:    markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D48150
DeltaFile
+0-5sys/fs/nullfs/null_vfsops.c
+0-51 files

HardenedBSD/src 6095575sys/contrib/dev/iwlwifi iwl-drv.c, sys/dev/sdhci sdhci_acpi.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2-2sys/contrib/dev/iwlwifi/iwl-drv.c
+2-1sys/kern/bus_if.m
+1-0sys/dev/sdhci/sdhci_acpi.c
+5-33 files

HardenedBSD/src c5c86d7sys/contrib/dev/iwlwifi iwl-drv.c, sys/dev/sdhci sdhci_acpi.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2-2sys/contrib/dev/iwlwifi/iwl-drv.c
+2-1sys/kern/bus_if.m
+1-0sys/dev/sdhci/sdhci_acpi.c
+5-33 files

HardenedBSD/src d7c69a3sys/dev/sdhci sdhci_acpi.c

sdhci: add missing bus_add_child DEVMETHOD.

Add the missing bus_add_child DEVMETHOD.  This is needed for the RPi5
running with a MMCCAM kernel and the worproject/rpi5-uefi to avoid a
kernel panic on boot when SDIO tries to attach to a 'Intel Bay Trail'
controller.

Reviewed by:    imp
MFC after:      3 days
Differential Revision: https://reviews.freebsd.org/D48152
DeltaFile
+1-0sys/dev/sdhci/sdhci_acpi.c
+1-01 files

HardenedBSD/src 7030980sys/kern bus_if.m

bus: improve null_add_child() panic message

When null_add_child() panics add the bus device name/unit and the new
unit as this will immediately reveal the parent missing the
  DEVMETHOD(bus_add_child, ...)
entry.

Reviewed by:    imp
Differential Revision: https://reviews.freebsd.org/D48151
DeltaFile
+2-1sys/kern/bus_if.m
+2-11 files

HardenedBSD/src 5d09d10sys/contrib/dev/iwlwifi iwl-drv.c

iwlwifi: add missing blank, unwrap line

The original commit was missing a space between two words due to
uncareful string line wrapping; let the string run beyond the 80 char
limit in order to also make it grep-able [1].

Reported by:    jrtc27, Chris Torek (chris.torek gmail.com)
Suggested by:   emaste, imp [1]
Sponsored by:   The FreeBSD Foundation
Fixes:          87e140a5c6f89 avoid (hard) hang on loading module
MFC after:      3 days
X-MFC with:     87e140a5c6f89eea7ea6320d1ae34566492abfc0
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D48155
DeltaFile
+2-2sys/contrib/dev/iwlwifi/iwl-drv.c
+2-21 files

HardenedBSD/src 8b69bb8share/misc bsd-family-tree

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+15-12share/misc/bsd-family-tree
+15-121 files

HardenedBSD/src e76c3a5share/misc bsd-family-tree

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+15-12share/misc/bsd-family-tree
+15-121 files

HardenedBSD/src c4ca1d2share/misc bsd-family-tree

bsd-family-tree: add NetBSD 10.1

MFC after:      3 days
DeltaFile
+15-12share/misc/bsd-family-tree
+15-121 files

HardenedBSD/src 07e0aaelib/libprocstat/zfs Makefile, lib/libsys setcred.2

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+290-0lib/libsys/setcred.2
+34-56sys/rpc/svc_generic.c
+2-36tests/sys/fs/fusefs/open.cc
+2-25tests/sys/fs/fusefs/opendir.cc
+15-11lib/libprocstat/zfs/Makefile
+8-9sys/fs/fuse/fuse_vnops.c
+351-1375 files not shown
+357-15211 files