HardenedBSD/src de9f0b6share/man/man4 rl.4 re.4, sys/conf NOTES

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+18-18sys/conf/NOTES
+18-18sys/dev/re/if_re.c
+16-16sys/dev/rl/if_rl.c
+9-9sys/dev/mii/rlphy.c
+8-8share/man/man4/rl.4
+6-6share/man/man4/re.4
+75-7523 files not shown
+126-12629 files

HardenedBSD/src fd1e32dusr.sbin/bsdinstall Makefile

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+1-1usr.sbin/bsdinstall/Makefile
+1-11 files

HardenedBSD/ports 2df4fd5devel/grex distinfo Makefile.crates, graphics/xreader pkg-plist Makefile

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+299-329devel/grex/distinfo
+0-431print/xreader/pkg-plist
+311-0graphics/xreader/pkg-plist
+148-163devel/grex/Makefile.crates
+109-103textproc/feluda/distinfo
+112-0graphics/xreader/Makefile
+979-1,02628 files not shown
+1,127-1,36934 files

HardenedBSD/src e27d5c1usr.sbin/bsdconfig/share device.subr

bsdconfig: RealTek -> Realtek

Realtek changed how it styled its name 25 or so years ago, but the old
style persisted in many places. These products use the new styling in
their datasheets.

Signed-off-by: ykla yklaxds at gmail.com
Sponsored by: Chinese FreeBSD Community
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1901
DeltaFile
+3-3usr.sbin/bsdconfig/share/device.subr
+3-31 files

HardenedBSD/src 8cbe0ddsys/dev/mii rlphy.c miidevs, sys/dev/re if_re.c

sys: RealTek -> Realtek

Realtek changed how it styled its name 25 or so years ago, but the old
style persisted in many places. These products use the new styling in
their datasheets.

Signed-off-by: ykla yklaxds at gmail.com
Sponsored by: Chinese FreeBSD Community
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1901
DeltaFile
+18-18sys/dev/re/if_re.c
+16-16sys/dev/rl/if_rl.c
+9-9sys/dev/mii/rlphy.c
+5-5sys/dev/rl/if_rlreg.h
+4-4sys/dev/mii/miidevs
+4-4sys/dev/usb/net/ruephy.c
+56-5614 files not shown
+77-7720 files

HardenedBSD/src 5fd8a01share/man/man4 rl.4 re.4

man: RealTek -> Realtek

Realtek changed how it styled its name 25 or so years ago, but the old
style persisted in many places. These products use the new styling in
their datasheets.

Signed-off-by: ykla yklaxds at gmail.com
Sponsored by: Chinese FreeBSD Community
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1901
DeltaFile
+8-8share/man/man4/rl.4
+6-6share/man/man4/re.4
+4-4share/man/man4/rue.4
+4-4share/man/man4/miibus.4
+2-2share/man/man4/rgephy.4
+24-245 files

HardenedBSD/ports e949e46net/kea-devel pkg-plist distinfo

net/kea-devel: Update to 3.1.4
DeltaFile
+17-12net/kea-devel/pkg-plist
+3-3net/kea-devel/distinfo
+1-1net/kea-devel/Makefile
+21-163 files

HardenedBSD/ports caf4b0atextproc/moor distinfo Makefile

textproc/moor: Update 2.9.1 => 2.9.2

Changelog:
https://github.com/walles/moor/releases/tag/v2.9.2

PR:             291189
Reported by:    Yusuf Yaman <nxjoseph at protonmail.com> (maintainer)
DeltaFile
+5-5textproc/moor/distinfo
+1-1textproc/moor/Makefile
+6-62 files

HardenedBSD/ports 0a0263bgraphics/xreader pkg-plist Makefile, print/xreader pkg-plist Makefile

graphics/xreader: move and update to 4.6.0

This started as a fork of graphics/atril, which in turn forked from
graphics/evince, so move categories to match.

- make PDF and pixbuf support unconditional, support for those
  formats are always expected
- optionalise NLS, previewer, thumbnailer
- exclude DOCS as upstream is still evaluating the build issue
DeltaFile
+0-431print/xreader/pkg-plist
+311-0graphics/xreader/pkg-plist
+112-0graphics/xreader/Makefile
+0-97print/xreader/Makefile
+0-31print/xreader/files/patch-libview_meson.build
+0-30print/xreader/files/patch-shell_meson.build
+423-58910 files not shown
+431-68116 files

HardenedBSD/src 2996c41sys/conf NOTES

NOTES: fix typos and unify terminology in comments

Signed-off-by: ykla yklaxds at gmail.com
Sponsored by: Chinese FreeBSD Community
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1901
DeltaFile
+18-18sys/conf/NOTES
+18-181 files

HardenedBSD/ports c668b3ftextproc/feluda distinfo Makefile.crates, textproc/feluda/files patch-Cargo.toml

textproc/feluda: Update 1.10.1 => 1.10.3

Added run-time dependency for emojis to appear properly.
Removed accidentally added distinfo entry of openssl-src (from
previous commit) which we don't want use already.

