HardenedBSD/src 39e41c2share/mk src.opts.mk

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-3share/mk/src.opts.mk
+0-31 files

HardenedBSD/src 196d3c5.github CODEOWNERS, sys/dev/aq aq_hw_llh.c

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        share/mk/src.opts.mk (unresolved)
DeltaFile
+100-51usr.sbin/sndctl/sndctl.c
+62-34sys/dev/aq/aq_hw_llh.c
+76-0tests/sys/netinet6/ndp.sh
+35-10sys/netinet6/in6.c
+7-31sys/netinet6/nd6_rtr.c
+17-15.github/CODEOWNERS
+297-14135 files not shown
+439-22541 files

HardenedBSD/src 7e8a2a4lib/libgeom geom_xml2tree.c, share/man/man5 src.conf.5

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+100-61lib/libgeom/geom_xml2tree.c
+58-39stand/efi/loader/framebuffer.c
+62-19tools/build/depend-cleanup.sh
+34-23sys/compat/linuxkpi/common/include/linux/kstrtox.h
+14-0share/man/man5/src.conf.5
+6-2stand/common/gfx_fb.c
+274-1449 files not shown
+298-15115 files

HardenedBSD/src dac74b2usr.sbin/bsdinstall/scripts auto jail

bsdinstall: Drop "Technology preview" from package sets

And refer to dist sets as "legacy."  This matches our expectation for
FreeBSD 16.0.

Reviewed by:    cperciva
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D54156
DeltaFile
+2-2usr.sbin/bsdinstall/scripts/auto
+2-2usr.sbin/bsdinstall/scripts/jail
+4-42 files

HardenedBSD/src a551b05tests/sys/fs/tarfs tarfs_test.sh

tarfs: tests: Increase timeout (again)

Bump the timeout value (a little more), to avoid cutoff on emulated
architectures on ci.freebsd.org.

Reported by:    Jenkins
Fixes:          47015e454661 ("tests: Increase timeout")
MFC after:      3 days
DeltaFile
+1-1tests/sys/fs/tarfs/tarfs_test.sh
+1-11 files

HardenedBSD/src 237ce0a. RELNOTES

RELNOTES: Add entry for 256d05617c71
DeltaFile
+4-0RELNOTES
+4-01 files

HardenedBSD/src 74bb8b9sys/contrib/openzfs/module/icp/asm-x86_64/modes aesni-gcm-avx2-vaes.S aesni-gcm-x86_64.S

zfs: emit .note.GNU-stack section for all ELF targets

On FreeBSD, linking the zfs kernel module with binutils ld 2.44 shows
the following warning:

    ld: warning: aesni-gcm-avx2-vaes.o: missing .note.GNU-stack section implies executable stack
    ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker

Some of the `.S` files under `module/icp/asm-x86_64/modes` check whether
to emit the `.note.GNU-stack` section using:

    #if defined(__linux__) && defined(__ELF__)

We could add `&& defined(__FreeBSD__)` to the test, but since all other
`.S` files in the OpenZFS tree use:

    #ifdef __ELF__

it would seem more logical to use that instead. Any recent ELF platform

    [7 lines not shown]
DeltaFile
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/ghash-x86_64.S
+3-33 files

HardenedBSD/src 1971c31. RELNOTES

RELNOTES:  Revert back to commit hash in commit a3f28d70969c

inadvertently changed the commit hash to the commit on stable/15
DeltaFile
+1-1RELNOTES
+1-11 files

HardenedBSD/src d3902bastand/common gfx_fb.c

loader.efi: only use firmware provided Blt on GOP

gfx_state.tg_private points to a EFI_GRAPHICS_OUTPUT_PROTOCOL only when
using GOP.

The firmware provided Blt functions on UGA platforms have been observed
to not work on old MacBooks, and are likley hit or miss anyways as UGA
has been deprecated since 2006.

Reviewed by:    tsoome
PR:             291935
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54432

(cherry picked from commit 9595055ae7494997bb07b4aaed544f88ac4c5e7f)
DeltaFile
+6-2stand/common/gfx_fb.c
+6-21 files

HardenedBSD/src 60a85a5stand/efi/loader framebuffer.c

loader.efi: add stride & offset for MacBookPro3,1

Note that there are three variants of this MacBook. We only have the
stride and offset values for the 17" 1680x1050 model.

Reviewed by:    vexeduxr
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1584

(cherry picked from commit be6ba97aaee762c2e5300834f1916ae5dfd5a0b9)
DeltaFile
+17-0stand/efi/loader/framebuffer.c
+17-01 files

HardenedBSD/src 5a9e2c5stand/efi/loader framebuffer.c

loader.efi: probe for UGA if GOP isn't found

Probe for UGA instead of returning early if we can't find GOP.

Reviewed by:    tsoome
PR:             291935
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54431

