HardenedBSD/src 481a415lib/libifconfig libifconfig.c, sys/net rtsock.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+3-3sys/netlink/route/rt.c
+2-2sys/net/rtsock.c
+2-2sys/net/route/route_helpers.c
+2-2lib/libifconfig/libifconfig.c
+3-1sys/sys/socket.h
+1-1sys/net/route/route_ddb.c
+13-113 files not shown
+16-149 files

HardenedBSD/src e3319b7lib/libifconfig libifconfig.c, sys/net rtsock.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+3-3sys/netlink/route/rt.c
+2-2sys/net/rtsock.c
+2-2sys/net/route/route_helpers.c
+2-2lib/libifconfig/libifconfig.c
+3-1sys/sys/socket.h
+1-1sys/net/route/route_ddb.c
+13-113 files not shown
+16-149 files

HardenedBSD/src 315ce11sys/arm64/arm64 trap.c, sys/dev/e1000 igb_txrx.c em_txrx.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+11-0sys/arm64/arm64/trap.c
+2-4sys/dev/hwpmc/hwpmc_amd.c
+6-0sys/dev/e1000/igb_txrx.c
+6-0sys/dev/e1000/em_txrx.c
+25-44 files

HardenedBSD/src 60dd46dsys/arm64/arm64 trap.c

arm64: Use the fault handler when one is provided

In align_abort() and tag_check_abort(), if we got a fault while in kernel,
do not panic if a fault handler has been provided. We may get such a fault
when trying to read or write userland data, it can at least happen with
_umtx_op() if an unaligned pointer is provided. Instead, just let the
fault handler deal with it.

MFC After: 1 week
Approved by: andrew
Differential Revision: https://reviews.freebsd.org/D58426

(cherry picked from commit c6f5d8fb269fd67a8206420b4e7d67a93bc80733)
Signed-off-by: Olivier Houchard <cognet at FreeBSD.org>
DeltaFile
+11-0sys/arm64/arm64/trap.c
+11-01 files

HardenedBSD/src ddd850alib/libifconfig libifconfig_internal.c libifconfig.c, sys/net rtsock.c

sys/socket.h: Fix AF_MAX

AF_MAX was always intended to be one more than the greatest allocated
value.  Jeff broke this in 2013.  Unfortunately, a bunch of people then
decided to adapt to the mistake instead of correcting it.

Fixes:          863c7e45628d (" - Reserve a special AF for SDP.  The one we were incorrectly using before    was taken by another AF.")
MFC after:      3 days
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    kevans, glebius
Differential Revision:  https://reviews.freebsd.org/D58597
DeltaFile
+3-3sys/netlink/route/rt.c
+2-2sys/net/rtsock.c
+2-2sys/net/route/route_helpers.c
+2-2lib/libifconfig/libifconfig.c
+3-1sys/sys/socket.h
+1-1lib/libifconfig/libifconfig_internal.c
+13-113 files not shown
+16-149 files

HardenedBSD/src 410403dsys/dev/e1000 igb_txrx.c em_txrx.c

e1000: report UDP RSS hash type on igb/em

{em,igb}_determine_rsstype() mapped only the TCP and bare-IP RSS descriptor
types; the UDP types returned M_HASHTYPE_NONE.
The hardware does hash UDP, but with a NONE hashtype iflib skips its
flowid-based TX queue spread, so all forwarded UDP egressed on a single queue
and serialized transmit on one core.

Add the three UDP cases (IPV4_UDP, IPV6_UDP, IPV6_UDP_EX) so egress spreads
across all TX queues.

Reviewed by:    kbowling, gallatin
Approved by:    kbowling
MFC after:      1 week
Sponsored by:   Netflix
Differential Revision:  https://reviews.freebsd.org/D58513

(cherry picked from commit 285c749f575ed7f9e60555037f23ac673084c62a)
DeltaFile
+6-0sys/dev/e1000/igb_txrx.c
+6-0sys/dev/e1000/em_txrx.c
+12-02 files

