FreeBSD/src 5877718release/pkg_repos release-dvd.conf, release/scripts pkg-stage.sh

Revert "release: Ship firmware from kmods repo on DVD"

As we did in 14.4, this needs to be backed out of 15.1 to fix the
build.  We're going to ship kmods built on 15.0 instead of 15.1 on
the DVD but hopefully those will work.

This reverts commit b0fbed20ceb9b899e7e20bf785e9d303608bc7a0.

Approved by:    re (cperciva)
DeltaFile
+7-18release/scripts/pkg-stage.sh
+0-7release/pkg_repos/release-dvd.conf
+7-252 files

FreeBSD/src 0baae62usr.sbin/ctld login.cc

ctld: normalize iSCSI TargetName on login

Case-insensitive TargetName matching on logins was accidentally removed,
let's fix that by normalizing TargetName again according to RFC 3722.

PR:                     294522
Fixes:                  4b1aac931465f39c5c26bfa1d5539a428d340f20
Sponsored by:           ConnectWise
Reviewed by:            asomers, jhb
Approved by:            asomers (mentor)
Differential Revision:  https://reviews.freebsd.org/D56469

(cherry picked from commit eb837cb8b2073c09bafaf3318f5bb103827b2bca)
DeltaFile
+8-2usr.sbin/ctld/login.cc
+8-21 files

FreeBSD/src 9c18d55lib/libsys execve.2

fexecve(2): call out a scenario where you want !O_EXEC

We note a reason why you might need it, but there's an equally important
reason you may need to omit it: interpreted programs.  Add a note
accordingly, along with the workaround configuration if there's reason
you can't help it.

PR:             294780
Reviewed by:    Jan Bramkamp <crest_freebsd_rlwinm.de>, kib
Differential Revision:  https://reviews.freebsd.org/D56704
DeltaFile
+12-1lib/libsys/execve.2
+12-11 files

FreeBSD/src 4d4acdbusr.bin/stat stat.c, usr.bin/stat/tests stat_test.sh

stat: fix use of devname(3)

Besides being a little hard to parse through visually, this had its own
bug of inspecting st->st_mode to determine what to pass to devname(3),
which is only correct for st_rdev.

For st_dev, you're likely to be looking at files or directories and
attempting to assess what device they're located on, so the mode is
meaningless- we just have to assume that our filesystems are on
character devices and attempt to resolve st_dev as such.

Reviewed by:    des, kib (previous version)
Differential Revision:  https://reviews.freebsd.org/D56565
DeltaFile
+33-0usr.bin/stat/tests/stat_test.sh
+11-3usr.bin/stat/stat.c
+44-32 files

FreeBSD/src c46a0b5share/mk bsd.sys.mk

build: provide a FORTIFY_SOURCE.<src file> override

For native files we can do more minimal fixes to avoid this large of a
hammer, but for third party files it may not be worth the effort to try
and patch them.  NetBSD has the original _FORTIFY_SOURCE implementation
that ours is based on, for instance, but tests sourced from there can't
do an __ssp_real(foo) without being certain that `foo` actually has a
fortified definition.

This change does always define _FORTIFY_SOURCE as a result, so gate it
on CFLAGS not already containing _FORTIFY_SOURCE definitions.

PR:             294881
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56733
DeltaFile
+6-3share/mk/bsd.sys.mk
+6-31 files

FreeBSD/src 910f78ainclude/ssp stdio.h, lib/libc/tests/sys Makefile

tests: fix remaining test failures under _FORTIFY_SOURCE

The getgroups test is a NetBSD tests, so just apply our larger hammer
and disable the feature entirely.  The audit test can take a more
surgical approach and use __ssp_real() appropriately, since it's a local
one.

PR:             294881
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56735
DeltaFile
+7-0include/ssp/stdio.h
+3-1tests/sys/audit/network.c
+1-0lib/libc/tests/sys/Makefile
+11-13 files

FreeBSD/src d98f4f0include/ssp stdio.h

ssp: fix our gets_s implementation under _FORTIFY_SOURCE

Annex K specifies an interface for handling constraint violations from
gets_s, but we previously broke this for some classes of get_s misuse.

Provide a more nuanced version that tries to dodge errors that would
trigger a constraint handler while still providing value.  Notably, we
don't want to trigger a failure unless the passed-in length reasonably
fits within an RSIZE_MAX, because gets_s will immediately call larger
lengths bogus and fail.

PR:             294881
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56734
DeltaFile
+29-1include/ssp/stdio.h
+29-11 files

FreeBSD/src 839d326sys/kern uipc_shm.c

