HardenedBSD/src 03bdda6lib/libc/stdlib strtonum.3 strtonum.c, sys/dev/acpica acpi.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+57-17lib/libc/stdlib/strtonum.3
+32-0sys/net/if_ovpn.c
+21-6lib/libc/stdlib/strtonum.c
+25-0tests/sys/net/if_ovpn/if_ovpn.sh
+20-1sys/dev/nvme/nvme_private.h
+15-0sys/dev/acpica/acpi.c
+170-2422 files not shown
+206-6528 files

HardenedBSD/src 8d1a473share/mk bsd.man.mk

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3-3share/mk/bsd.man.mk
+3-31 files

HardenedBSD/src 32dd4b3share/mk bsd.man.mk

bsd.man.mk fix and simplify staging

The STAGE_SETS need to match STAGE_DIR.

For each STAGE_SET we have STAGE_DIR.${STAGE_SET}
and create a target stage_files.${STAGE_SET},
the settings all need to be self consistent to work.

We actually only need the high level targets stage_files and stage_links
meta.stage.mk will take care of the details.

(cherry picked from commit 9cd89fc5aa3c0e76375732788fe9d4282d65224f)
(cherry picked from commit 9fed072b44223f061a0dbf604741091b3bc09aee)
DeltaFile
+3-3share/mk/bsd.man.mk
+3-31 files

HardenedBSD/src 5bd84c4sys/dev/acpica acpi.c acpi_battery.c

acpi: Add a function to deregister all ioctl commands using the same function

This simplifies detach/cleanup for drivers that add multiple ACPI ioctls.

Reviewed by:    imp
Sponsored by:   Netflix
Differential Revision:  https://reviews.freebsd.org/D54420
DeltaFile
+15-0sys/dev/acpica/acpi.c
+1-7sys/dev/acpica/acpi_battery.c
+1-0sys/dev/acpica/acpiio.h
+17-73 files

HardenedBSD/src 6d6bf4alibexec/rtld-elf rtld.c

rtld: Use a helper variable to simplify a few lines

Reviewed by:    kib
Sponsored by:   AFRL, DARPA
Differential Revision:  https://reviews.freebsd.org/D54507
DeltaFile
+5-6libexec/rtld-elf/rtld.c
+5-61 files

HardenedBSD/src 4ba8df2.github path-rules.txt

.github: Narrow sys/crypto warning to sys/crypto/skein

This is the only subdirectory of sys/crypto that is a vendor import.

Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54719
DeltaFile
+1-1.github/path-rules.txt
+1-11 files

HardenedBSD/src 241a43clib Makefile, usr.sbin Makefile

virtual_oss: Take MK_CUSE into account

Reported by:    brooks
Fixes:          f74f891581bc ("src.opts: Introduce MK_SOUND")
Sponsored by:   The FreeBSD Foundation
MFC after:      4 days
Reviewed by:    brooks, emaste
Differential Revision:  https://reviews.freebsd.org/D54708
DeltaFile
+1-1usr.sbin/Makefile
+1-1lib/Makefile
+2-22 files

HardenedBSD/src 3716422libexec/rc/rc.d Makefile

libexec/rc/rc.d/Makefile: Remove duplicate mixer entry

Fixes:          f74f891581bc ("src.opts: Introduce MK_SOUND")
PR:             292436
Sponsored by:   The FreeBSD Foundation
MFC after:      4 days
Reviewed by:    ivy, emaste
Differential Revision:  https://reviews.freebsd.org/D54706
DeltaFile
+0-1libexec/rc/rc.d/Makefile
+0-11 files

HardenedBSD/src 21d666asys/net if_ovpn.c, tests/sys/net/if_ovpn if_ovpn.sh

if_ovpn: add interface counters

Count input/output packets and bytes on the interface as well, not just
in openvpn-specific counters.

PR:             292464
MFC after:      2 weeks
Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+32-0sys/net/if_ovpn.c
+25-0tests/sys/net/if_ovpn/if_ovpn.sh
+57-02 files

HardenedBSD/src fb96702tools/build depend-cleanup.sh

depend-cleanup.sh: Clean up the old arm64 memset.S

This has moved from a generated file in objdir to the source tree.
Remove the old file and any .depend files that reference it.

Reviewed by:    bapt (via IRC)
Fixes:  41ccf82b29f3 ("libc/aarch64: Use MOPS implementations of memcpy/memmove/memset where availble")
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D54729
DeltaFile
+6-0tools/build/depend-cleanup.sh
+6-01 files