Changelog:
- https://github.com/anistark/feluda/releases/tag/v1.10.2
- https://github.com/anistark/feluda/releases/tag/v1.10.3

PR:             290737
Reported by:    Yusuf Yaman <nxjoseph at protonmail.com> (maintainer)
DeltaFile
+109-103textproc/feluda/distinfo
+53-49textproc/feluda/Makefile.crates
+5-5textproc/feluda/files/patch-Cargo.toml
+2-2textproc/feluda/Makefile
+169-1594 files

HardenedBSD/src 7fe881estand/defaults loader.conf.5

loader: Note current autoboot_delay behavior

Some time ago, the boot loader stopped polling for a key press during
the kernel and module loading prior to the transition to lua. Inspection
of the code shows the polling is no longer there. Document the change.

Sponsored by:           Netflix
DeltaFile
+3-3stand/defaults/loader.conf.5
+3-31 files

HardenedBSD/ports a200828security/vuxml/vuln 2025.xml

security/vuxml: document gitlab vulnerabilities
DeltaFile
+39-0security/vuxml/vuln/2025.xml
+39-01 files

HardenedBSD/ports 8f6829bdevel/grex distinfo Makefile.crates

devel/grex: Update to 1.4.6

Changelog: https://github.com/pemistahl/grex/releases/tag/v1.4.6

PR:             291219
Reported by:    Petteri Valkonen <petteri.valkonen at iki.fi> (maintainer)
DeltaFile
+299-329devel/grex/distinfo
+148-163devel/grex/Makefile.crates
+1-2devel/grex/Makefile
+448-4943 files

HardenedBSD/ports 4159c8cdevel/air-go distinfo Makefile

devel/air-go: Update to 1.63.4
DeltaFile
+5-5devel/air-go/distinfo
+1-1devel/air-go/Makefile
+6-62 files

HardenedBSD/ports c5676d8net-im/gotosocial distinfo Makefile

net-im/gotosocial: Update to 0.20.2

Release Notes: https://codeberg.org/superseriousbusiness/gotosocial/releases/tag/v0.20.2

PR:             291222
Reported by:    Tilde Joy <tilde at ultros.pro> (maintainer)
DeltaFile
+5-5net-im/gotosocial/distinfo
+1-2net-im/gotosocial/Makefile
+1-0net-im/gotosocial/pkg-plist
+7-73 files

HardenedBSD/src 52c0749lib/libsecureboot verify_file.c

libsecureboot: do further checks on files without manifests

verify_prep can return VE_FINGERPRINT_NONE. Consider such scenario so
the VE_GEUSS heuristics works with files that likely will not have
fingerprints in the manifest file.

Obtained from:  Hewlett Packard Enterprise
Reviewed by:    sjg
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53940
DeltaFile
+1-1lib/libsecureboot/verify_file.c
+1-11 files

HardenedBSD/src 56275b7usr.sbin/bsdinstall Makefile

bsdinstall: Ignore -p[0-9]+ in determining BRANCH

The patch level is not part of the branch per se and should not be
used in constructing the FreeBSD-base.conf file used by bsdinstall.

MFC after:      1 day

(cherry picked from commit d45816f369eb0099fd274fee23a3bf137ee794b1)
DeltaFile
+1-1usr.sbin/bsdinstall/Makefile
+1-11 files

HardenedBSD/src a12e9c0lib/libc/tests/stdlib strfmon_test.c, share/doc/papers/malloc implementation.ms performance.ms

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+245-24usr.bin/mdo/mdo.1
+0-223share/doc/papers/malloc/implementation.ms
+0-111share/doc/papers/malloc/performance.ms
+57-23lib/libc/tests/stdlib/strfmon_test.c
+0-72share/doc/papers/malloc/intro.ms
+0-70share/doc/papers/malloc/malloc.ms
+302-52317 files not shown
+360-77723 files

HardenedBSD/src 8fef8a7sys/dev/sound/pcm channel.c vchan.c, usr.bin/mdo mdo.1

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+245-24usr.bin/mdo/mdo.1
+22-48sys/dev/sound/pcm/channel.c
+0-18sys/dev/sound/pcm/vchan.c
+0-5sys/dev/sound/pcm/vchan.h
+267-954 files

HardenedBSD/ports e1ee377devel/rust-cbindgen distinfo Makefile.crates, net/haproxy33 pkg-plist Makefile

Merge branch 'freebsd/main' into hardenedbsd/main
DeltaFile
+316-295www/homepage/pkg-plist
+107-95devel/rust-cbindgen/distinfo
+130-0net/haproxy33/files/haproxy.in
+115-0net/haproxy33/pkg-plist
+52-46devel/rust-cbindgen/Makefile.crates
+96-0net/haproxy33/Makefile
+816-43635 files not shown
+914-63141 files

HardenedBSD/src 3cf8333sys/dev/sound/pcm vchan.c vchan.h

sound: Remove vchan_passthrough() and hw.snd.passthrough_verbose

