HardenedBSD/src fad23a9cddl/contrib/opensolaris/lib/libdtrace/common dt_consume.c, libexec/rc/rc.d bthidd

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2libexec/rc/rc.d/bthidd
+1-1usr.bin/lorder/tests/lorder_test.sh
+1-1cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
+4-43 files

HardenedBSD/src 2733e05usr.bin/lorder/tests lorder_test.sh

tests/lorder_test: Update test case description from copy/paste

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 5a674a0694836616eaaff448345823594742ad76)
DeltaFile
+1-1usr.bin/lorder/tests/lorder_test.sh
+1-11 files

HardenedBSD/src e6b49d7cddl/contrib/opensolaris/lib/libdtrace/common dt_consume.c

libdtrace: Fix dt_print_sym() not printing symbols in non-oformat mode

dt_print_sym() fills the symbol string via snprintf() in non-oformat
mode but the guarding `dtp->dt_oformat != 0 &&` for the dt_printf()
call causes the symbol is computed but never emitted.

This fixes tests:

- common.profile-n.t_dtrace_contrib.tst_sym_ksh
- common.profile-n.t_dtrace_contrib.tst_func_ksh

Reviewed by:    markj
Fixes:          93f27766a7e1 ("dtrace: Add the 'oformat' libdtrace option")
MFC after:      3 days
Event:          Halifax Hackathon 202606
Location:       Room 208, Computer Science Building, Dalhousie University
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D57895

(cherry picked from commit 8e61d8707f8a10acc143210089fea2502a3f2922)
DeltaFile
+1-1cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
+1-11 files

HardenedBSD/src 424d07clibexec/rc/rc.d bthidd

rc.d/bthidd: Correct load_kld invocations

Pass a single module name to load_kld for kbdmux and vkbd, allowing
bthidd_prestart to load both modules successfully.

Fixes:          cfe1962a1925 (rc: Fix improper use of load_kld)
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit b5fe1bc5c6e4b483aacadddd8bdf37aa12c89982)
DeltaFile
+2-2libexec/rc/rc.d/bthidd
+2-21 files

HardenedBSD/src e1b7590lib/libsys pdfork.2, sys/kern kern_sig.c sys_procdesc.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+6-4sys/kern/sys_procdesc.c
+4-4lib/libsys/pdfork.2
+7-0tests/sys/kern/pdwait.c
+2-2sys/sys/procdesc.h
+4-0tests/sys/kern/procdesc.c
+2-1sys/kern/kern_sig.c
+25-113 files not shown
+30-139 files

HardenedBSD/src c414d77lib/libsys pdfork.2, sys/kern kern_sig.c sys_procdesc.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+6-4sys/kern/sys_procdesc.c
+4-4lib/libsys/pdfork.2
+7-0tests/sys/kern/pdwait.c
+2-2sys/sys/procdesc.h
+4-0tests/sys/kern/procdesc.c
+2-1sys/kern/kern_sig.c
+25-113 files not shown
+30-139 files

HardenedBSD/src 10a2bddbin/sleep sleep.1

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2bin/sleep/sleep.1
+2-21 files

HardenedBSD/src fc0d50abin/sleep sleep.1

sleep: Fix man page about IGINFO output

Reviewed by:    des
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D58483

(cherry picked from commit 24983c4e9f9934282e8d81381095da819ad97c63)
DeltaFile
+2-2bin/sleep/sleep.1
+2-21 files

HardenedBSD/src 3c5c55btests/sys/kern Makefile procdesc.c

tests/sys/kern: Skip capsicum procdesc tests when capability mode is unavailable

pdwait's capsicum/enotcap and procdesc's pdopenpid_capmode enter capability mode.
Require security_capability_mode (and security_capabilities for enotcap) so the
cases skip cleanly on kernels built without CAPABILITIES instead of failing.

Approved by:    asomers, gallatin
Sponsored by:   Netflix
Differential Revision:  https://reviews.freebsd.org/D58545
DeltaFile
+7-0tests/sys/kern/pdwait.c
+4-0tests/sys/kern/procdesc.c
+2-0tests/sys/kern/Makefile
+13-03 files

HardenedBSD/src 4dc1962usr.sbin/bhyve iov.c

bhyve: Fix assignment of *niov2 in split_iov()

niov2 returns the number of entries in the iovec starting at offset
"offset".  Here we are unconditionally setting it to 1, which of course
isn't right.

Fixes:          a28cf86c4171 ("bhyve/virtio: Rework iovec handling functions for efficiency and clarity")
Reported by:    Claude and Ada Logics
Reviewed by:    Hans Rosenfeld <rosenfeld at grumpf.hope-2000.org>
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58625
DeltaFile
+1-1usr.sbin/bhyve/iov.c
+1-11 files

HardenedBSD/src dfdd8aflib/libsys pdfork.2

pddupfd.2: fix errno value returned for non-procdesc argument