HardenedBSD/src faa31fcusr.bin/netstat inet.c

netstat: Remove padding from cc and stack fields

Trim white space padding that gets added libxo fields cc and stack when
using -C and -c.

The padding is only visible if you're using multiple stacks or
congestion algorithms.

PR:             292262
MFC after:      5 days
Reviewed by:    asomers, tuexen
Approved by:    asomers (mentor)
Differential Revision:  https://reviews.freebsd.org/D54709
DeltaFile
+2-2usr.bin/netstat/inet.c
+2-21 files

HardenedBSD/src 8bc63f0sys/dev/nvme nvme_private.h

nvme: Fix a typo

Fixes:  73c921ef1d44 ("nvme: Add ability to override ioq to put the request on")
DeltaFile
+2-1sys/dev/nvme/nvme_private.h
+2-11 files

HardenedBSD/src 6740cccsys/arm64/iommu smmu.c

arm64/iommu: Fix a resource leak in smmu_domain_alloc()

We should free the allocated ASID if smmu_init_cd() fails.

Move the allocation of "domain" to simplify the first error path.

Reported by:    Kevin Day <kevin at your.org>
Reviewed by:    br
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54676
DeltaFile
+2-3sys/arm64/iommu/smmu.c
+2-31 files

HardenedBSD/src 6fef0c9sys/arm64/vmm/io vgic_v3.c

arm64/vgic_v3: Fix an inverted test when reading GICD_I<C|S>ENABLER

On read, these registers' fields return 1 if forwarding of the
corresponding interrupt is enabled, and 0 otherwise.  The test in
read_enabler() was inverted.

Reported by:    Kevin Day <kevin at your.org>
Reviewed by:    andrew
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54678
DeltaFile
+1-1sys/arm64/vmm/io/vgic_v3.c
+1-11 files

HardenedBSD/src 251662esys/compat/linuxkpi/common/src linux_shmemfs.c

linuxkpi: Clean up linux_shmem_file_setup() a bit

- Free the pointer that was returned by the allocator, instead of the
  address of the first member.  These will be equal in practice, but
  it's sketchy and won't work on CHERI with subobject bounds checking.
- Use an anonymous struct, there's no need to name it.

Reviewed by:    bz, brooks, emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54673
DeltaFile
+3-4sys/compat/linuxkpi/common/src/linux_shmemfs.c
+3-41 files

HardenedBSD/src aa1eb62sys/compat/linuxkpi/common/src linux_firmware.c

linuxkpi: Avoid a potential null pointer dereference in an error path

Reported by:    Kevin Day <kevin at your.org>
Reviewed by:    bz, emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54672
DeltaFile
+2-1sys/compat/linuxkpi/common/src/linux_firmware.c
+2-11 files

HardenedBSD/src a4955b0sys/compat/linuxkpi/common/src linux_current.c

linuxkpi: Fix an error path in linux_alloc_current()

If the allocation fails we should free the task struct.

While here get rid of a couple of unnecessary assertions.

Reported by:    Kevin Day <kevin at your.org>
Reviewed by:    emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54671
DeltaFile
+2-8sys/compat/linuxkpi/common/src/linux_current.c
+2-81 files

HardenedBSD/src 9d015a9sys/conf NOTES options, sys/fs/unionfs union_subr.c

Remove the DEBUG_VFS_LOCKS kernel option

