HardenedBSD/src 63c35c2sys/dev/ixgbe ixgbe_e610.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+12-23sys/dev/ixgbe/ixgbe_e610.c
+12-231 files

HardenedBSD/src c58ca0bsys/dev/ixgbe ixgbe_e610.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+12-23sys/dev/ixgbe/ixgbe_e610.c
+12-231 files

HardenedBSD/src 62d5d11sys/dev/ixgbe ixgbe_e610.c

ix(4): Remove workaround for 2.5/5G speeds on E610

The problem observed on X550 adapters with 2.5 and 5 Gbps speeds
negotiation on some switches is not affecting E610 adapters.
Remove workaround, which omitted those speeds in the list
of initially advertised speeds and advertise all speeds
supported by adapter.

Signed-off-by: Krzysztof Galazka <krzysztof.galazka at intel.com>

Reviewed by:    kbowling
Tested by:      Mateusz Moga <mateusz.moga at intel.com>
MFC after:      1 week
Sponsored by:   Intel Corporation
Differential Revision:  https://reviews.freebsd.org/D57339
DeltaFile
+12-23sys/dev/ixgbe/ixgbe_e610.c
+12-231 files

HardenedBSD/src 621cb2dcontrib/sqlite3 VERSION sqlite3.h, contrib/sqlite3/autosetup sqlite-config.tcl

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+1,198-445contrib/sqlite3/sqlite3.c
+109-44contrib/sqlite3/shell.c
+21-7contrib/sqlite3/sqlite3.h
+10-8sys/dev/asmc/asmc.c
+6-2contrib/sqlite3/autosetup/sqlite-config.tcl
+1-1contrib/sqlite3/VERSION
+1,345-50710 files not shown
+1,355-51716 files

HardenedBSD/src e88d183contrib/sqlite3 VERSION sqlite3.h, contrib/sqlite3/autosetup sqlite-config.tcl

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1,198-445contrib/sqlite3/sqlite3.c
+109-44contrib/sqlite3/shell.c
+21-7contrib/sqlite3/sqlite3.h
+10-8sys/dev/asmc/asmc.c
+6-2contrib/sqlite3/autosetup/sqlite-config.tcl
+1-1contrib/sqlite3/VERSION
+1,345-50710 files not shown
+1,355-51716 files

HardenedBSD/src b87b5b8share/man/man4 igc.4, sys/dev/igc igc_mac.c igc_hw.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+150-12sys/dev/igc/if_igc.c
+3-3share/man/man4/igc.4
+3-0sys/dev/igc/if_igc.h
+1-0sys/dev/igc/igc_mac.c
+1-0sys/dev/igc/igc_hw.h
+1-0sys/dev/igc/igc_defines.h
+159-151 files not shown
+160-157 files

HardenedBSD/src 8e968c5sys/netgraph/bluetooth/l2cap ng_l2cap_llpi.c

bluetooth(4): Fix a typo in a kernel message in l2cap

- s/staring/starting/

MFC after:      5 days
DeltaFile
+1-1sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
+1-11 files

HardenedBSD/src 251e6efsys/netpfil/ipfw dn_sched_fq_pie.c

ipfw(4): Fix a typo in a source code comment

- s/varaiables/variables/

MFC after:      3 days
DeltaFile
+1-1sys/netpfil/ipfw/dn_sched_fq_pie.c
+1-11 files

HardenedBSD/src 8362aecsys/dev/ichwd i6300esbwd.c

ichwd(4): Fix a typo in a source code comment

- s/modifing/modifying/

MFC after:      3 days
DeltaFile
+1-1sys/dev/ichwd/i6300esbwd.c
+1-11 files

HardenedBSD/src c47b430sys/dev/fxp rcvbundl.h

fxp(4): Fix a typo in a source code comment

- s/modifing/modifying/

MFC after:      3 days
DeltaFile
+1-1sys/dev/fxp/rcvbundl.h
+1-11 files

HardenedBSD/src 709bd45sys/dev/ppbus ppb_msq.h

ppbus(4): Fix a typo in a source code comment

- s/predifined/predefined/

MFC after:      3 days
DeltaFile
+1-1sys/dev/ppbus/ppb_msq.h
+1-11 files

HardenedBSD/src 88293bdsys/vm swap_pager.c

swap_pager: Fix a typo in a source code comment

- s/errornous/erroneous/

MFC after:      3 days
DeltaFile
+1-1sys/vm/swap_pager.c
+1-11 files

HardenedBSD/src 27c70desys/fs/nullfs null_vnops.c

nullfs(4): Fix a typo in a source code comment

- s/modifing/modifying/

MFC after:      3 days
DeltaFile
+1-1sys/fs/nullfs/null_vnops.c
+1-11 files

HardenedBSD/src cd4aae2lib/msun/src catrig.c

msun: Fix a typo in a source code comment

- s/uneccessarily/unnecessarily/

Obtained from:  NetBSD
MFC after:      3 days
DeltaFile
+1-1lib/msun/src/catrig.c
+1-11 files