Noted  and reviewed by: lwhsu
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D58666
DeltaFile
+4-4lib/libsys/pdfork.2
+4-41 files

HardenedBSD/src e8b9b6bsys/kern kern_sig.c kern_exit.c, sys/sys procdesc.h

pdkill(2), pdgetpid(2): return EBADF if the file type is not procdesc

For pdwait(2) and pddupfd(2), the returned error is kept EINVAL.

PR:     297293
Reviewed by:    lwhsu, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D58666
DeltaFile
+6-4sys/kern/sys_procdesc.c
+2-2sys/sys/procdesc.h
+2-1sys/kern/kern_sig.c
+2-1sys/kern/kern_exit.c
+12-84 files

HardenedBSD/src 6fe940ccontrib/lib9p/example server.c, libexec/rc rc.conf

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+27-22sys/kern/tty.c
+15-11sys/netinet6/raw_ip6.c
+4-4usr.sbin/rtadvd/rtadvd.c
+4-4libexec/rc/rc.conf
+6-1share/man/man4/ctl.4
+2-2contrib/lib9p/example/server.c
+58-445 files not shown
+64-4811 files

HardenedBSD/src 7e28c96contrib/lib9p/example Makefile server.c, share/man/man4 ctl.4

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+27-22sys/kern/tty.c
+15-11sys/netinet6/raw_ip6.c
+4-4usr.sbin/rtadvd/rtadvd.c
+6-1share/man/man4/ctl.4
+2-2contrib/lib9p/example/server.c
+1-1contrib/lib9p/example/Makefile
+55-412 files not shown
+57-418 files

HardenedBSD/src 32daa4ccddl/usr.bin/ctfmerge ctfmerge.1, sbin/nvmecontrol nvmecontrol.8

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+51-29cddl/usr.bin/ctfmerge/ctfmerge.1
+13-2share/man/man4/padlock.4
+5-1sbin/nvmecontrol/nvmecontrol.8
+2-2share/man/man4/rtw89.4
+2-2share/man/man4/rtw88.4
+2-2share/man/man4/iwlwifi.4
+75-381 files not shown
+76-397 files

HardenedBSD/src e27e9d6libexec/rc rc.conf, libexec/rc/rc.d os-release

HBSD: Update /etc/os-release and /var/run/os-release

Now that we have completed the migration to Radicle, we need to update
the URLs and other auxiliary data in the os-release files.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
MFC-to:         15-STABLE
DeltaFile
+4-4libexec/rc/rc.conf
+2-2libexec/rc/rc.d/os-release
+6-62 files

HardenedBSD/src 6a2f1e3sbin/nvmecontrol nvmecontrol.8

nvmecontrol.8: Explain non-operational power modes

`nvmecontrol power -l ...` lists the available power modes.
Non-operational modes are marked with an asterisk. While here,
add <device-id | namespace-id> to the "nvmecontrol power" synopsis.

MFC after:              3 days
Reviewed by:            dab, imp, michaelo, ziaee
Differential Revision:  https://reviews.freebsd.org/D58480

(cherry picked from commit 868158f7fd2a172ef22f1b6b682cc1d38e54cf63)
DeltaFile
+5-1sbin/nvmecontrol/nvmecontrol.8
+5-11 files

HardenedBSD/src 70c87c0cddl/usr.bin/ctfmerge ctfmerge.1

ctfmerge.1: Fix uniqlabel typos

The flag is -D, but it was written as a second -d. Add a period too.

MFC after:      3 days

(cherry picked from commit 4f293e32e4529617dd05bd64fd3c22a57a56a355)
DeltaFile
+2-2cddl/usr.bin/ctfmerge/ctfmerge.1
+2-21 files

HardenedBSD/src 2cdb856share/man/man5 pf.conf.5

pf.conf.5: Fix typo

Fix small typo in pf.conf(5)

MFC after:              3 days
Reviewed by:            ziaee
Differential Revision:  https://reviews.freebsd.org/D57938

(cherry picked from commit bbc2d15857b8c44cf8558bf00663b508d421c94c)
DeltaFile
+1-1share/man/man5/pf.conf.5
+1-11 files

HardenedBSD/src 279fdaashare/man/man4 rtw89.4 rtw88.4

iwlwifi.4, rtw88.4, rtw89.4: Fix xref typos

MFC after:      3 days
Reviewed by:    bz, ziaee
Fixes:  0a2f7683bf0c ("man: iwlwifi/rtw88/rtw89: update man pages for Linux v7.0 based updates")
Differential Revision:  https://reviews.freebsd.org/D57720

(cherry picked from commit d036b3b348d3f7be21f79461d7ad48e97b088ba8)
DeltaFile
+2-2share/man/man4/rtw89.4
+2-2share/man/man4/rtw88.4
+2-2share/man/man4/iwlwifi.4
+6-63 files

HardenedBSD/src 5650618cddl/usr.bin/ctfmerge ctfmerge.1

ctfmerge.1: Import ENVIRONMENT from NetBSD

