HardenedBSD/src 4dfdf8dlib/libc/gen pause.3, sys/dev/bhnd bhnd_bus_if.m

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2-2tools/tools/shlib-compat/shlib-compat.py
+2-2sys/dev/isci/scil/scic_sds_remote_node_table.c
+1-1sys/dev/isci/scil/scif_remote_device.h
+1-1sys/dev/ixl/ixl_txrx.c
+1-1lib/libc/gen/pause.3
+1-1sys/dev/bhnd/bhnd_bus_if.m
+8-84 files not shown
+12-1210 files

HardenedBSD/src fd275c4lib/libc/gen pause.3, lib/libsys procctl.2

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2-2tools/tools/shlib-compat/shlib-compat.py
+2-2sys/dev/isci/scil/scic_sds_remote_node_table.c
+1-1sys/dev/isci/scil/scic_sds_phy_registers.h
+1-1lib/libc/gen/pause.3
+1-1lib/libsys/procctl.2
+1-1sys/dev/bhnd/bhnd_bus_if.m
+8-84 files not shown
+12-1210 files

HardenedBSD/src b6ae102sbin/newfs newfs.8, sbin/tunefs tunefs.c tunefs.8

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+189-0sbin/tunefs/tests/tunefs_test.sh
+17-8sbin/tunefs/tunefs.c
+10-4sbin/newfs/newfs.8
+6-2sbin/tunefs/tunefs.8
+3-3sys/dev/dpaa2/dpaa2_ni.c
+4-1sbin/tunefs/Makefile
+229-183 files not shown
+238-199 files

HardenedBSD/src 26b27a8sys/dev/dpaa2 dpaa2_ni.c

dpaa2: Perform bus_dma pre-write sync before enqueue operation

Without a proper synchronization payload of the egress TCP segments
can be corrupted as tuexen@ described in
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292006#c31.

This patch is indirectly related to 292006 because a properly enabled
and announced support for the TX checksum offloading hides potentially
corrupted frame payload.

PR:             292006
Reported by:    tuexen@
Reviewed by:    tuexen@
Tested by:      dsl@, tuexen@
Differential Revision:  https://reviews.freebsd.org/D56144
MFC after:      3 days

(cherry picked from commit 5812415bee55a9063508b02fda9418b0eadb0bb4)
DeltaFile
+3-3sys/dev/dpaa2/dpaa2_ni.c
+3-31 files

HardenedBSD/src 83ec9a9etc/mtree BSD.tests.dist, sbin/tunefs Makefile

tunefs: Add tests

MFC after:      1 week
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D56034

(cherry picked from commit 6630c3a73688ae3c33df892f6802bea5b8460e17)
DeltaFile
+189-0sbin/tunefs/tests/tunefs_test.sh
+5-0sbin/tunefs/Makefile
+4-0sbin/tunefs/tests/Makefile
+2-0etc/mtree/BSD.tests.dist
+200-04 files

HardenedBSD/src 1fcaefcsbin/tunefs tunefs.c Makefile

tunefs: Don't lower WARNS

Use casts to silence the alignment warnings instead of potentially
suppressing other legitimate warnings.

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56033

(cherry picked from commit c5e79c7e93dda07c383be9b99a1a91894652f546)

tunefs: Fix alignment warning on arm64

MFC after:      1 week
Fixes:          c5e79c7e93dd ("tunefs: Don't lower WARNS")
Reviewed by:    bakul
Differential Revision:  https://reviews.freebsd.org/D56229

(cherry picked from commit 616f47f176c308a29b1f4a6bba1b1a4dc01c3091)
DeltaFile
+4-4sbin/tunefs/tunefs.c
+0-2sbin/tunefs/Makefile
+4-62 files

HardenedBSD/src ae185dcsbin/tunefs tunefs.c tunefs.8

tunefs: Don't combine GEOM journaling with SU

GEOM journaling shouldn't be used at the same time as soft updates, so
don't enable one if the other is already in use.

MFC after:      1 week
PR:             293896
Reviewed by:    mckusick
Differential Revision:  https://reviews.freebsd.org/D56002

(cherry picked from commit b1f72dd2a9a5e69a310b9e76b55f16cff433b8da)
DeltaFile
+13-4sbin/tunefs/tunefs.c
+6-2sbin/tunefs/tunefs.8
+19-62 files

HardenedBSD/src f758262sbin/newfs newfs.8 newfs.c

newfs: Don't combine GEOM journaling with SU

GEOM journaling shouldn't be used at the same time as soft updates, so
don't enable soft updates if GEOM journaling has been requested, and
error out if both are explicitly requested.

MFC after:      1 week
PR:             293896
Reviewed by:    mckusick
Differential Revision:  https://reviews.freebsd.org/D55999

(cherry picked from commit e30fcdaae2e68458da83d5420e6034c5f384e5f2)
DeltaFile
+10-4sbin/newfs/newfs.8
+3-1sbin/newfs/newfs.c
+13-52 files

HardenedBSD/src adc41a7sys/dev/isci/scil scic_sds_remote_node_table.c scic_sds_stp_request.h

