HardenedBSD/src df19d26sys/contrib/device-tree/src/arm/aspeed aspeed-bmc-ibm-everest.dts, sys/contrib/device-tree/src/arm64/nvidia tegra234-p3737-0000+p3701-0000.dts tegra234-p3701.dtsi

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+6,013-0sys/contrib/device-tree/src/arm64/qcom/sm8650.dtsi
+3,527-0sys/contrib/device-tree/src/arm64/qcom/x1e80100.dtsi
+1,588-1,295sys/contrib/device-tree/src/arm/aspeed/aspeed-bmc-ibm-everest.dts
+78-2,078sys/contrib/device-tree/src/arm64/nvidia/tegra234-p3737-0000+p3701-0000.dts
+2,044-0sys/contrib/device-tree/src/arm64/nvidia/tegra234-p3701.dtsi
+2,000-0sys/contrib/device-tree/src/riscv/sophgo/sg2042-cpus.dtsi
+15,250-3,3733,135 files not shown
+164,837-23,0303,141 files

HardenedBSD/src f0eafcausr.bin/split split.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+4-0usr.bin/split/split.c
+4-01 files

HardenedBSD/src 33e2b4cusr.bin/split split.c

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master
DeltaFile
+4-0usr.bin/split/split.c
+4-01 files

HardenedBSD/src 7929aeesys/dts freebsd-compatible.dts

dts: Bump the freebsd branding version to 6.8

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+1-1sys/dts/freebsd-compatible.dts
+1-11 files

HardenedBSD/src 8d13bc6sys/contrib/device-tree/src/arm64/exynos exynosautov920-pinctrl.dtsi, sys/contrib/device-tree/src/arm64/exynos/google gs101-pinctrl.dtsi

Import device-tree files from Linux 6.8

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+6,013-0sys/contrib/device-tree/src/arm64/qcom/sm8650.dtsi
+3,527-0sys/contrib/device-tree/src/arm64/qcom/x1e80100.dtsi
+1,266-0sys/contrib/device-tree/src/arm64/exynos/exynosautov920-pinctrl.dtsi
+1,249-0sys/contrib/device-tree/src/arm64/exynos/google/gs101-pinctrl.dtsi
+1,115-9sys/contrib/device-tree/src/arm64/qcom/sa8775p.dtsi
+956-0sys/contrib/device-tree/src/arm64/mediatek/mt8188.dtsi
+14,126-91,268 files not shown
+68,563-6,9541,274 files

HardenedBSD/src c0b8b81sys/dts freebsd-compatible.dts

dts: Bump the freebsd branding version to 6.7

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+1-1sys/dts/freebsd-compatible.dts
+1-11 files

HardenedBSD/src 84943d6sys/contrib/device-tree/src/arm64/mediatek mt8395-genio-1200-evk.dts, sys/contrib/device-tree/src/arm64/qcom qcm6490-fairphone-fp5.dts

Import device-tree files from Linux 6.7

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+2,000-0sys/contrib/device-tree/src/riscv/sophgo/sg2042-cpus.dtsi
+1,137-0sys/contrib/device-tree/src/arm64/rockchip/rk3588-quartzpro64.dts
+902-0sys/contrib/device-tree/src/arm64/mediatek/mt8395-genio-1200-evk.dts
+848-0sys/contrib/device-tree/src/arm64/rockchip/rk3588-orangepi-5-plus.dts
+757-9sys/contrib/device-tree/src/arm64/ti/k3-am62p-main.dtsi
+667-0sys/contrib/device-tree/src/arm64/qcom/qcm6490-fairphone-fp5.dts
+6,311-91,058 files not shown
+43,112-4,1901,064 files

HardenedBSD/src 13f6b1dsys/dts freebsd-compatible.dts

dts: Bump the freebsd branding version to 6.6

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+1-1sys/dts/freebsd-compatible.dts
+1-11 files

HardenedBSD/src aa1a8ffsys/contrib/device-tree/src/arm/aspeed aspeed-bmc-ibm-everest.dts ibm-power10-quad.dtsi, sys/contrib/device-tree/src/arm/samsung exynos4212-tab3.dtsi

Import device-tree files from Linux 6.6

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+1,588-1,295sys/contrib/device-tree/src/arm/aspeed/aspeed-bmc-ibm-everest.dts
+77-2,078sys/contrib/device-tree/src/arm64/nvidia/tegra234-p3737-0000+p3701-0000.dts
+1,991-0sys/contrib/device-tree/src/arm64/nvidia/tegra234-p3701.dtsi
+1,310-0sys/contrib/device-tree/src/arm/samsung/exynos4212-tab3.dtsi
+1,305-0sys/contrib/device-tree/src/arm/aspeed/ibm-power10-quad.dtsi
+888-0sys/contrib/device-tree/src/arm64/rockchip/rk3588-nanopc-t6.dts
+7,159-3,3731,665 files not shown
+53,931-12,6551,671 files

