HardenedBSD/src f30bf5dlib/libkldelf ef_mips.c Makefile, share/man/man4 iflib.4

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+0-116lib/libkldelf/ef_mips.c
+0-48sys/cddl/contrib/opensolaris/uts/mips/sys/fasttrap_isa.h
+0-30sys/cddl/contrib/opensolaris/uts/mips/dtrace/fasttrap_isa.c
+10-0share/man/man4/iflib.4
+1-1sys/dev/bnxt/bnxt_en/if_bnxt.c
+0-1lib/libkldelf/Makefile
+11-1961 files not shown
+11-1977 files

HardenedBSD/src 742d93dshare/misc committers-src.dot

committers-src.dot: Fix dot file format

Reviewed by: glebius
Approved by: glebius (mentor)
Fixes: 2059040493fb3f76cd1f06350fd4534a71a1f83c
Differential Revision:  <https://reviews.freebsd.org/D54637>
DeltaFile
+1-1share/misc/committers-src.dot
+1-11 files

HardenedBSD/src 17046bc. .mailmap, share/misc committers-src.dot

committers-src: Add myself (pouria@)

Add myself (pouria@) as new src committer with glebius@ as mentor

Reviewed by: glebius
Approved by: glebius (mentor)
Differential Revision: https://reviews.freebsd.org/D54637
DeltaFile
+2-0.mailmap
+2-0share/misc/committers-src.dot
+1-0usr.bin/calendar/calendars/calendar.freebsd
+5-03 files

HardenedBSD/src 4cb65fdusr.bin/wc wc.1 wc.c

wc: Fix usage and manual SYNOPSIS + nits

The -c and -m flags are mututally exclusive. Also minor manual fixes:

+ Angle quotes do not work in prose, use double quote matching extant
+ Align manual page options list
+ Tag SPDX license identifier for manual

PR:             292408
MFC after:      3 days
DeltaFile
+8-4usr.bin/wc/wc.1
+1-1usr.bin/wc/wc.c
+9-52 files

HardenedBSD/src 202dd86sys/dev/bnxt/bnxt_en if_bnxt.c

bnxt: fix i2c read to allow access to different addresses

Allow reading of i2c addresses other than A0. A0 does provide most
information, but doesn't provide things like module temps, and optical
signal levels.

Sponsored by: Netflix
Reviewed by: sumit.saxena_broadcom.com
Differential Revision: https://reviews.freebsd.org/D54590
MFC after: 3 days

(cherry picked from commit b72cb305899ed30daf103b92818c199ccfc52378)
DeltaFile
+1-1sys/dev/bnxt/bnxt_en/if_bnxt.c
+1-11 files

HardenedBSD/src ef8c912share/man/man4 iflib.4

iflib: document new sysctls

Document the new tx related sysctls I've added to iflib in the
last few months:  tx_reclaim_ticks & tx_reclaim_thresh

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

(cherry picked from commit 83e6f0d7807b4ebc74bc58e6f03adde56db942bf)
DeltaFile
+10-0share/man/man4/iflib.4
+10-01 files

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

rc: Add os-release URL rc.conf variables

Add rc.conf defaults for the os-release URL settings introduced in the
os-release rc.d script. This makes it easier for downstream integrators
and appliances to override the URLs via rc.conf instead of patching the
script.

The following variables are added to libexec/rc/rc.conf:
- osrelease_home_url
- osrelease_documentation_url
- osrelease_support_url
- osrelease_bug_report_url

These correspond to HOME_URL, DOCUMENTATION_URL, SUPPORT_URL, and
BUG_REPORT_URL in the generated os-release file.

Signed-off-by: NVSRahul <nvsrahul at hotmail.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1961
DeltaFile
+8-7libexec/rc/rc.d/os-release
+4-0libexec/rc/rc.conf
+12-72 files

HardenedBSD/src babc4d8libexec/rc/rc.d os-release

rc: Improve os-release URLs and add rc.conf overrides

Add DOCUMENTATION_URL and SUPPORT_URL to the generated /var/run/os-release
file, and route the existing URLs through rc.conf-configurable variables:

  - osrelease_home_url
  - osrelease_documentation_url
  - osrelease_support_url
  - osrelease_bug_report_url

This allows downstreams and appliance vendors to customize these URLs
without patching the base script, while providing useful defaults for
stock FreeBSD installations.

Tested:
  - sh -n libexec/rc/rc.d/os-release
  - (No FreeBSD host available; not runtime-tested yet)

Signed-off-by: NVSRahul <nvsrahul at hotmail.com>

    [2 lines not shown]
DeltaFile
+8-2libexec/rc/rc.d/os-release
+8-21 files

HardenedBSD/src 3f2f3c5share/man/man5 src.conf.5

src.conf.5: Regen after addition of MK_SOUND

A description for WITHOUT_SOUND is still missing though.
DeltaFile
+7-1share/man/man5/src.conf.5
+7-11 files

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 82d5ceelib/libkldelf ef_mips.c Makefile, sys/cddl/contrib/opensolaris/uts/mips/dtrace fasttrap_isa.c

mips: remove mips leftovers

Signed-off-by: Minsoo Choo <minsoochoo0122 at proton.me>
Pull-request: https://github.com/freebsd/freebsd-src/pull/1909
(cherry picked from commit 6c6e00b7f16f3bda1b56da6a57d65ff6e26ae3e7)
DeltaFile
+0-116lib/libkldelf/ef_mips.c
+0-48sys/cddl/contrib/opensolaris/uts/mips/sys/fasttrap_isa.h
+0-30sys/cddl/contrib/opensolaris/uts/mips/dtrace/fasttrap_isa.c
+0-1lib/libkldelf/Makefile
+0-1usr.sbin/kldxref/Makefile
+0-1965 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 jail auto

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/jail
+2-2usr.sbin/bsdinstall/scripts/auto
+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 ghash-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/ghash-x86_64.S
+1-1sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-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