Unused and confusing.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit 3612ef642f511a1bd9f759da87abeafe7d6ff110)
DeltaFile
+0-18sys/dev/sound/pcm/vchan.c
+0-5sys/dev/sound/pcm/vchan.h
+0-232 files

HardenedBSD/src 068b20esys/dev/sound/pcm channel.c

sound: Fix KASSERT panics in chn_read() and chn_write()

INVARIANTS kernels may trigger a KASSERT panic from sndbuf_acquire(),
when fuzzing write(2) using stress2, because of a race in chn_write().

In the case of chn_write(), what sndbuf_acquire() does is extend the
ready-to-read area of the buffer by a specified amount of bytes. The
KASSERT in question makes sure the number of bytes we want to extend the
ready area by, is less than or equal to the number of free bytes in the
buffer. This makes sense, because we cannot extend the ready area to
something larger than what is available (i.e., free) in the first place.

What chn_write() currently does for every write is; calculate the
appropriate write size, let's say X, unlock the channel, uiomove() X
bytes to the channel's buffer, lock the channel, and call
sndbuf_acquire() to extend the ready area by X bytes. The problem with
this approach, however, is the following.

Suppose an empty channel buffer with a length of 1024 bytes, and 2

    [45 lines not shown]
DeltaFile
+22-48sys/dev/sound/pcm/channel.c
+22-481 files

HardenedBSD/src 35232d8share/doc/papers/malloc implementation.ms performance.ms

papers: Retire phkmalloc paper

It has not been installed since commit cdc37953165c ("In preparation for
the removal of the roff toolchain, disconnect the") and turned up in
a search for outdated MALLOC_OPTIONS settings.

The rendered paper is available at
https://papers.freebsd.org/1998/phk-malloc

PR:             287357
Reviewed by:    bapt
Event:          Kitchener-Waterloo Hackathon 202506
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D50908
DeltaFile
+0-223share/doc/papers/malloc/implementation.ms
+0-111share/doc/papers/malloc/performance.ms
+0-72share/doc/papers/malloc/intro.ms
+0-70share/doc/papers/malloc/malloc.ms
+0-54share/doc/papers/malloc/kernel.ms
+0-52share/doc/papers/malloc/problems.ms
+0-5825 files not shown
+0-71211 files

HardenedBSD/src 5198c32sys/dev/vt vt_core.c

vt: Allow VT_SETMODE with frsig=0

Linux does not check that any of the signals in vt_mode VT_SETMODE ioctl
(relsig, acqsig, frsig) are valid, but FreeBSD required that all three
are valid.  frsig is unusued in both Linux and FreeBSD, and software
typically leaves it unset.  To improve portability, allow frsig to be
set to zero.

PR:             289812
Reported by:    Dušan Gvozdenović
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52835
DeltaFile
+3-3sys/dev/vt/vt_core.c
+3-31 files

HardenedBSD/src ddec420sys/netpfil/ipfilter/netinet fil.c ip_nat.c

ipfilter: fix broken build

Every commit earns me a dozen emails that LINT is broken. This should
stop that.

Fixes: eda1756d0454f ipfilter: Verify frentry on entry into kernel
Sponsored by: Netflix
DeltaFile
+1-3sys/netpfil/ipfilter/netinet/fil.c
+0-3sys/netpfil/ipfilter/netinet/ip_nat.c
+1-62 files

HardenedBSD/src eb90470sys/modules/mqueue Makefile

mqueuefs: Export another symbol required by linux.ko

Fixes: e00a781c216c ("mqueue: Export kern_kmq_* symbols from kernel module")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+2-1sys/modules/mqueue/Makefile
+2-11 files

HardenedBSD/src 78c6cfdsys/netpfil/ipfilter/netinet fil.c

ipfilter: Restore used variable

One of the "unused" i variables is actually used.

Fixes:          20c48f090b27
DeltaFile
+1-1sys/netpfil/ipfilter/netinet/fil.c
+1-11 files

HardenedBSD/src 20c48f0sys/netpfil/ipfilter/netinet ip_nat.c fil.c

ipfilter: Remove unused variable

Reported by:    jlduran
Fixes:          eda1756d0454, 821774dfbdaa
MFC after:      1 week
X-MFC with:     eda1756d0454, 821774dfbdaa
DeltaFile
+1-1sys/netpfil/ipfilter/netinet/ip_nat.c
+1-1sys/netpfil/ipfilter/netinet/fil.c
+2-22 files

HardenedBSD/src d5d005elibexec/rc/rc.d ippool

ipfilter: Load optionlist prior to ippool invocation

As a safety precaution df381bec2d2b limits ippool hash table size to 1K.
This causes any legitimely large hash table to fail to load. The
htable_size_max ipf tuneable adjusts this but the adjustment is made
in the ipfilter rc script, invoked after the ippool script (because it
depends on ippool). Let's load the ipfilter_optionlist in ippool as well.
ipfilter_optionlist load will also occur in the ipfilter rc script in case
the user uses ipfilter without ippool.

Fixes:          df381bec2d2b
MFC after:      3 days
DeltaFile
+3-0libexec/rc/rc.d/ippool
+3-01 files