HardenedBSD/src 38af24esys/dev/hwpmc hwpmc_amd.c

hwpmc: fix event allocation on pre-Zen AMD CPUs

amd_allocate_pmc() chose the pmu-events code path whenever pmc_cpuid was
non-empty, and rejected any allocation lacking PMC_F_EV_PMU.
But pmc_cpuid is set for every AMD CPU, while the pmu-events tables only cover
Zen and later.
On older families (K8, Bobcat, Jaguar/16h, Bulldozer) libpmc finds no
pmu-events entry and falls back to the legacy path, which never sets
PMC_F_EV_PMU.

Reviewed by:    mhorne
Approved by:    mhorne
MFC after:      1 week
Sponsored by:   Netflix
Differential Revision:  https://reviews.freebsd.org/D58468

(cherry picked from commit 6c4d9b9af1a3b247bf82a4228c835d106f535613)
DeltaFile
+2-4sys/dev/hwpmc/hwpmc_amd.c
+2-41 files

HardenedBSD/src 08abff8stand/efi/libefi efinet.c, stand/libsa bootp.h bootp.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+233-0stand/efi/libefi/efinet.c
+59-24stand/libsa/bootp.c
+9-3sys/fs/nfs/nfs_commonkrpc.c
+6-3usr.bin/ipcrm/ipcrm.1
+7-0stand/libsa/bootp.h
+3-2usr.bin/elfctl/elfctl.1
+317-3222 files not shown
+359-6728 files

HardenedBSD/src 59d993astand/efi/libefi efinet.c, stand/libsa bootp.h bootp.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+233-0stand/efi/libefi/efinet.c
+59-24stand/libsa/bootp.c
+9-3sys/fs/nfs/nfs_commonkrpc.c
+6-3usr.bin/ipcrm/ipcrm.1
+7-0stand/libsa/bootp.h
+3-2usr.bin/elfctl/elfctl.1
+317-3222 files not shown
+359-6728 files

HardenedBSD/src 495826fstand/efi/libefi efinet.c, stand/i386/libi386 pxe.c

stand: add ARCH and MSZ into DHCP requests

It should give DHCP servers more information for proper responses.
DeltaFile
+58-17stand/libsa/bootp.c
+18-0stand/efi/libefi/efinet.c
+7-0stand/libsa/bootp.h
+3-0stand/i386/libi386/pxe.c
+86-174 files

HardenedBSD/src f70e466stand/efi/libefi efinet.c, stand/libsa bootp.c

stand: consume UEFI PXE Base Code cache to seed DHCP

Populate stand/libsa/bootp.c's bootp_response global from the UEFI PXE
Base Code Protocol's cached DhcpAck, so bootp() can enter RFC 2131
INIT-REBOOT and skip DISCOVER/OFFER instead of running a fresh DHCP
transaction after the firmware has already done one.
DeltaFile
+215-0stand/efi/libefi/efinet.c
+1-7stand/libsa/bootp.c
+216-72 files

HardenedBSD/src ff2bc64lib/libc/stdbit stdc_count_ones.3 stdc_bit_width.3, usr.bin/elfctl elfctl.1

manuals: Fix Fx and nearby mechanical typos

Fix compiler warnings related to the Fx macro, as well as all other
mechanical typos that were visible within one screenful of them. These
cause rendering glitches on various toolchains with various of the five
and a half decades of rich output formats and tooling manpages scale to.

The *x macro set specifies operating systems. These macros take the rest
of the line as an argument. Sometimes, a space was not used to separate
the argument of Fx and the trailing period. Another, FreeBSD Foundation
was misrepresented as an operating system version instead of an author.
Two more had other parts of the sentence supplied as an argument to Fx.

While I had those open, fix the other mechancial typos visible on those
specific screenfulls. Fix a list width glitch, correct section typo
AUTHOR to AUTHORS, and switch AUTHORS sections containing prose to
prose-mode so that they wrap freely when rendered.