isci(4): Fix a couple of typos in source code comments

- s/THis/This/
- s/impementation/implementation/

MFC after:      3 days
DeltaFile
+2-2sys/dev/isci/scil/scic_sds_remote_node_table.c
+1-1sys/dev/isci/scil/scic_sds_stp_request.h
+1-1sys/dev/isci/scil/scic_sds_phy_registers.h
+1-1sys/dev/isci/scil/scif_remote_device.h
+5-54 files

HardenedBSD/src ef3703asys/dev/ixl ixl_txrx.c

ixl(4): Fix a typo in a source code comment

- s/seperated/separated/

MFC after:      3 days
DeltaFile
+1-1sys/dev/ixl/ixl_txrx.c
+1-11 files

HardenedBSD/src b427b66usr.sbin/bsdconfig/share common.subr

bsdconfig(8): Fix a typo in a source code comment

- s/THis/This/

MFC after:      3 days
DeltaFile
+1-1usr.sbin/bsdconfig/share/common.subr
+1-11 files

HardenedBSD/src 3957e23tools/tools/shlib-compat shlib-compat.py

shlib-compat: Fix two typos in error messages

- s/implemeted/implemented/

MFC after:      3 days
DeltaFile
+2-2tools/tools/shlib-compat/shlib-compat.py
+2-21 files

HardenedBSD/src 04be4d0sys/dev/bhnd bhnd_bus_if.m

bhnd(4): Fix a typo in a source code comment

- s/impementations/implementations/

MFC after:      3 days
DeltaFile
+1-1sys/dev/bhnd/bhnd_bus_if.m
+1-11 files

HardenedBSD/src 9eea5eclib/libc/gen pause.3

pause.3: Fix a typo in the manual page

- s/reimplemeted/reimplemented/

MFC after:      3 days
DeltaFile
+1-1lib/libc/gen/pause.3
+1-11 files

HardenedBSD/src 982b3c5lib/libsys procctl.2

procctl.2: remove space at EOL

Fixes:  db9bbe131c92f55e6cf03657dc030c9eea93a9fb
DeltaFile
+1-1lib/libsys/procctl.2
+1-11 files

HardenedBSD/src 6c4179bsys/netinet tcp_var.h, sys/netinet/tcp_stacks rack.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-3sys/netinet/tcp_stacks/rack.c
+2-2sys/netinet/tcp_var.h
+3-52 files

HardenedBSD/src 802ed09sys/netinet tcp_var.h, sys/netinet/tcp_stacks rack.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-3sys/netinet/tcp_stacks/rack.c
+2-2sys/netinet/tcp_var.h
+3-52 files

HardenedBSD/src 32cc4besys/netinet tcp_var.h, sys/netinet/tcp_stacks rack.c

tcp: retire TF_SENTSYN

This TF_-flag is only used in the RACK stack and not really needed.
So replace it, since glebius@ needs a TF_ flag and right now all
of them are taken.
No functional change intended.

Reviewed by:            rrs, glebius, rscheff, Nick Banks
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D56025
DeltaFile
+1-3sys/netinet/tcp_stacks/rack.c
+2-2sys/netinet/tcp_var.h
+3-52 files

HardenedBSD/src ee4b14c. RELNOTES, lib Makefile

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-16share/man/man5/src.conf.5
+1-7usr.bin/gzip/Makefile
+2-3lib/Makefile
+4-0RELNOTES
+0-4tools/build/options/WITHOUT_BZIP2
+0-2share/mk/src.opts.mk
+8-321 files not shown
+8-337 files

HardenedBSD/src 6f1191f. RELNOTES, lib Makefile

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-16share/man/man5/src.conf.5
+1-7usr.bin/gzip/Makefile
+2-3lib/Makefile
+4-0RELNOTES
+0-4tools/build/options/WITHOUT_BZIP2
+0-2share/mk/src.opts.mk
+8-321 files not shown
+8-337 files

HardenedBSD/src 1bcba71sys/kern sys_timerfd.c, sys/sys time.h

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+1,347-0tests/sys/kern/timerfd.c
+27-17sys/kern/sys_timerfd.c
+21-0sys/sys/time.h
+2-0tests/sys/kern/Makefile
+1,397-174 files

HardenedBSD/src c484a2dtests/sys/kern timerfd.c Makefile

timerfd: Add tests

Take Jan Kokemuller's timerfd tests from the epoll-shim project,
stripping out code that isn't directly related to FreeBSD.

Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D55789
MFC after:              2 weeks

(cherry picked from commit 834c1ba793d900b791e19ff449b1e0b96fb494a0)
DeltaFile
+1,318-0tests/sys/kern/timerfd.c
+3-0tests/sys/kern/Makefile
+1,321-02 files

HardenedBSD/src 0b7e325tests/sys/kern timerfd.c Makefile

timerfd: Expect periodic timer performance failures

The current timerfd implementation fails to correctly count events on a
nanosecond callout interval. The timerfd__periodic_timer_performance
test detects this and reports failure.