(cherry picked from commit 5d85dde27b4769604fc108b89328607e70e767ed)
DeltaFile
+41-39stand/efi/loader/framebuffer.c
+41-391 files

HardenedBSD/src c72aa34sys/netgraph ng_tty.c

ng_tty: avoid the sign extention of char

When c is compared to sc->hotchar, both undergo integer promotion, which
can lead to c being sign extended. Fix this by casting c to an unsigned
char.

Reviewed by:    kevans
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D54544

(cherry picked from commit 9b2478f60bfda663c84b48e272a2293159e1b0a0)
DeltaFile
+2-1sys/netgraph/ng_tty.c
+2-11 files

HardenedBSD/src e25aedblib/libgeom geom_xml2tree.c

libgeom: Fix 32-bit gcc build

MFC after:      1 week
Fixes:          27894e20f140 ("libgeom: Fix segfault in 32-on-64 case")

(cherry picked from commit 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe)
DeltaFile
+5-2lib/libgeom/geom_xml2tree.c
+5-21 files

HardenedBSD/src 08e7bdalib/libgeom geom_xml2tree.c

libgeom: Fix segfault in 32-on-64 case

We were using strtoul() to parse object identifiers, which are kernel
pointers.  This works fine as long as the kernel and userland match,
but in a 32-bit libgeom on a 64-bit kernel this will return ULONG_MAX
for all objects, resulting in memory corruption when we later pick the
wrong object while resolving consumer-producer references.

MFC after:      1 week
PR:             292127
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54452

(cherry picked from commit 27894e20f140ee2729c14b589035870c8185b87d)
DeltaFile
+2-2lib/libgeom/geom_xml2tree.c
+2-21 files

HardenedBSD/src fba2421lib/libgeom geom_xml2tree.c

libgeom: Improve type safety of xml2tree code

When resolving references, assert that the type of the object we find
is what we expect.  This will help prevent memory corruption if two
objects of different types somehow end up with the same identifier.

MFC after:      1 week
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54454

(cherry picked from commit 4b0d5d1d6a7c9773e38882feb4747a76b37a645c)
DeltaFile
+44-10lib/libgeom/geom_xml2tree.c
+44-101 files

HardenedBSD/src 4b6cab4lib/libgeom geom_xml2tree.c libgeom.h

libgeom: Clean up xml2tree code

MFC after:      1 week
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54453

(cherry picked from commit fad6707e2589d8557ceb6b6bf11f22323b265f01)
DeltaFile
+51-49lib/libgeom/geom_xml2tree.c
+1-1lib/libgeom/libgeom.h
+52-502 files

HardenedBSD/src d97fa8etools/build depend-cleanup.sh

depend-cleanup.sh: Reduce repetition

MFC after:      1 week
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54329

(cherry picked from commit aa611fa7e835ae77a623cc6d05020f5ee76dc881)
DeltaFile
+11-9tools/build/depend-cleanup.sh
+11-91 files

HardenedBSD/src 6eea426sys/compat/linuxkpi/common/include/linux kstrtox.h

linuxkpi: Correct kstrtobool

Implement the exact same logic as in Linux:

* Accept 'e', 't', 'y', '1', "on" for true.

* Accept 'd', 'f', 'n', '0', "of" for false.

* Disregard any characters beyond that.

* Check that the string is not null, but don't check the result pointer.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    bz, emaste
Differential Revision:  https://reviews.freebsd.org/D54451

(cherry picked from commit f86148d2777d4d7985ed8f4ae957c41c44bd2484)
DeltaFile
+5-11sys/compat/linuxkpi/common/include/linux/kstrtox.h
+5-111 files

HardenedBSD/src de92f1bsys/compat/linuxkpi/common/include/linux kstrtox.h

linuxkpi: Don't clobber result on failure

In kstrto*(), don't assign to *res until we know the conversion is
successful, and address issues that may result in warnings if code
that uses <linux/kstrtox.h> is compiled at high warning levels.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    bz, emaste
Differential Revision:  https://reviews.freebsd.org/D54440

(cherry picked from commit 3542d60fb8042474f66fbf2d779ed8c5a80d0f78)
DeltaFile
+30-13sys/compat/linuxkpi/common/include/linux/kstrtox.h
+30-131 files

HardenedBSD/src 5048c5d. Makefile.inc1, share/man/man5 src.conf.5

depend-cleanup: Force a clean build when options change

Similar to the build epoch check, cache a list of source options in the
object tree, and force a clean build if the cached list does not match
the current list, after filtering out options which are known not to
affect the build (e.g. CLEAN, TESTS, WARNS).

This also adds a DEPEND_CLEANUP option (which defaults to yes unless
the CLEAN option is set) which can be used to skip depend-cleanup for
faster incremental builds.

MFC after:      1 week
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D52011