HardenedBSD/src 6290fc5usr.bin/split split.c

Tighten boundary check in split(1) to prevent a potential buffer overflow.

(cherry picked from commit 95032b58a1ad0fde57518f17805ca721bb4563ad)
DeltaFile
+4-0usr.bin/split/split.c
+4-01 files

HardenedBSD/src aeda7dasys/dev/mlx5/mlx5_en mlx5_en_main.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+3-0sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+3-01 files

HardenedBSD/src e595342libexec/rtld-elf rtld.c rtld.1

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+34-1libexec/rtld-elf/rtld.c
+22-2libexec/rtld-elf/rtld.1
+56-32 files

HardenedBSD/src 45764d1usr.bin/split split.c

Tighten boundary check in split(1) to prevent a potential buffer overflow.

(cherry picked from commit 95032b58a1ad0fde57518f17805ca721bb4563ad)
DeltaFile
+4-0usr.bin/split/split.c
+4-01 files

HardenedBSD/src 0d47501libexec/rtld-elf rtld.1

rtld.1: clarify interaction between -u and -o

(cherry picked from commit 6a7819e43f938992304472054c83f4a6602a9e19)
DeltaFile
+3-1libexec/rtld-elf/rtld.1
+3-11 files

HardenedBSD/src d63c680libexec/rtld-elf rtld.c rtld.1

rtld: add direct-exec option -o

(cherry picked from commit d1cd0cc32b53c09e72e33116b94a5b0b9781a183)
DeltaFile
+30-0libexec/rtld-elf/rtld.c
+19-1libexec/rtld-elf/rtld.1
+49-12 files

HardenedBSD/src 6c85003libexec/rtld-elf rtld.c

rtld direct exec: make -u behavior match the description

(cherry picked from commit ef2694f368cee5957ee44b0298da88ff8360d561)
DeltaFile
+4-1libexec/rtld-elf/rtld.c
+4-11 files

HardenedBSD/src c097967sys/dev/mlx5/mlx5_en mlx5_en_main.c

mlx5en: add diagnostic in one more case of failed eeprom read preparation

Sponsored by:   Nvidia Networking
MFC after:      1 week
DeltaFile
+3-0sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+3-01 files

HardenedBSD/src d0267bcshare/misc bsd-family-tree

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+19-6share/misc/bsd-family-tree
+19-61 files

HardenedBSD/src 613633cshare/misc bsd-family-tree

Add OpenBSD 7.5 to bsd-family-tree

Summary: Add OpenBSD 7.5 to bsd-family-tree

Subscribers: imp

Differential Revision: https://reviews.freebsd.org/D44643

(cherry picked from commit bb4e55242ecb03b3f6876114b0708b0efa85044a)
DeltaFile
+3-0share/misc/bsd-family-tree
+3-01 files

HardenedBSD/src 5c060d9share/misc bsd-family-tree

bsd-family-tree: add NetBSD 10.0

(cherry picked from commit 07b17a1692a3c067e8f3e2dad31441ae441c5387)
DeltaFile
+3-0share/misc/bsd-family-tree
+3-01 files

HardenedBSD/src 0cff58eshare/misc bsd-family-tree

bsd-family-tree: add FreeBSD 13.3

MFC after:      3 days

(cherry picked from commit 885590b4f1ad218995df0fc127601e0f59bcc57f)
DeltaFile
+11-5share/misc/bsd-family-tree
+11-51 files

HardenedBSD/src 22b231ashare/misc bsd-family-tree

bsd-family-tree: QCU: ISBN and EAN numbers

ISBN 0201547775 and International Article Number (EAN) 9780201547771 for
'A Quarter Century of UNIX' by Peter H. Salus.

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/812

(cherry picked from commit 3dfb39ef1d66e8370c302b158173ed8065887c2a)
DeltaFile
+2-1share/misc/bsd-family-tree
+2-11 files

HardenedBSD/src 5806cd1sys/netinet tcp_input.c tcp_subr.c, sys/netinet/tcp_stacks sack_filter.c sack_filter.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+266-150sys/netinet/tcp_stacks/sack_filter.c
+78-13sys/netinet/tcp_stacks/sack_filter.h
+29-2sys/netinet/tcp_stacks/bbr.c
+29-1sys/netinet/tcp_input.c
+25-2sys/netinet/tcp_subr.c
+20-3sys/netinet/tcp_stacks/rack.c
+447-1713 files not shown
+470-1739 files

HardenedBSD/src 3b62f6fcontrib/libarchive/libarchive archive_openssl_evp_private.h

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-4contrib/libarchive/libarchive/archive_openssl_evp_private.h
+0-41 files