uipc_shm.c: make large page allocation interruptible

in cases there is no page pressure or when the user lost patience
waiting for very large allocation.  Other case is already handled by
vm_wait_intr().

Reported by:    "Lizzie from Eden Emulator project"
Reviewed by:    adrian, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D56725
DeltaFile
+8-0sys/kern/uipc_shm.c
+8-01 files

FreeBSD/src 8f46ba0krb5 Makefile.inc

krb5: Adjust version to 1.22.2

Fixes:          736e411a737b
DeltaFile
+1-1krb5/Makefile.inc
+1-11 files

FreeBSD/src c9dd7bfcrypto/krb5/src/lib/gssapi/spnego negoex_util.c

krb5: Fix two NegoEx parsing vulnerabilities

Bring in upstream commit 2e75f0d93 fixing two CVEs. Upstream commit
log is:

 In parse_nego_message(), check the result of the second call to
 vector_base() before dereferencing it.  In parse_message(), check for
 a short header_len to prevent an integer underflow when calculating
 the remaining message length.

 Reported by Cem Onat Karagun.

 CVE-2026-40355:

 In MIT krb5 release 1.18 and later, if an application calls
 gss_accept_sec_context() on a system with a NegoEx mechanism
 registered in /etc/gss/mech, an unauthenticated remote attacker can
 trigger a null pointer dereference, causing the process to terminate.


    [8 lines not shown]
DeltaFile
+6-1crypto/krb5/src/lib/gssapi/spnego/negoex_util.c
+6-11 files

FreeBSD/src 736e411crypto/krb5 README, crypto/krb5/src configure patchlevel.h

krb5: import MIT 1.22.2

Merge commit '90c687295e2d62f9411fc5b571f5af4e8ee187a7'
DeltaFile
+14-23crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c
+23-1crypto/krb5/README
+10-10crypto/krb5/src/configure
+8-0crypto/krb5/src/lib/krb5/ccache/cc_file.c
+3-3crypto/krb5/src/patchlevel.h
+2-2crypto/krb5/src/man/kproplog.man
+60-3934 files not shown
+120-9740 files

FreeBSD/src 6a0610csys/powerpc/include openpicvar.h, sys/powerpc/ofw openpic_ofw.c

powerpc/pic: fix the openpic CPU logic to work on powermac

Earlier work (40bcad56f - powerpc/pic: Add a PIC_AP_INIT() to
set up AP PIC info) broke booting my dual G5 powermac.

After much digging, jhibbits@ and I discovered that the openpic
implementation for the memory/bus controller used in the G5 CPUs
doesn't implement /all/ of the openpic specification.
Notably it sticks the WHOAMI register in a different location.
This is reading 0x0 back for all the PICs which is .. very not great.

So to restore the previous behaviour, use a quick for now that jhibbits@
can set appropriately to trust WHOAMI.

I've tested this on my dual G5 PPC and it boots/runs fine.

Fixes: 40bcad56f

Reviewed by:    jhibbits
Differential Revision:  https://reviews.freebsd.org/D56751
DeltaFile
+16-1sys/powerpc/powerpc/openpic.c
+1-0sys/powerpc/include/openpicvar.h
+1-0sys/powerpc/ofw/openpic_ofw.c
+18-13 files

FreeBSD/src 4702f6asys/conf newvers.sh, sys/sys param.h

Post-15.1-branch updates

Rename stable/15 to -STABLE

Bump __FreeBSD_version

Approved by:    re (implicit)
Sponsored by:   OpenSats Initiative
DeltaFile
+1-1sys/conf/newvers.sh
+1-1sys/sys/param.h
+2-22 files

FreeBSD/src 8946078release/pkg_repos release-dvd.conf, sys/conf newvers.sh

15.1: create releng/15.1 branch

Update from PRERELEASE to BETA1
Switch pkg(8) configuration to use the quarterly repositories
Bump __FreeBSD_version

Approved by:    re (implicit)
Sponsored by:   OpenSats Initiative
DeltaFile
+2-2release/pkg_repos/release-dvd.conf
+1-1sys/conf/newvers.sh
+1-1sys/sys/param.h
+4-43 files

FreeBSD/src 39b19cesbin/route route_netlink.c route.c

route(8): Add route get for multipath routes with -o flag

Get the next hops of the specified route.
route.8 manual will be updated when other actions for
this option are implemented.

Reviewed by: glebius
Differential Revision: https://reviews.freebsd.org/D56191
DeltaFile
+55-2sbin/route/route_netlink.c
+6-3sbin/route/route.c
+61-52 files