PR:             297248

    [5 lines not shown]
DeltaFile
+6-3usr.bin/ipcrm/ipcrm.1
+3-2usr.bin/elfctl/elfctl.1
+2-2lib/libc/stdbit/stdc_count_ones.3
+2-2lib/libc/stdbit/stdc_bit_width.3
+2-2lib/libc/stdbit/stdc_bit_floor.3
+2-2lib/libc/stdbit/stdc_bit_ceil.3
+17-1317 files not shown
+48-4023 files

HardenedBSD/src bf9965elib/libc/gen fts.c uexterr_format.c, sys/kern subr_exterr.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+1,355-0lib/libc/gen/fts-compat15.c
+169-0sys/kern/subr_exterr.c
+97-0lib/libc/gen/fts-compat15.h
+78-6lib/libc/gen/uexterr_format.c
+38-11lib/libc/gen/fts.c
+36-11sys/netgraph/ng_ipfw.c
+1,773-2815 files not shown
+1,981-5721 files

HardenedBSD/src b43e98clib/libc/gen fts.c uexterr_format.c, sys/kern subr_exterr.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1,355-0lib/libc/gen/fts-compat15.c
+169-0sys/kern/subr_exterr.c
+97-0lib/libc/gen/fts-compat15.h
+78-6lib/libc/gen/uexterr_format.c
+38-11lib/libc/gen/fts.c
+36-11sys/netgraph/ng_ipfw.c
+1,773-2815 files not shown
+1,981-5721 files

HardenedBSD/src cfca4e2bin/sh input.h eval.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+70-72bin/sh/input.c
+2-2bin/sh/parser.c
+1-1bin/sh/input.h
+1-1bin/sh/eval.c
+74-764 files

HardenedBSD/src 5ab48fbsys/fs/nfs nfs_commonkrpc.c

nfs_commonkrpc.c: Fix recovery that was broken by 4d80d4913e79

Commit 4d80d4913e79 added a check for nfsess_defunct already
being set.  This was incorrect because, once set, nfsess_defunct
remains set and an additional recovery might be needed.

This patch reverts this part of 4d80d4913e79.

PR:     297252
Suggested by:   olivier
MFC after:      3 days
Fixes:  4d80d4913e79 ("nfs: Fix argument typo to avoid a crash")
DeltaFile
+9-3sys/fs/nfs/nfs_commonkrpc.c
+9-31 files

HardenedBSD/src d3a0bf0sys/netgraph ng_ipfw.c

ng_ipfw: provide a tree for faster hook lookup

This should assist setups that connect a lot of nodes to ipfw: and then
distribute traffic with ipfw(4) tablearg feature.

Reviewed by:            pouria
Differential Revision:  https://reviews.freebsd.org/D58547
DeltaFile
+36-11sys/netgraph/ng_ipfw.c
+36-111 files

HardenedBSD/src 295f102share/man/man9 exterror.9, sys/conf files

exterror(9): dynamic kernel categories

Make it possible to define categories without compiling their
paths into libc (important for third-party modules).  The
EXTERR_CATEGORY_DYNAMIC macro can be defined to a string describing the
compilation unit (generally the path relative to src/sys) which takes
the place of EXTERR_CATEGORY.

These strings are assembled in linker sets with category numbers
assigned at system startup or module load time.  The strings can be
retrieved from the kern.exterr.categories.<category> sysctl.

Reviewed by:    kib
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D58237
DeltaFile
+169-0sys/kern/subr_exterr.c
+36-0sys/kern/kern_linker.c
+27-0tests/sys/kern/exterr_test.c
+22-0sys/sys/exterrvar.h
+9-2share/man/man9/exterror.9
+1-0sys/conf/files
+264-26 files

HardenedBSD/src 7516130usr.bin/kdump kdump.c

kdump(1): minimally adapt to exterror category sources

Add some minimal handling of category sources other than static kernel
sources.  We don't actually look up dynamic sources yet (that would
require extended trace records to add the file names to the trace file
since we can't assume the trace file is running on a kernel with the
same numbers.)