Mark this test as an expected failure so it isn't flagged by CI. A link
to the bug report is attached to the test for reference.

While we're here, clean up some minor style and Make issues.

Fixes:          834c1ba793d9 ("timerfd: Add tests")
MFC after:      1 week

(cherry picked from commit cb692380f1e05ffc4184877844e93051f24ed302)
DeltaFile
+2-3tests/sys/kern/timerfd.c
+0-1tests/sys/kern/Makefile
+2-42 files

HardenedBSD/src 53c01dfsys/kern sys_timerfd.c

timerfd: Use saturating sbintime conversions

Some timerfd consumers set expirations with timespec tv_sec components
larger than 2^31 - 1. In such cases, converting that timespec to
sbintime results in data loss or sign flip, yielding a shorter
expiration than desired.

To avoid this problem, use saturating timespec-to-sbintime conversion
functions. These will clamp the converted sbintime to SBT_MAX under
circumstances where the normal conversion functions would overflow.

Saturating conversions still result in data loss, but the consequences
are less severe, causing problems only after SBT_MAX (~68 years) of
system uptime elapses.

Reviewed by:            imp
Differential Revision:  https://reviews.freebsd.org/D55792
MFC after:              2 weeks

(cherry picked from commit 0e8f351be7935729bf67dc1b7aa4d178cf154931)
DeltaFile
+5-5sys/kern/sys_timerfd.c
+5-51 files

HardenedBSD/src 6a5176asys/kern sys_timerfd.c

timerfd: Wake up on discontinuous jump

If a discontinous realtime clock change occurs and sets any TFD_JUMPED
bits on the timerfd, then wake up waiting readers. This fixes failures
from the timerfd_root__clock_change_notification test case.

MFC after: 2 weeks

(cherry picked from commit b11fba41265ae132acfb05587a6dbf60334d3279)
DeltaFile
+11-3sys/kern/sys_timerfd.c
+11-31 files

HardenedBSD/src 7f087edsys/sys time.h

sys/time: Add saturating sbt conversions

When converting from timespec to sbintime, the timespec's 64-bit tv_sec
component is shifted to the left 32 bits, causing any information in the
upper 32 bits to be lost.

This data loss during conversion can turn timespecs with very large
tv_sec counters into sbintimes that represent much smaller time
durations.

Add tstosbt_sat() and tvtosbt_sat(), which are saturating versions of
tstosbt and tvtosbt. With these routines, any overflow resulting from
the conversion is clamped to [-SBT_MAX - 1, SBT_MAX].

Reviewed by:            imp, markj
Differential Revision:  https://reviews.freebsd.org/D55791
MFC after:              2 weeks

(cherry picked from commit e3799530b3ba38567f8052b9e107884609fc71ea)
DeltaFile
+21-0sys/sys/time.h
+21-01 files

HardenedBSD/src 9d71069sys/kern sys_timerfd.c

timerfd: Suppress kqueue readability after jump read

Do not report EVFILT_READ after reading a discontinuous clock jump.
This makes the kqueue filter consistent with Linux epoll behavior
and timerfd_poll(), which already checks tfd_jumped != TFD_READ before
reporting POLLIN.

MFC after: 2 weeks

(cherry picked from commit 33345b8834859cf1ad7f1256f3a34b4a7c83e8e8)
DeltaFile
+1-1sys/kern/sys_timerfd.c
+1-11 files

HardenedBSD/src 2d10377tests/sys/kern timerfd.c

timerfd: Guard expected performance failure

During the timerfd__periodic_timer_performance test, only expect
failures when the expiration count is less than 400000000. This
prevents the test from being reported as a true failure in environments
where scheduling latency is high enough to delay timerfd wakeups.

Fixes:          cb692380f1e0 ("timerfd: Expect periodic timer ...")
MFC after:      1 week

(cherry picked from commit 4b16ff49bf4bf875997fe4c80a0afc0d440b7aac)
DeltaFile
+2-1tests/sys/kern/timerfd.c
+2-11 files

HardenedBSD/src 9b78538sys/kern sys_timerfd.c, tests/sys/kern timerfd.c

timerfd: Fix interval callout scheduling

When a timerfd interval callout misses its scheduled activation time, a
differential is calculated based on the actual activation time and the
scheduled activation time. This differential is divided by the timerfd's
interval time and the quotient is added to the timerfd's counter.

Before this change, the next callout was scheduled to activate at:
scheduled activation time + timerfd interval.

This change fixes the scheduling of the next callout to activate at:
actual activation time + timerfd interval - remainder.

Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D55790
MFC after:              2 weeks

(cherry picked from commit 85c0f1a87da1fd1eb3e646e86f70e630c48da91a)
DeltaFile
+29-0tests/sys/kern/timerfd.c
+13-11sys/kern/sys_timerfd.c
+42-112 files

HardenedBSD/src 2d843b7. RELNOTES

RELNOTES: Document WITHOUT_BZIP2* removal
DeltaFile
+4-0RELNOTES
+4-01 files