FreeBSD/src 23b8d16tests/sys/netlink test_rtnl_route.c Makefile

tests/netlink: Add nexthop group tests for multipath

Added tests:
* Test for creating multiple routes.
* Test for merge multiple nexthops into a single nexthop group.
* Test for nexthop expirations from a nexthop group.

Reviewed by: glebius
Differential Revision: https://reviews.freebsd.org/D56190
DeltaFile
+321-0tests/sys/netlink/test_rtnl_route.c
+1-0tests/sys/netlink/Makefile
+322-02 files

FreeBSD/src 8a64738sys/net/route route_ctl.c

routing: Expire nhops inside the nhgrp

Fix route expiration of nhops that exists inside a nhgrp.

Differential Revision: https://reviews.freebsd.org/D56189
DeltaFile
+22-5sys/net/route/route_ctl.c
+22-51 files

FreeBSD/src 84bb364sys/netlink/route rt.c

netlink: Fix RTA_MULTIPATH on RTM_GETROUTE

Before this patch, netlink never returned RTA_MULTIPATH.
Also, add RTA_MULTIPATH attribute in way that don't confuse
non-mpath support consumers.

Differential Revision: https://reviews.freebsd.org/D56188
DeltaFile
+33-9sys/netlink/route/rt.c
+33-91 files

FreeBSD/src dd945c6sys/net/route nhgrp_ctl.c route_ctl.c

routing: Implement merge of nhgrp in new multipath route

Routing subsystem allows creating new multipath routes by
nexthop groups (e.g RTA_MULTIPATH in netlink), in case of
a second nexthop group on the same route, don't panic and
merge the existing nhgrp with new one.

Reviewed by: melifaro (except one comment)
Differential Revision: https://reviews.freebsd.org/D56187
DeltaFile
+99-0sys/net/route/nhgrp_ctl.c
+4-1sys/net/route/route_ctl.c
+3-0sys/net/route/route_var.h
+106-13 files

FreeBSD/src 71ac1ecsys/fs/nfs nfs_commonport.c nfs_var.h, sys/fs/nfsclient nfs_clport.c nfs_clrpcops.c

nfscl: Disable use of callbacks for NFSv4.0

The only use for callbacks for NFSv4.0 is delegations
and delegations rarely work well for NFSv4.0 anyhow.

Therefore, this patch disables callbacks for the
NFSv4.0 client.  This is the same behavior as
occurred when the nfscbd(8) daemon was not running.

This change allowed a function called nfscl_getmyip()
to be removed from the kernel, which is nice since
maintaining this function was bothersome, due to its
use of routing, etc.

MFC after:      2 weeks
DeltaFile
+0-79sys/fs/nfsclient/nfs_clport.c
+5-45sys/fs/nfsclient/nfs_clrpcops.c
+0-4sys/fs/nfs/nfs_commonport.c
+0-1sys/fs/nfs/nfs_var.h
+5-1294 files

FreeBSD/src b1ece85sbin/dhclient dhclient.c

dhclient: Improve server and filename validation

* Don't iterate over each string three times; once is enough.

* Reject control characters (anything below space) in addition to the
  double quote and backslash.

* If an unsafe character is encountered, discard the string instead of
  rejecting the entire lease.

* If backslashes are encountered in the file name option, convert them
  to forward slashes instead of rejecting the option.

* Tweak the warning messages a bit.  Looking through the rest of the
  code, it seems to me that notes generally end with a period while
  warnings generally don't.

Fixes:          8008e4b88daf ("dhclient: Check for unexpected characters in some DHCP server options")
PR:             294886

    [5 lines not shown]
DeltaFile
+54-21sbin/dhclient/dhclient.c
+54-211 files

FreeBSD/src 6958809sbin/md5 md5.c md5.1

md5: Encode non-printable filenames

Encode filenames in the VIS_CSTYLE | VIS_OCTAL style regardless of
output mode.  When reading filenames from a checksum file, attempt to
decode them, and use the decoded name unless the decoded name does not
exist but the undecoded one does.

This breaks compatibility with GNU coreutils, which unfortunately uses
a non-reversible encoding when outputting filenames containing
non-printable characters.

While here, drop a sentence about preimage attacks against MD5 and SHA1
from the manual page, as I no longer trust it to be true.

MFC after:      1 week
Reviewed by:    bcr, markj
Differential Revision:  https://reviews.freebsd.org/D56615

(cherry picked from commit 70fde0ed6bbbb1f84c440190ba1e5435f8c90e13)
DeltaFile
+35-6sbin/md5/md5.c
+22-8sbin/md5/md5.1
+57-142 files