After commit 3bd8fab2415b ("vfs: Move DEBUG_VFS_LOCKS checks to
INVARIANTS"), this option has no effect.  Let's finish the removal.

There are a couple of additional uses in zfs, I will submit a separate
patch upstream for them.

Reviewed by:    mckusick, kib
Differential Revision:  https://reviews.freebsd.org/D54662
DeltaFile
+1-1sys/fs/unionfs/union_subr.c
+0-1sys/conf/NOTES
+0-1sys/conf/options
+0-1sys/conf/std.nodebug
+1-44 files

HardenedBSD/src 6a6f230include stdlib.h, lib/libc/stdlib strtonum.3 strtonum.c

libc/stdlib: Port strtonumx() from Illumos

Add strtonumx(), a companion to strtonum(3) that preserves its safety
and error-reporting semantics while allowing the caller to specify a
conversion base, similar to the strtol(3) family of functions.

Reviewed by:    emaste, kib, ziaee
Obtained from:  https://www.illumos.org/issues/15365
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54270
DeltaFile
+57-17lib/libc/stdlib/strtonum.3
+21-6lib/libc/stdlib/strtonum.c
+2-0include/stdlib.h
+1-0lib/libc/stdlib/Symbol.map
+1-0lib/libc/stdlib/Makefile.inc
+82-235 files

HardenedBSD/src 73c921esys/dev/nvme nvme_private.h nvme_ctrlr.c

nvme: Add ability to override ioq to put the request on

Sometimes the client device needs to manage the IOQ the request goes
to. Expand the interface we have for the request to allow it to be set
for this special use case.

Sponsored by:           Netflix
Reviewed by:            jhb
Differential Revision:  https://reviews.freebsd.org/D54714
DeltaFile
+19-1sys/dev/nvme/nvme_private.h
+3-1sys/dev/nvme/nvme_ctrlr.c
+22-22 files

HardenedBSD/src 8794122share/misc committers-src.dot

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+3-0share/misc/committers-src.dot
+3-01 files

HardenedBSD/src 5d844f0share/misc committers-src.dot

committers-src: add myself (js@) with asomers as mentor

Reviewed by:    asomers
Approved by:    asomers (mentor)
Differential Revision:  https://reviews.freebsd.org/D54715
DeltaFile
+3-0share/misc/committers-src.dot
+3-01 files

HardenedBSD/src 64db145lib/ncurses/tinfo ncurses_cfg.h, sys/netinet6 nd6.h nd6.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+24-3usr.sbin/jexec/jexec.c
+0-17sys/netinet6/nd6.h
+1-13sys/netinet6/nd6.c
+12-1usr.sbin/jexec/jexec.8
+0-3sys/netinet6/in6_var.h
+0-1lib/ncurses/tinfo/ncurses_cfg.h
+37-381 files not shown
+37-397 files

HardenedBSD/src ad553bdlib/ncurses/tinfo ncurses_cfg.h

ncurses: fix cross build on MacOS
DeltaFile
+0-1lib/ncurses/tinfo/ncurses_cfg.h
+0-11 files

HardenedBSD/src 5810786usr.sbin/jexec jexec.c jexec.8

jexec: Add -e parameter to customize the environment

Currently, to define a new environment variable or modify an existing
one, we need to use env(1), which may or may not be available inside
the jail, especially in OCI containers created with the scratch
layer (i.e., those containers that are only a single static binary,
plus configuration files and related stuff). With this option, we
can specify environment variables of arbitrary length for the
specified process running inside the jail.

Reviewed by:                jamie@
Approved by:                jamie@
Differential Revision:      https://reviews.freebsd.org/D54660
DeltaFile
+24-3usr.sbin/jexec/jexec.c
+12-1usr.sbin/jexec/jexec.8
+36-42 files

HardenedBSD/src 008e570sys/netinet6 nd6.h nd6.c

netinet6: garbage collect OSIOCGIFINFO_IN6

This ioctl has been marked as "old" starting with the original KAME export
over 20 years ago and has been hidden under #ifdef _KERNEL since.  There
is no software that uses it.
DeltaFile
+0-17sys/netinet6/nd6.h
+1-13sys/netinet6/nd6.c
+0-3sys/netinet6/in6_var.h
+0-1sys/netinet6/in6.c
+1-344 files

HardenedBSD/src 59096c6release Makefile.ec2

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+5-1release/Makefile.ec2
+5-11 files

HardenedBSD/src eb9c65arelease 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

(cherry picked from commit b558c92fd0005d311edbcd02953c17d4a34fb909)
DeltaFile
+5-1release/Makefile.ec2
+5-11 files

HardenedBSD/src b20d0f0release/tools arm.subr

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-7release/tools/arm.subr
+1-71 files

HardenedBSD/src 152cf02libexec/nuageinit nuageinit nuageinit.7, release/tools arm.subr vagrant.conf

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

Conflicts:
        release/tools/arm.subr (unresolved)
DeltaFile
+1,082-232share/misc/pci_vendors
+172-102libexec/nuageinit/nuageinit
+27-15libexec/nuageinit/nuageinit.7
+9-2share/misc/usb_vendors
+6-4release/tools/arm.subr
+1-7release/tools/vagrant.conf
+1,297-3625 files not shown
+1,302-37311 files