HardenedBSD/src 291b0f1usr.sbin/syslogd syslogd.c, usr.sbin/syslogd/tests syslogd_test.sh

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+36-58usr.sbin/syslogd/syslogd.c
+34-0usr.sbin/syslogd/tests/syslogd_test.sh
+70-582 files

HardenedBSD/src c8809c8usr.sbin/syslogd syslogd.c, usr.sbin/syslogd/tests syslogd_test.sh

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+36-58usr.sbin/syslogd/syslogd.c
+34-0usr.sbin/syslogd/tests/syslogd_test.sh
+70-582 files

HardenedBSD/src f52b06fsys/amd64/amd64 mp_machdep.c, sys/i386/i386 mp_machdep.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+12-5sys/x86/x86/mp_x86.c
+0-2sys/i386/i386/mp_machdep.c
+0-1sys/x86/include/x86_smp.h
+0-1sys/amd64/amd64/mp_machdep.c
+12-94 files

HardenedBSD/src fe3001bsys/amd64/amd64 mp_machdep.c, sys/i386/i386 mp_machdep.c

x86: change ap_boot_mtx from spinlock mutex to naive lock

PR:     289297

(cherry picked from commit 55305b590797524dd1cecfc9406869700e925e51)
DeltaFile
+12-5sys/x86/x86/mp_x86.c
+0-2sys/i386/i386/mp_machdep.c
+0-1sys/amd64/amd64/mp_machdep.c
+0-1sys/x86/include/x86_smp.h
+12-94 files

HardenedBSD/src 60ae4e5usr.sbin/syslogd syslogd.c, usr.sbin/syslogd/tests syslogd_test.sh

syslogd: Terminate pipe processes gracefully

Pipe actions spawn a process based on the command provided in the
syslogd configuration file. When a HUP signal is received, enter
the process into the deadq instead of immediately killing it.
This matches the behavior of syslogd prior to it being Capsicumized.

Fixes: d2d180fb7736
DeltaFile
+36-58usr.sbin/syslogd/syslogd.c
+34-0usr.sbin/syslogd/tests/syslogd_test.sh
+70-582 files

HardenedBSD/src 79fe332. RELNOTES, .github CODEOWNERS

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+32-0RELNOTES
+8-5.github/CODEOWNERS
+6-6sys/dev/iicbus/adc/ads111x.c
+5-5sys/dev/jme/if_jme.c
+5-5sys/dev/isl/isl.c
+5-1release/Makefile.ec2
+61-221 files not shown
+64-227 files

HardenedBSD/src 8b22b3a. RELNOTES, .github CODEOWNERS

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+32-0RELNOTES
+8-5.github/CODEOWNERS
+6-6sys/dev/iicbus/adc/ads111x.c
+5-5sys/dev/isl/isl.c
+5-5sys/dev/jme/if_jme.c
+5-1release/Makefile.ec2
+61-221 files not shown
+64-227 files

HardenedBSD/src ab807ebcontrib/file/src apprentice.c, sys/powerpc/powerpc swtch32.S swtch64.S

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-3contrib/file/src/apprentice.c
+1-1sys/powerpc/powerpc/swtch32.S
+1-1sys/powerpc/powerpc/swtch64.S
+4-53 files

HardenedBSD/src 2c029cfsys/dev/iicbus/adc ads111x.c

ads111x: Convert driver to CTLFLAG_MPSAFE

Replace CTLFLAG_NEEDGIANT with CTLFLAG_MPSAFE for all ADC sensor
sysctls.  All of the sysctl handlers are serialized by a driver mutex.

Sysctls converted:
- dev.ads111x.X.channelN.gain_index (PGA setting)
- dev.ads111x.X.channelN.rate_index (sample rate)
- dev.ads111x.X.channelN.voltage (sampled voltage)
- dev.ads111x.X.config (configuration register)
- dev.ads111x.X.lo_thresh (comparator low threshold)
- dev.ads111x.X.hi_thresh (comparator high threshold)

Reviewed by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54620
DeltaFile
+6-6sys/dev/iicbus/adc/ads111x.c
+6-61 files

HardenedBSD/src c2a55efsys/dev/jme if_jme.c

jme: Convert driver to CTLFLAG_MPSAFE

Replace CTLFLAG_NEEDGIANT with CTLFLAG_MPSAFE for all interrupt
coalescing sysctls. The driver uses jme_mtx mutex for proper
synchronization and does not require Giant lock.

Sysctls converted:
- dev.jme.X.tx_coal_to (TX coalescing timeout)
- dev.jme.X.tx_coal_pkt (TX coalescing packet count)
- dev.jme.X.rx_coal_to (RX coalescing timeout)
- dev.jme.X.rx_coal_pkt (RX coalescing packet count)
- dev.jme.X.process_limit (max RX events to process)