HardenedBSD/src 14e3daacontrib/sqlite3 sqlite3rc.h VERSION, contrib/sqlite3/autosetup sqlite-config.tcl

sqlite3: Vendor import of sqlite3 3.53.3

Release notes at https://www.sqlite.org/releaselog/3_53_3.html.

Obtained from:  https://www.sqlite.org/2026/sqlite-autoconf-3530300.tar.gz

MFC after:      2 weeks

Merge commit 'e698feec080925c6cffa9ec31be884daa5cea536'
DeltaFile
+1,198-445contrib/sqlite3/sqlite3.c
+109-44contrib/sqlite3/shell.c
+21-7contrib/sqlite3/sqlite3.h
+6-2contrib/sqlite3/autosetup/sqlite-config.tcl
+1-1contrib/sqlite3/sqlite3rc.h
+1-1contrib/sqlite3/VERSION
+1,336-5006 files

HardenedBSD/src 3782626sys/dev/asmc asmcmmio.c asmc.c

asmc: prefer MMIO backend over PIO when both are present

T2, T1, and some pre-T1 Macs advertise a legacy PIO
range in the SMC ACPI _CRS alongside a live MMIO window, but the
silicon behind the PIO range is bogus.

Try MMIO first, validate via LDKN >= 2, fall back to PIO if that
fails or no MMIO resource is present. Drop "(T2)" from the backend
message since MMIO isn't T2-exclusive.

MFC: 1 week
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D58839
DeltaFile
+10-8sys/dev/asmc/asmc.c
+1-1sys/dev/asmc/asmcmmio.c
+11-92 files

HardenedBSD/src f310b83share/man/man4 igc.4, sys/dev/igc if_igc.h if_igc.c

igc: Add VLAN hardware filtering

Borrow the e1000 VLAN filter table

Ambiguous presence of the feature by Intel was settled by DPDK and
emperical testing.

Relnotes:       yes

(cherry picked from commit 8f779f159e2198c85b4fcb8685989879a9330104)
DeltaFile
+107-9sys/dev/igc/if_igc.c
+3-3share/man/man4/igc.4
+3-0sys/dev/igc/if_igc.h
+113-123 files

HardenedBSD/src 49c6cf8sys/dev/igc igc_regs.h igc_mac.c

igc: Correct hardware error statistics

Track RERC separately instead of adding receive errors to the collision
count, and read the previously omitted RXERRC register.  Include RFC in
input errors because CRCERRS does not count bad-CRC runts, implementing
the I225 length-error accounting workaround alongside RUC and ROC.

Stop treating host transmit MAC discards as receive errors.  Expose both
RERC and HTDPMC as dedicated MAC statistics so their overlapping counts
remain available without corrupting aggregate interface counters.

(cherry picked from commit a108ee9138a698f212d6d6832d54e88ce6786617)
DeltaFile
+14-3sys/dev/igc/if_igc.c
+1-0sys/dev/igc/igc_regs.h
+1-0sys/dev/igc/igc_mac.c
+1-0sys/dev/igc/igc_hw.h
+17-34 files

HardenedBSD/src 3fab6b2sys/dev/igc igc_defines.h if_igc.c

igc: Work around I225 v1 minimum IPG erratum

I225 v1 cannot receive the minimum inter-packet gap required at
2.5 Gb/s.  For affected back-to-back links, Intel recommends using a
15-byte transmit IPG instead of 12 bytes.

Program TIPG.IPGT to 0xb for pre-v2 I225 devices at 2.5 Gb/s and
restore the default at lower speeds.  Avoid penalizing fixed I225 and
I226 parts.

(cherry picked from commit 709426551c6a3607fb5a33f5b8dbb87cfa9c8125)
DeltaFile
+29-0sys/dev/igc/if_igc.c
+1-0sys/dev/igc/igc_defines.h
+30-02 files

HardenedBSD/src 3e4333clib/libc/gen fts.c, lib/libc/tests/gen fts_regress_test.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+58-0lib/libc/tests/gen/fts_regress_test.c
+16-8sys/net/if_epair.c
+7-3share/man/man4/epair.4
+2-1usr.sbin/zonectl/zonectl.c
+1-1lib/libc/gen/fts.c
+1-0sys/arm64/linux/linux_emul_md.c
+85-132 files not shown
+87-138 files

HardenedBSD/src 4b93eaelib/libc/gen fts.c, lib/libc/tests/gen fts_regress_test.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+58-0lib/libc/tests/gen/fts_regress_test.c
+16-8sys/net/if_epair.c
+7-3share/man/man4/epair.4
+2-1usr.sbin/zonectl/zonectl.c
+1-1lib/libc/gen/fts.c
+1-0sys/arm64/linux/linux_emul_md.c
+85-132 files not shown
+87-138 files

HardenedBSD/src 39fc649share/man/man4 ix.4, sys/dev/ixgbe ixgbe.h if_ix.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+496-55sys/dev/ixgbe/if_sriov.c
+286-58sys/dev/ixgbe/if_ixv.c
+238-78sys/dev/ixgbe/if_ix.c
+53-0sys/net/iflib.c
+33-1share/man/man4/ix.4
+22-1sys/dev/ixgbe/ixgbe.h
+1,128-19310 files not shown
+1,196-21316 files