Make the decision to append a "src/" prefix to each file name
dependent on the category source.

Reviewed by:    kib
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D58412
DeltaFile
+26-6usr.bin/kdump/kdump.c
+26-61 files

HardenedBSD/src 5dff273lib/libc/gen uexterr_format.c

uexterr_gettext(3): support dynamic kernel categories

Add an uncached sysctl based implementation which retrieves individual
categories.  A cache would be an obvious extension should this optional
feature that can only be enabled by an environmental varible have a
noticable performance impact in a case that matters.

Reviewed by:    kib
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D58238
DeltaFile
+64-4lib/libc/gen/uexterr_format.c
+64-41 files

HardenedBSD/src bbf95a9lib/libc/gen uexterr_format.c, sys/sys exterr_cat.h

exterror(9): split category into multiple sources

The static, global index into an array of strings is simple, cheap,
and works for the base kernel, but is unworkable for (potentially
third-party) kernel modules or for arbitrary userspace code.  Swipe a
few of the top bits of category to indicate a source with all-zeros
being the current model (EXTERR_CAT_SRC_KERN_STATIC).  Add two
additional sources EXTERR_CAT_SRC_KERN_DYNAMIC and EXTERR_CAT_SRC_USER
with stub implementations.

Reviewed by:    kib
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D58236
DeltaFile
+15-3lib/libc/gen/uexterr_format.c
+12-0sys/sys/exterr_cat.h
+27-32 files

HardenedBSD/src e96ecc7bin/sh input.h eval.c

bin/sh: Fix history long line truncation/corruption

When reading from standard input with editline history enabled, increase
buffer size to accomodate long lines so that history is recorded
correctly. Cleanup el_gets() handling avoiding potentially dangerous
retention of pointers to editline buffers across calls.  Ensure struct
parsefile objects are properly zero initialised when created. Remove
push argument from setinputstring() and simplify logic as it was always
called with a value of one and as was written was potentially dangerous
if ever called with a value of zero.

This commit does not fix long lines when history is enabled but editing
is not (e.g. if there is no terminal).

MFC after:      3 weeks
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2028
Signed-off-by: Kristofer Peterson <kris at tranception.com>
(cherry picked from commit 95e4fce8f0c4fc6bf828288b1d63faf0f1300198)
DeltaFile
+70-72bin/sh/input.c
+2-2bin/sh/parser.c
+1-1bin/sh/input.h
+1-1bin/sh/eval.c
+74-764 files

HardenedBSD/src 1c0d2f0sys/netinet ip_mroute.c

ip_mroute: Don't assume that a multicast router is running

The SIOCGETSGCNT handler may be invoked in this scenario, and if no
router has initialized the lookup table, we'll have
mfct->mfchashtbl == NULL.

PR:             297148
Reported by:    Robert Morris
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
DeltaFile
+2-0sys/netinet/ip_mroute.c
+2-01 files

HardenedBSD/src d8afb9bsys/ofed/drivers/infiniband/core ib_roce_gid_mgmt.c

sys/ofed: don't stop removing stale RoCE GIDs at the first hole

When cleaning up stale GIDs the scan stopped as soon as
rdma_get_gid_attr() failed. But that can also happen for empty entries
in the middle of the table, so a single gap left everything after it
behind and the GID entries could eventually run out.

Now the whole table is scanned and the empty slots are simply skipped.

Reviewed by:  kib, jhb
Sponsored by: Nvidia networking
Fixes:        6a75471dbcf0 ("OFED: Various changes from Linux 4.19")
Differential revision: https://reviews.freebsd.org/D58510
DeltaFile
+5-2sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c
+5-21 files

HardenedBSD/src 9f07103sys/ofed/drivers/infiniband/core ib_roce_gid_mgmt.c

sys/ofed: fix GID table reference leak in roce_gid_update_addr_callback()