Import the ENVIRONMENT section from NetBSD, minus the variable that our
ctfmerge does not have. Alphabetize them, polish grammar and alignment,
and add the variables to the man database. While here, remove whitespace
from the end of some lines to quiet linter.

MFC after:      3 days
PR:             291186
Co-authored-by: Alexander Ziaee <ziaee at FreeBSD.org>
Obtained from:  NetBSD (christos <christos at NetBSD.org>, 8a0c0d8)
Differential Revision:  https://reviews.freebsd.org/D54054

(cherry picked from commit 32cf24b725fdf899fb642c47004b69fcfae9b9db)
DeltaFile
+49-27cddl/usr.bin/ctfmerge/ctfmerge.1
+49-271 files

HardenedBSD/src c553a42share/man/man4 padlock.4

padlock.4: Update slightly for 64-bit hardware

- Change the document description to "Via and Zhaoxin CPU crypto driver"
- Add a HARDWARE section mentioning these in the hardware release note

This manual still needs desperate help, but just this little bit could
have saved a lot of confusion. I'd write more if I had information.

PR:             295517
Fixes:          14b8531c4ccb8 (Restore padlock_rng the the amd64 build)
MFC after:      3 days (to 15 only)
Reviewed by:    bcr, asomers
Differential Revision:  https://reviews.freebsd.org/D57920

(cherry picked from commit 380c6f59c4f87dbc45a67983d927700ca7e22be2)
DeltaFile
+13-2share/man/man4/padlock.4
+13-21 files

HardenedBSD/src 200de1busr.sbin/rtadvd rtadvd.c

rtadvd(8): Fix RA flag inconsistency messages

During flag inconsistency report, we handle rai->rai_otherflg
as a bool, but the value is 0x40. Make it a simple number comparison.

PR:             295995
Reviewed by:    markj, Faraz Vahedi <kfv at kfv.io>
MFC after:      3 days
Differential Revision: https://reviews.freebsd.org/D58672
DeltaFile
+4-4usr.sbin/rtadvd/rtadvd.c
+4-41 files

HardenedBSD/src 62ccaeclib/libc/gen exterr_cat_filenames.h, sys/kern tty.c

kern/tty.c: Exterrorize returns

Approved by:    kib
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2349
DeltaFile
+27-22sys/kern/tty.c
+1-0sys/sys/exterr_cat.h
+1-0lib/libc/gen/exterr_cat_filenames.h
+29-223 files

HardenedBSD/src a4e4b1eusr.sbin/bsdinstall/scripts auto

HBSD: Explicitly dissuade from pkgbase use

HardenedBSD isn't ready for pkgbase. I would rather folks not use it,
but if they do, they know it's really not supported.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
MFC-to:         15-STABLE
DeltaFile
+1-1usr.sbin/bsdinstall/scripts/auto
+1-11 files

HardenedBSD/src e6b0384contrib/lib9p/example Makefile server.c

lib9p: fix compilation errors in example server

Reviewed by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D58634
DeltaFile
+2-2contrib/lib9p/example/server.c
+1-1contrib/lib9p/example/Makefile
+3-32 files

HardenedBSD/src 3c8f843share/man/man4 ctl.4

ctl.4: Document the assumption that CTL HA runs only on trusted networks

The CTL High Availablity clustering feature allows a pair of hosts to
implement transparent failover.  The implementation uses a TCP
connection to exchange messages.  There is no authentication mechanism
and the protocol itself embeds kernel pointers in the messages exchanged
between HA hosts.  This property (of CTL_MSG_DATAMOVE messages
specifically), as well as insufficient validation of inbound messages,
mean that anyone able to access a CTL HA port is able to remotely
execute code on that host.

Provide a warning to this effect in the CTL man page.

Reported by:    Ryan of Calif.io
Reviewed by:    ziaee, ken, mav
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58622
DeltaFile
+6-1share/man/man4/ctl.4
+6-11 files

HardenedBSD/src 196874csys/netinet6 raw_ip6.c

rawip: Fix handling of checksums in rip6_input()

A v6 raw socket may ask the kernel to validate the checksum of an
inbound packet.  If it does, and the validation fails, we discard the
packet, but this isn't really right: other raw sockets may wish to
receive a copy of the packet anyway.

Rework checksum handling to address this problem, and use a flag to
avoid computing the checksum more than once for a given packet.

Fixes:          de2d47842e880281 ("SMR protection for inpcbs")
Reviewed by:    pouria, glebius
Reported by:    Yunzhi Ke
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58559
DeltaFile
+15-11sys/netinet6/raw_ip6.c
+15-111 files

HardenedBSD/src 56c0d82sys/fs/pseudofs pseudofs.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+0-1sys/fs/pseudofs/pseudofs.c
+0-11 files

HardenedBSD/src b6c0d2esys/fs/pseudofs pseudofs.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-1sys/fs/pseudofs/pseudofs.c
+0-11 files