HardenedBSD/src 374799fsys/arm64/linux linux_emul_md.c, sys/i386/linux linux_emul_md.c

linux: sort sys headers in linux_emul_md.c

style(9): sys/param.h, then sys/systm.h, then the remaining kernel
headers alphabetically.  imgact.h belongs before proc.h.

Reported by:    jhibbits
MFC after:      1 month
Reviewed by:    jhibbits
Differential Revision:  https://reviews.freebsd.org/D58884
DeltaFile
+1-1sys/i386/linux/linux_emul_md.c
+1-1sys/arm64/linux/linux_emul_md.c
+2-22 files

HardenedBSD/src 8c81b3bsys/net iflib.h iflib.c

iflib: Add restart transactions for IOV reconfiguration

Some devices remap the PF queues when entering or leaving SR-IOV. Add
opt-in PCI IOV helpers that hold the iflib context lock across the
complete stop, driver callback, and restart transaction.

Existing drivers continue to use the non-restarting helpers.

Sponsored by:   BBOX.io

(cherry picked from commit f8fa2d77bc305bec519f9f02afe211e903c57573)
DeltaFile
+22-0sys/net/iflib.c
+2-0sys/net/iflib.h
+24-02 files

HardenedBSD/src 81207ddsys/kern sys_process.c

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-7sys/kern/sys_process.c
+0-71 files

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

Merge remote-tracking branch 'rad/freebsd/15-stable/main' into hardened/15-stable/main

Conflicts:
        sys/kern/sys_process.c (unresolved)
DeltaFile
+556-0tests/sys/kern/procdesc.c
+396-114sys/kern/sys_procdesc.c
+194-5lib/libsys/pdfork.2
+51-99tests/sys/capsicum/procdesc.cc
+4-144tests/sys/capsicum/capsicum.h
+1-144tests/sys/capsicum/syscalls.h
+1,202-50664 files not shown
+1,805-1,30170 files

HardenedBSD/src cce53d1sys/arm64/linux linux_emul_md.c, sys/compat/linux linux_emul.h

linux: unbreak arm64 linux_emul_md.c after pkey syscalls

linux_emul.h uses struct image_args without a file-scope forward
declaration.  The new arm64 (and i386) stubs include that header
without imgact.h first, which fails the build under -Werror.
Include it the same way linux_pkru.c already does, and declare the
type next to struct image_params so the header is self-contained.

Reported by:    tuexen
Fixes:          bdb561843e86
MFC after:      1 month
DeltaFile
+1-0sys/i386/linux/linux_emul_md.c
+1-0sys/compat/linux/linux_emul.h
+1-0sys/arm64/linux/linux_emul_md.c
+3-03 files

HardenedBSD/src c1ff9c9lib/libc/gen fts.c, lib/libc/tests/gen fts_regress_test.c

fts: fix trailing-slash regression in fts_read after fts_children

When fts_read() descends into a directory whose children were
already prefetched by fts_children() (as ls -R does), it changed
directory using p->fts_name instead of p->fts_accpath.

With a trailing slash on a relative root path (e.g. 'dir/'),
the bare name was resolved relative to the wrong directory, so
every sibling directory after the first failed with ENOENT and
was reported as FTS_DNR.  This manifested as 'ls -lR dir/'
skipping the contents of all but the first subdirectory.

Restore the use of p->fts_accpath, matching the behavior prior
to 4bd01d6ae016.

Add a regression test that reproduces the exact conditions:
fts_children() on each directory, FTS_PHYSICAL without
FTS_NOCHDIR, and a trailing slash on the root path.


    [5 lines not shown]
DeltaFile
+58-0lib/libc/tests/gen/fts_regress_test.c
+1-1lib/libc/gen/fts.c
+59-12 files

HardenedBSD/src eceddfbsys/dev/ixgbe if_ix.c

ixgbe: Report the management packet drop counter

The management_pkts_drpd sysctl was wired to MNGPTC, making it an
alias of management_pkts_txd, instead of MNGPDC.

(cherry picked from commit 435cde959c8823ff38c699d1bc8655918fda57dd)
DeltaFile
+1-1sys/dev/ixgbe/if_ix.c
+1-11 files

HardenedBSD/src 45aac70sys/dev/ixgbe if_ix.c

ixgbe: Re-enable the SFP laser during initialization

ixgbe_if_stop() disables the transmit laser on every 82599 SFP fiber
port, but the iflib initialization path did not re-enable it. Re-enable
the laser before deferred SFP module setup so interface
reinitialization cannot leave either single-speed or multispeed optics
dark.

The hardware wrapper is a no-op when laser control is unavailable. The
placement follows Intel ix-3.4.39; this version deliberately applies to
every SFP port affected by the stop path.

(cherry picked from commit 545779a99290b7b7d94dece6c096ce230be91ff9)
DeltaFile
+2-0sys/dev/ixgbe/if_ix.c
+2-01 files