FreeBSD/src 2f9478asbin/dhclient dhclient.c

dhclient: Improve server and filename validation

* Don't iterate over each string three times; once is enough.

* Reject control characters (anything below space) in addition to the
  double quote and backslash.

* If an unsafe character is encountered, discard the string instead of
  rejecting the entire lease.

* If backslashes are encountered in the file name option, convert them
  to forward slashes instead of rejecting the option.

* Tweak the warning messages a bit.  Looking through the rest of the
  code, it seems to me that notes generally end with a period while
  warnings generally don't.

Fixes:          8008e4b88daf ("dhclient: Check for unexpected characters in some DHCP server options")
PR:             294886

    [5 lines not shown]
DeltaFile
+54-21sbin/dhclient/dhclient.c
+54-211 files

FreeBSD/src 252f603sbin/dhclient dhclient.c

dhclient: Improve server and filename validation

* Don't iterate over each string three times; once is enough.

* Reject control characters (anything below space) in addition to the
  double quote and backslash.

* If an unsafe character is encountered, discard the string instead of
  rejecting the entire lease.

* If backslashes are encountered in the file name option, convert them
  to forward slashes instead of rejecting the option.

* Tweak the warning messages a bit.  Looking through the rest of the
  code, it seems to me that notes generally end with a period while
  warnings generally don't.

Fixes:          8008e4b88daf ("dhclient: Check for unexpected characters in some DHCP server options")
PR:             294886

    [5 lines not shown]
DeltaFile
+54-21sbin/dhclient/dhclient.c
+54-211 files

FreeBSD/src d23df52sbin/md5 md5.c md5.1

md5: Encode non-printable filenames

Encode filenames in the VIS_CSTYLE | VIS_OCTAL style regardless of
output mode.  When reading filenames from a checksum file, attempt to
decode them, and use the decoded name unless the decoded name does not
exist but the undecoded one does.

This breaks compatibility with GNU coreutils, which unfortunately uses
a non-reversible encoding when outputting filenames containing
non-printable characters.

While here, drop a sentence about preimage attacks against MD5 and SHA1
from the manual page, as I no longer trust it to be true.

MFC after:      1 week
Reviewed by:    bcr, markj
Differential Revision:  https://reviews.freebsd.org/D56615

(cherry picked from commit 70fde0ed6bbbb1f84c440190ba1e5435f8c90e13)
DeltaFile
+35-6sbin/md5/md5.c
+22-8sbin/md5/md5.1
+57-142 files

FreeBSD/src cf678e3sbin/devfs devfs.conf

devfs: add bpf example

Add an example for allowing members of the network group to read from
bpf devices. In particular, this allows members of the network group
to monitor traffic without running with root privileges.

Reviewed by:            markj, glebius
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D56742
DeltaFile
+6-0sbin/devfs/devfs.conf
+6-01 files

FreeBSD/src ea1764esys/dev/mfi mfi.c, sys/dev/mrsas mrsas.c

mfi(4)/mrsas(4): Set sysctl name for driver versions consistently

Instead of printing the driver version over and over again if multiple
controllers are used, set a sysctl name for the used driver version.

Approved by:    imp, ziaee
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D56110
DeltaFile
+4-3sys/dev/mfi/mfi.c
+0-3sys/dev/mrsas/mrsas.c
+4-62 files

FreeBSD/src c969df6sys/sys param.h

Bump __FreeBSD_version to 1500509 after linuxkpi changes for DRM 6.12.84

As of this commit, all changes to linuxkpi required by the DRM drivers
from Linux 6.12.84 were committed.

Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-1sys/sys/param.h
+1-11 files

FreeBSD/src 5e9f2a6sys/dev/sound/pcm sound.c sound.h

sound: Retire unused snddev_info->bufsz

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+0-9sys/dev/sound/pcm/sound.c
+0-1sys/dev/sound/pcm/sound.h
+0-102 files

FreeBSD/src a723308sbin/dmesg dmesg.c dmesg.8

dmesg(8): Add -t and -f options for converting timestamps

Kernel timestamps are relative to kern.boottime.
With -t, kern.boottime is added and converted to either
a default format or the one specified using the -f option.

Signed-off-by:  Andre Albsmeier <mail at ghub.e4m.org>
Reviewed by:    kib, pouria
Discussed with: imp
Pull-Request:   https://github.com/freebsd/freebsd-src/pull/1985
DeltaFile
+65-5sbin/dmesg/dmesg.c
+15-1sbin/dmesg/dmesg.8
+80-62 files