Reviewed by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54618
DeltaFile
+5-5sys/dev/jme/if_jme.c
+5-51 files

HardenedBSD/src 0672e0esys/dev/isl isl.c

isl: Convert driver to CTLFLAG_MPSAFE

Replace CTLFLAG_NEEDGIANT with CTLFLAG_MPSAFE for all light sensor
sysctls.  All of the sysctl handlers are serialized by a driver mutex.

Sysctls converted:
- dev.isl.X.als (ambient light sensor)
- dev.isl.X.ir (infrared sensor)
- dev.isl.X.prox (proximity sensor)
- dev.isl.X.resolution (sensor resolution)
- dev.isl.X.range (sensor range)

Reviewed by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54621
DeltaFile
+5-5sys/dev/isl/isl.c
+5-51 files

HardenedBSD/src 0b908de.github CODEOWNERS

CODEOWNERS: Better reflect current #bhyve

So as a proof of concept, sync the info we have with the #bhyve
phabricator group. This is imperfect, but will help test out providing
better feedback to diff submitters.

Sponsored by:           Netflix
DeltaFile
+5-5.github/CODEOWNERS
+5-51 files

HardenedBSD/src e3bfcf6. RELNOTES

RELNOTES: Add some entries from the past several weeks

Reviewed by:    emaste
Differential Revision:  https://reviews.freebsd.org/D54628
DeltaFile
+32-0RELNOTES
+32-01 files

HardenedBSD/src b558c92release Makefile.ec2

EC2: Add extra SSM Parameter names for releases

Record releases in the SSM Parameter Store not just as e.g.
  /aws/service/freebsd/arm64/small/ufs/15.0/RELEASE
but also as .../RELEASE/latest, e.g.
  /aws/service/freebsd/arm64/small/ufs/15.0/RELEASE/latest

The latter parameters will be updated when new AMIs are built with
security and errata updates appplied, and have been backfilled for
15.0.

MFC after:      3 days
MFC to:         stable/15 (14.x will not get security-update AMIs)
Sponsored by:   Amazon
DeltaFile
+5-1release/Makefile.ec2
+5-11 files

HardenedBSD/src 9b54998. MAINTAINERS, .github CODEOWNERS

MAINTAINERS/CODEOWNERS: Add myself to mpr, mps and mpi3mr

Yea, I realize these are decaying, but I'm going to take a run at
automatically tagging reviews for github pull requests. I suspect that
tagging will help with the 'stale' issues with at least CODEOWNER.  As
better data becomes available, especailly for contrib, I'll update
things.

Sponsored by:           Netflix
DeltaFile
+3-0.github/CODEOWNERS
+3-0MAINTAINERS
+6-02 files

HardenedBSD/src a50789dsys/powerpc/powerpc swtch64.S swtch32.S

powerpc: put the isync inside the TD_LOCK() checking loop

Fix a narrow window where the lock is unlocked but the checking CPU
hasn't flushed things appropriately.

Inside this window the CPU inside cpu_switch() will loop forever thinking
the destination thread is still blocked/locked even though it is not.

This manifests as the system hanging after starting all APs.

I've seen this reliably trigger in qemu-system-ppc64 running power9 pseries
guests; the more CPUs the more likely it triggers at boot.

PR: kern/292167
Differential Revision:  https://reviews.freebsd.org/D54478
Reviewed by:    jhibbits
MFC after:      1 week
Relnotes:       yes

(cherry picked from commit 8df2e542146801fd01675e56724eaa567d04c209)
DeltaFile
+1-1sys/powerpc/powerpc/swtch64.S
+1-1sys/powerpc/powerpc/swtch32.S
+2-22 files

HardenedBSD/src e5861dccontrib/file/src apprentice.c

Merge commit faa5141b9be4 from file git (by Christos Zoulas):

  PR/656: harry.sintonen: Fix bug in byte swapping that was caused by the change to make flags uint16_t and cont_level uint8_t.

This fixes using a magic.mgc built with a different endianness than
file(1) itself, e.g. when building powerpc64 on amd64.

PR:             292079
Fixes:          ae316d1d1cff ("MFV: file 5.46.")
MFC after:      3 days

(cherry picked from commit 39047538cf5d8f26112f7b08b3c56967f70f7f94)
DeltaFile
+2-3contrib/file/src/apprentice.c
+2-31 files

HardenedBSD/src 4fad675contrib/kyua/cli cmd_debug.cpp, contrib/kyua/utils/cmdline parser.cpp options.cpp

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+81-1contrib/kyua/cli/cmd_debug.cpp
+12-12contrib/mtree/mtree.8
+24-0contrib/kyua/utils/process/child.cpp
+20-0contrib/kyua/utils/process/child.ipp
+15-5contrib/kyua/utils/cmdline/parser.cpp
+17-3contrib/kyua/utils/cmdline/options.cpp
+169-218 files not shown
+205-4614 files