The "add missing GIDs" loop uses rdma_find_gid_by_port() to test whether
a GID already exists, but forgets to drop the reference it returns. So
every rescan that finds an existing GID leaks one, which pins the entry
and prevents its slot from ever being freed on delete.
Just release the reference once the GID is found, like the "remove stale
GIDs" loop already does.

Reported by:  Wafa Hamzah <wafah at nvidia.com>
Reviewed by:  kib, jhb
Sponsored by: Nvidia networking
Fixes:        6a75471dbcf0 ("OFED: Various changes from Linux 4.19")
Differential revision: https://reviews.freebsd.org/D58511
DeltaFile
+3-1sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c
+3-11 files

HardenedBSD/src 4bd01d6include fts.h, lib/libc/gen Symbol.map fts.3

fts: refactor to use fd-relative operations internally

Replace all _open() calls with _openat() in __fts_open(), fts_read(),
and fts_children().  Replace statfs() with _fstatfs().

Add fts_dirfd to struct _ftsent, set to the file descriptor of the
parent directory. Callers can use openat(ent->fts_dirfd, ent->fts_name,
...) to access files safely without relying on fts_accpath, which
enables programs in capability mode to open the files described by
_ftsent.

This is a preparatory change for fts_openat() which will allow callers
to provide a pre-opened directory fd, enabling fts(3) traversal inside
Capsicum capability mode.

Mirror all fts_open() changes to fts_open_b().

As a result of expanding _ftsend, publish new ELF symbol versions for
fts_openat and related functions.

    [4 lines not shown]
DeltaFile
+1,355-0lib/libc/gen/fts-compat15.c
+97-0lib/libc/gen/fts-compat15.h
+38-11lib/libc/gen/fts.c
+9-9lib/libc/gen/Symbol.map
+17-1lib/libc/gen/fts.3
+2-0include/fts.h
+1,518-211 files not shown
+1,519-217 files

HardenedBSD/src 9590878sys/kern kern_event.c

kqueue: stream the knote report instead of buffering all of it

kern_proc_kqueues_out() sized its intermediate sbuf from the preceding
sizing pass, so dumping core for a process with many knotes wired a
buffer as large as the entire report.

Shrank the intermediate to one page and added a drain that copied into
the caller's sbuf up to maxlen, stopping the walk once it was reached.
Truncation stayed byte exact.
A dump of 384k knotes peaked at 20 KB of M_SBUF instead of 445 MB.

Reviewed by:    adrian, markj
Differential Revision:  https://reviews.freebsd.org/D58584
MFC after: 1 week
DeltaFile
+34-8sys/kern/kern_event.c
+34-81 files

HardenedBSD/src 5078280sys/kern kern_event.c

kqueue: fix the always-empty NT_PROCSTAT_KQUEUES core note

sbuf reserves a byte of its buffer for the terminator, so the sbuf
created with maxlen held one byte less than the sizing pass had
computed.  The last record overflowed it, sbuf_bcat() failed, and the
error == 0 guard skipped the copy into the caller's sbuf, so the note
has been emitted at full size but zero filled since 5e7c43ff02dc.

Fixes: 5e7c43ff02dc

Reviewed by:    adrian, markj
Differential Revision:  https://reviews.freebsd.org/D58583
MFC after: 1 week
DeltaFile
+1-1sys/kern/kern_event.c
+1-11 files

HardenedBSD/src 396e6d6share/misc bsd-family-tree

bsd-family-tree: add NetBSD 11.0
DeltaFile
+2-0share/misc/bsd-family-tree
+2-01 files

HardenedBSD/src 56f691flib/libifconfig libifconfig_sfp.c, sys/dev/igc if_igc.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+107-9sys/dev/igc/if_igc.c
+47-47sys/netpfil/pf/pf_nl.c
+9-67sys/vm/vm_page.c
+73-1usr.sbin/mtest/mtest.c
+39-15sys/sys/_atomic_subword.h
+37-9lib/libifconfig/libifconfig_sfp.c
+312-14824 files not shown
+419-20830 files