HardenedBSD/src c974604contrib/libarchive/libarchive archive_read_support_format_zip.c, contrib/libarchive/libarchive/test test_compat_lzip_4.tlz.uu test_compat_lzip_3.lz.uu

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

Conflicts:
        contrib/libarchive/libarchive/archive_openssl_evp_private.h (unresolved)
DeltaFile
+1,474-0contrib/libarchive/libarchive/test/test_compat_lzip_4.tlz.uu
+1,461-0contrib/libarchive/libarchive/test/test_compat_lzip_3.lz.uu
+1,290-0contrib/libarchive/unzip/bsdunzip.c
+0-1,132usr.bin/unzip/unzip.c
+840-0contrib/libarchive/unzip/la_queue.h
+340-178contrib/libarchive/libarchive/archive_read_support_format_zip.c
+5,405-1,310777 files not shown
+11,820-3,622783 files

HardenedBSD/src fce03f8sys/netinet tcp_input.c tcp_subr.c, sys/netinet/tcp_stacks sack_filter.c sack_filter.h

TCP can be subject to Sack Attacks lets fix this issue.

There is a type of attack that a TCP peer can launch on a connection. This is for sure in Rack or BBR and probably even the default stack if it uses lists in sack processing. The idea of the attack is that the attacker is driving you to look at 100's of sack blocks that only update 1 byte. So for example if you have 1 - 10,000 bytes outstanding the attacker sends in something like:

ACK 0 SACK(1-512) SACK(1024 - 1536), SACK(2048-2536), SACK(4096 - 4608), SACK(8192-8704)
This first sack looks fine but then the attacker sends

ACK 0 SACK(1-512) SACK(1025 - 1537), SACK(2049-2537), SACK(4097 - 4609), SACK(8193-8705)
ACK 0 SACK(1-512) SACK(1027 - 1539), SACK(2051-2539), SACK(4099 - 4611), SACK(8195-8707)
...
These blocks are making you hunt across your linked list and split things up so that you have an entry for every other byte. Has your list grows you spend more and more CPU running through the lists. The idea here is the attacker chooses entries as far apart as possible that make you run through the list. This example is small but in theory if the window is open to say 1Meg you could end up with 100's of thousands link list entries.

To combat this we introduce three things.

when the peer requests a very small MSS we stop processing SACK's from them. This prevents a malicious peer from just using a small MSS to do the same thing.
Any time we get a sack block, we use the sack-filter to remove sacks that are smaller than the smallest v4 mss (minus 40 for max TCP options) unless it ties up to snd_max (since that is legal). All other sacks in theory should be at least an MSS. If we get such an attacker that means we basically start skipping all but MSS sized Sacked blocks.
The sack filter used to throw away data when its bounds were exceeded, instead now we increase its size to 15 and then throw away sack's if the filter gets over-run to prevent the malicious attacker from over-running the sack filter and thus we start to process things anyway.
The default stack will need to start using the sack-filter which we have talked about in past conference calls to take full advantage of the protections offered by it (and reduce cpu consumption when processing sacks).


    [4 lines not shown]
DeltaFile
+266-150sys/netinet/tcp_stacks/sack_filter.c
+78-13sys/netinet/tcp_stacks/sack_filter.h
+29-2sys/netinet/tcp_stacks/bbr.c
+29-1sys/netinet/tcp_input.c
+25-2sys/netinet/tcp_subr.c
+20-3sys/netinet/tcp_stacks/rack.c
+447-1713 files not shown
+470-1739 files

HardenedBSD/src d71a87frelease Makefile.vm

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+2-1release/Makefile.vm
+2-11 files

HardenedBSD/src baa30bdsys/netinet in_pcb.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+4-0sys/netinet/in_pcb.c
+4-01 files

HardenedBSD/src 9287d18release Makefile.vm

release: Use qemu when cross-building vm images

For a bit over 5 years, we have used qemu when cross-building cloudware
images; in particular, it's necessary when installing packages which
might include post-install scripts.

Use qemu in the vm-images target too; while "generic" vm images don't
install packages, they still run newaliases and /etc/rc.d/ldconfig,
both of which fail without appropriate emulation.

MFC after:      1 week
DeltaFile
+2-1release/Makefile.vm
+2-11 files

HardenedBSD/src 0dd05e9contrib/one-true-awk run.c awk.1

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+4-240contrib/one-true-awk/run.c
+0-52contrib/one-true-awk/awk.1
+20-14contrib/one-true-awk/b.c
+0-24contrib/one-true-awk/ChangeLog
+0-23contrib/one-true-awk/parse.c
+1-19contrib/one-true-awk/awkgram.y
+25-37212 files not shown
+63-40518 files