HardenedBSD/src 883159acontrib/kyua/cli cmd_debug.cpp, contrib/kyua/utils/cmdline options.cpp parser.cpp

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+81-1contrib/kyua/cli/cmd_debug.cpp
+24-0contrib/kyua/utils/process/child.cpp
+12-12contrib/mtree/mtree.8
+17-3contrib/kyua/utils/cmdline/options.cpp
+15-5contrib/kyua/utils/cmdline/parser.cpp
+20-0contrib/kyua/utils/process/child.ipp
+169-218 files not shown
+205-4614 files

HardenedBSD/src da5d94dusr.bin/grep zgrep.1, usr.bin/grep/tests grep_freebsd_test.sh

Remove obsolete BUGS section from zgrep(1) man page, add test

I forgot to check/update the man page with D54217. While here add
a test for multiple -e flags.

Reviewed by:    markj
Approved by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54632
DeltaFile
+0-18usr.bin/grep/zgrep.1
+11-0usr.bin/grep/tests/grep_freebsd_test.sh
+11-182 files

HardenedBSD/src 4250d2acontrib/mtree mtree.8 create.c

Import latest mtree from NetBSD

Merge commit '7e59b238fcf32f3d365e78ddc702ca494e1ff68d'

This commit partially reverts the previous vendor import, given that the
"type" keyword has been historically mandatory and should not be removed
by "-R all".  This was clarified in the man page.

Reported by:    glebius
PR:             219467
MFC after:      1 week
DeltaFile
+12-12contrib/mtree/mtree.8
+3-4contrib/mtree/create.c
+15-162 files

HardenedBSD/src 7e59b23. mtree.8 create.c

Vendor import of NetBSD's mtree at 2026-01-11
DeltaFile
+12-12mtree.8
+3-4create.c
+15-162 files

HardenedBSD/src 717ae16sbin/newfs newfs.c

newfs: Add -u to getopt string

Fixes:          68562f8145e8 ("newfs: Add an option to disable soft updates")
DeltaFile
+1-1sbin/newfs/newfs.c
+1-11 files

HardenedBSD/src 8a21c17contrib/kyua/cli cmd_debug.cpp, contrib/kyua/utils/cmdline options.cpp parser.cpp

kyua: Add "debug -x|--execute cmd" option

With execenv=jail specified, the "cmd" runs inside the test's jail.

Reviewed by:    ngie, markj
Differential Revision:  https://reviews.freebsd.org/D52642
DeltaFile
+81-1contrib/kyua/cli/cmd_debug.cpp
+24-0contrib/kyua/utils/process/child.cpp
+17-3contrib/kyua/utils/cmdline/options.cpp
+20-0contrib/kyua/utils/process/child.ipp
+15-5contrib/kyua/utils/cmdline/parser.cpp
+6-2contrib/kyua/utils/cmdline/options.hpp
+163-113 files not shown
+178-119 files

HardenedBSD/src 0adf57crelease/powerpc mkisoimages.sh

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-1release/powerpc/mkisoimages.sh
+1-11 files

HardenedBSD/src 77afb35release/powerpc mkisoimages.sh

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1release/powerpc/mkisoimages.sh
+1-11 files

HardenedBSD/src 7afa039release/powerpc mkisoimages.sh

powerpc: fix release image building for Apple partitions

awk changed somewhere between 14 and 15 and it stopped accepting
a hexadecimal number as its input - it will always return 0.
This results in a very badly written apple boot block.

So just remove it; do the math in shell.

PR:             kern/292341
Differential Revision:  https://reviews.freebsd.org/D54639
Reviewed by:    imp
MFC after:      1 week
DeltaFile
+1-1release/powerpc/mkisoimages.sh
+1-11 files

HardenedBSD/src f45c26esbin/newfs newfs.8 newfs.c, share/mk bsd.man.mk

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+18-6sbin/newfs/newfs.8
+6-3sbin/newfs/newfs.c
+3-3share/mk/bsd.man.mk
+27-123 files

HardenedBSD/src 9f33a83sbin/newfs newfs.8 newfs.c, share/mk bsd.man.mk

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+18-6sbin/newfs/newfs.8
+6-3sbin/newfs/newfs.c
+3-3share/mk/bsd.man.mk
+27-123 files

HardenedBSD/src 9fed072share/mk bsd.man.mk

bsd.man.mk simplify staging

We actually only need the high level targets stage_files and stage_links
meta.stage.mk will take care of the details.
DeltaFile
+2-2share/mk/bsd.man.mk
+2-21 files