(cherry picked from commit 1d52d5c5372a43655a252880d34088fa56aa2530)
DeltaFile
+51-10tools/build/depend-cleanup.sh
+14-0share/man/man5/src.conf.5
+4-2Makefile.inc1
+5-0share/mk/src.opts.mk
+5-0tools/build/options/WITHOUT_DEPEND_CLEANUP
+79-125 files

HardenedBSD/src b0c2236usr.sbin/etcupdate/tests conflicts_test.sh tests_test.sh

etcupdate: tests: Fix tests

Fix test login.conf files and update their MD5 checksums.

PR:             291649
Reviewed by:    imp
Fixes:          54ce6b2c4c16 ("login.conf.5: Remove mention of login copyright setting")
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1962
DeltaFile
+3-2usr.sbin/etcupdate/tests/conflicts_test.sh
+2-1usr.sbin/etcupdate/tests/tests_test.sh
+5-32 files

HardenedBSD/src 2b60e62. RELNOTES

RELNOTES:  Correct commit hash in commit a3f28d70969c
DeltaFile
+1-1RELNOTES
+1-11 files

HardenedBSD/src a3f28d7. RELNOTES

RELNOTES: Add entry for c558eca47970
DeltaFile
+4-0RELNOTES
+4-01 files

HardenedBSD/src cf34eb8lib Makefile, usr.bin Makefile

build: Remove duplicate SUBDIR entries

Fixes:  f74f891581bc ("src.opts: Introduce MK_SOUND")
DeltaFile
+0-2usr.sbin/Makefile
+0-2usr.bin/Makefile
+0-1lib/Makefile
+0-53 files

HardenedBSD/src 668423fsys/dev/aq aq_hw_llh.c aq_ring.c

aq(4): style(9) cleanup
DeltaFile
+62-34sys/dev/aq/aq_hw_llh.c
+11-7sys/dev/aq/aq_ring.c
+10-6sys/dev/aq/aq_fw.c
+10-5sys/dev/aq/aq_hw.c
+4-2sys/dev/aq/aq_dbg.c
+1-4sys/dev/aq/aq_fw2x.c
+98-585 files not shown
+106-6711 files

HardenedBSD/src 045112fusr.bin/grep/tests grep_freebsd_test.sh

grep/tests: Fix up the zgrep executable path in a newly added test

Fixes:  da5d94d29a5e ("Remove obsolete BUGS section from zgrep(1) man page, add test")
DeltaFile
+1-1usr.bin/grep/tests/grep_freebsd_test.sh
+1-11 files

HardenedBSD/src fb08f80sys/netinet6 nd6_rtr.c in6.c

in6: Add a helper function to compute expiry times

Tidy up a bunch of places that have the same duplicated logic.  Simplify
callers of in6_init_prefix_ltimes().  No functional change intended.

Reviewed by:    pouria, zlei, tuexen, glebius
MFC after:      2 weeks
Sponsored by:   OPNsense
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D54561
DeltaFile
+7-31sys/netinet6/nd6_rtr.c
+13-10sys/netinet6/in6.c
+2-0sys/netinet6/in6.h
+22-413 files

HardenedBSD/src 32ec9d8tests/sys/net/bpf Makefile

bpf/tests: Run tests in an execenv jail

Otherwise the tests cannot be run in parallel since they create
identically named jails.

Fixes:  dd49816b0d66 ("bpf: avoid panic on multiple readers")
DeltaFile
+3-0tests/sys/net/bpf/Makefile
+3-01 files

HardenedBSD/src 74999aasys/netinet6 in6.c, tests/sys/netinet6 ndp.sh

in6: Modify address prefix lifetimes when updating address lifetimes

When one uses SIOCAIFADDR_IN6 to add a v6 address, it's possible to set
the preferred and valid lifetimes of the address.  If the address
already exists, this ioctl will recalculate and update the expiry times
based on the provided timestamps.

When adding a new address, the lifetimes are inherited by the prefix as
well, but only if we create a new prefix.  If the prefix already exists,
as it will in the case where an address is being updated rather than
being added, we do not touch the prefix lifetimes at all.  This means
that the original address lifetime still applies to the route associated
with that prefix, so when the prefix expires, the route goes away.

This behaviour doesn't make a lot of sense: if the admin updates an
address lifetime, we should ensure that the prefix lifetime is updated
too.  Make that change, ensuring that we do not shorten the prefix
lifetime, as the prefix might be shared among multiple interface
addresses.

    [9 lines not shown]
DeltaFile
+76-0tests/sys/netinet6/ndp.sh
+22-0sys/netinet6/in6.c
+98-02 files

HardenedBSD/src 7ff1d2b. MAINTAINERS, .github CODEOWNERS

MAINTAINERS/CODEOWNERS: Fix intro wrap + gitadm

+ svnadmin has apparently been superceeded by gitadm@
+ fix intro prose wrapping to be consistent at 72 for trad console

MFC after:      3 days
DeltaFile
+15-15.github/CODEOWNERS
+12-13MAINTAINERS
+27-282 files