diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index f486930d1..9dc7ead36 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4035,6 +4035,7 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m +CONFIG_MITIGATION_RFDS=y # CONFIG_MK8 is not set CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 24590a78f..e790fcfb0 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3584,6 +3584,7 @@ CONFIG_MINIX_SUBPARTITION=y CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m +CONFIG_MITIGATION_RFDS=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set CONFIG_MLX4_DEBUG=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 8742fe5f8..a2ca20e20 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4009,6 +4009,7 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m +CONFIG_MITIGATION_RFDS=y # CONFIG_MK8 is not set CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 53cd0823b..c416d8140 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3564,6 +3564,7 @@ CONFIG_MINIX_SUBPARTITION=y CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m +CONFIG_MITIGATION_RFDS=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set CONFIG_MLX4_DEBUG=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 288412fd0..af9b9cb07 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3629,6 +3629,7 @@ CONFIG_MINIX_SUBPARTITION=y CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m +CONFIG_MITIGATION_RFDS=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set CONFIG_MLX4_DEBUG=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index caca374be..e0af5d1ff 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3609,6 +3609,7 @@ CONFIG_MINIX_SUBPARTITION=y CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m +CONFIG_MITIGATION_RFDS=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set CONFIG_MLX4_DEBUG=y diff --git a/kernel.changelog b/kernel.changelog index 1377dedb6..8b789ba4d 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,8 @@ +* Mon Mar 18 2024 Augusto Caringi [6.7.10-0] +- redhat/configs: Enable CONFIG_MITIGATION_RFDS (Augusto Caringi) +- Linux v6.7.10 +Resolves: + * Wed Mar 06 2024 Augusto Caringi [6.7.9-0] - Add some CVE fixes for 6.7.9 (Justin M. Forbes) - Bluetooth: rfcomm: Fix null-ptr-deref in rfcomm_check_security (Yuxuan Hu) diff --git a/kernel.spec b/kernel.spec index 2bb83e040..3fa466f7a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.7.9 -%define specversion 6.7.9 +%define specrpmversion 6.7.10 +%define specversion 6.7.10 %define patchversion 6.7 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.7.9 +%define tarfile_release 6.7.10 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.7.9 +%define kabiversion 6.7.10 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3847,6 +3847,10 @@ fi\ # # %changelog +* Mon Mar 18 2024 Augusto Caringi [6.7.10-0] +- redhat/configs: Enable CONFIG_MITIGATION_RFDS (Augusto Caringi) +- Linux v6.7.10 + * Wed Mar 06 2024 Augusto Caringi [6.7.9-0] - Add some CVE fixes for 6.7.9 (Justin M. Forbes) - Bluetooth: rfcomm: Fix null-ptr-deref in rfcomm_check_security (Yuxuan Hu) diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 365623b6a..1b4f19b40 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -70,7 +70,7 @@ index 98d304010170..7f674a6cfa8a 100644 0x1020 0x1F unknown diff --git a/Makefile b/Makefile -index f1a592b7c7bc..27fc5bc7b1bb 100644 +index 00c159535dab..c4fed2e416db 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 1d76518c8..3f388a2f1 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.5.12.tar.bz2) = 7130ba0d72e398ae63bd0192e5e765885d8b932ff10c22f214821387588c358a21c8460561993baab0e5cd48afbad08db822cc49e5e3ae2d927b328de2072e7a SHA512 (kernel-kabi-dw-6.5.12.tar.bz2) = 7fc7372de576d1f3602abe70483edf30cf635a6d4175261bb44e1b7d4b413bc045b1e2affc0dbe6bf710a7c10b4a5c26c7fd47d8b8e7fe4bee2a25e2fd80b13a -SHA512 (linux-6.7.9.tar.xz) = a2e400edacb78691868cc061e5a2fcc8649b8703c517da5661ab93defa4f920d0f3a9865c2ab30cbf1af2f78530367bf0df5aae846609feb02602501f23c9694 -SHA512 (kernel-abi-stablelists-6.7.9.tar.xz) = 3358b717f073ab8b4d0791f0775b4dcb0877a741c50b877f5205b5b9a4d0c66ad4ee52a5efd7d29bf47e12eb2c988e41a8245a67139b206a6b95333a52334c7f -SHA512 (kernel-kabi-dw-6.7.9.tar.xz) = e074222c81a4b1268e46bb37251ed0a3391dec447b1e852ddf5ee3ff3d30d52a9bbc278eb65ec97b95cd3cc0f079b6b67c24d21150b95c675aaf73683e3fac0b +SHA512 (linux-6.7.10.tar.xz) = 56d43d671aac5ad8093eb3ec827bf7860e08490480527fff3212d57ea83e750c078d622584e155932e49b504b1229bf6b73e9dd5cfb8a2c73c7f58dcf5593b92 +SHA512 (kernel-abi-stablelists-6.7.10.tar.xz) = 30932f793c44fdfeb1f9c95669efa2ad44456641e34dd9b6f69a050adec8ad21e7ba4c0038b12d57ae1c851e29c9969de2ad780fe61cd6c774076099d2ab099b +SHA512 (kernel-kabi-dw-6.7.10.tar.xz) = ae7b7b23736e1fa715e9336320efe2faf6c6c01fd538c64e2db45db422df90d0014c8c1fe0698c9d65db4db30613c8b7553fd2834060339d1669c48d36748e62