diff --git a/kernel-x86_64-automotive-debug-rhel.config b/kernel-x86_64-automotive-debug-rhel.config index db600311b..ce214f99d 100644 --- a/kernel-x86_64-automotive-debug-rhel.config +++ b/kernel-x86_64-automotive-debug-rhel.config @@ -3946,6 +3946,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set diff --git a/kernel-x86_64-automotive-rhel.config b/kernel-x86_64-automotive-rhel.config index c461dd8d2..df8ec23c0 100644 --- a/kernel-x86_64-automotive-rhel.config +++ b/kernel-x86_64-automotive-rhel.config @@ -3926,6 +3926,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 854ca2f99..a94f5c2a0 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4324,6 +4324,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set CONFIG_MKISS=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 3d263fe6a..49bbbd7f8 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3829,6 +3829,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e17b22324..3cf577470 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4298,6 +4298,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set CONFIG_MKISS=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 0b3ab51b2..f54ce1835 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3809,6 +3809,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 818a626d6..d7a9becfe 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -4329,6 +4329,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set CONFIG_MKISS=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 83cf07749..daaf6340b 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3870,6 +3870,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index 987f7a517..a37a6d514 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -4303,6 +4303,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set CONFIG_MKISS=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 35d12bc5b..c79de0b03 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3850,6 +3850,7 @@ CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SRSO=y CONFIG_MITIGATION_SSB=y CONFIG_MITIGATION_TAA=y +CONFIG_MITIGATION_TSA=y CONFIG_MITIGATION_UNRET_ENTRY=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set diff --git a/kernel.changelog b/kernel.changelog index 18d453f8f..ae29520be 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,9 @@ +* Thu Jul 10 2025 Augusto Caringi [6.15.6-0] +- Turn on MITIGATION_TSA for RHEL configs (Augusto Caringi) +- Turn on TSA Mitigation for Fedora (Justin M. Forbes) +- Linux v6.15.6 +Resolves: + * Sun Jul 06 2025 Justin M. Forbes [6.15.5-0] - io_uring: gate REQ_F_ISREG on !S_ANON_INODE as well (Jens Axboe) - Linux v6.15.5 diff --git a/kernel.spec b/kernel.spec index 124d334af..b629ea3dc 100644 --- a/kernel.spec +++ b/kernel.spec @@ -159,18 +159,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.15.5 -%define specversion 6.15.5 +%define specrpmversion 6.15.6 +%define specversion 6.15.6 %define patchversion 6.15 %define pkgrelease 100 %define kversion 6 -%define tarfile_release 6.15.5 +%define tarfile_release 6.15.6 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 100%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.15.5 +%define kabiversion 6.15.6 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4261,6 +4261,11 @@ fi\ # # %changelog +* Thu Jul 10 2025 Augusto Caringi [6.15.6-0] +- Turn on MITIGATION_TSA for RHEL configs (Augusto Caringi) +- Turn on TSA Mitigation for Fedora (Justin M. Forbes) +- Linux v6.15.6 + * Sun Jul 06 2025 Justin M. Forbes [6.15.5-0] - io_uring: gate REQ_F_ISREG on !S_ANON_INODE as well (Jens Axboe) - Linux v6.15.5 diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index 99da239bd..471fde0a8 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -10,14 +10,12 @@ arch/arm64/boot/dts/rockchip/rk3568.dtsi | 8 +- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 6 - arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 1 + - arch/powerpc/include/uapi/asm/ioctls.h | 8 +- arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + arch/x86/kernel/setup.c | 22 +- crypto/sig.c | 3 +- crypto/testmgr.c | 2 +- - drivers/acpi/acpica/dsmethod.c | 7 + drivers/acpi/apei/hest.c | 8 + drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + @@ -59,7 +57,7 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 61 files changed, 2756 insertions(+), 348 deletions(-) + 59 files changed, 2745 insertions(+), 344 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index dd844ac8d910..dab2b4892122 100644 @@ -90,7 +88,7 @@ index dd844ac8d910..dab2b4892122 100644 M: Jimmy Su L: linux-media@vger.kernel.org diff --git a/Makefile b/Makefile -index 66b61bf90388..89ce8e015c7b 100644 +index 959b55a05d1b..60d048560446 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -404,25 +402,6 @@ index d22068475c5d..17f4fd054cd3 100644 }; }; -diff --git a/arch/powerpc/include/uapi/asm/ioctls.h b/arch/powerpc/include/uapi/asm/ioctls.h -index 2c145da3b774..b5211e413829 100644 ---- a/arch/powerpc/include/uapi/asm/ioctls.h -+++ b/arch/powerpc/include/uapi/asm/ioctls.h -@@ -23,10 +23,10 @@ - #define TCSETSW _IOW('t', 21, struct termios) - #define TCSETSF _IOW('t', 22, struct termios) - --#define TCGETA _IOR('t', 23, struct termio) --#define TCSETA _IOW('t', 24, struct termio) --#define TCSETAW _IOW('t', 25, struct termio) --#define TCSETAF _IOW('t', 28, struct termio) -+#define TCGETA 0x40147417 /* _IOR('t', 23, struct termio) */ -+#define TCSETA 0x80147418 /* _IOW('t', 24, struct termio) */ -+#define TCSETAW 0x80147419 /* _IOW('t', 25, struct termio) */ -+#define TCSETAF 0x8014741c /* _IOW('t', 28, struct termio) */ - - #define TCSBRK _IO('t', 29) - #define TCXONC _IO('t', 30) diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index b0d00032479d..afb9544fb007 100644 --- a/arch/s390/include/asm/ipl.h @@ -544,24 +523,6 @@ index 82977ea25db3..aeb84a4b5937 100644 return 0; sig_size = crypto_sig_maxsize(tfm); -diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c -index e809c2aed78a..a232746d150a 100644 ---- a/drivers/acpi/acpica/dsmethod.c -+++ b/drivers/acpi/acpica/dsmethod.c -@@ -483,6 +483,13 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, - return_ACPI_STATUS(AE_NULL_OBJECT); - } - -+ if (this_walk_state->num_operands < obj_desc->method.param_count) { -+ ACPI_ERROR((AE_INFO, "Missing argument for method [%4.4s]", -+ acpi_ut_get_node_name(method_node))); -+ -+ return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG); -+ } -+ - /* Init for new method, possibly wait on method mutex */ - - status = diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 20d757687e3d..90a13f20f052 100644 --- a/drivers/acpi/apei/hest.c @@ -4083,7 +4044,7 @@ index 000000000000..bf88863803b2 + { } +}; diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 950d8c9fb884..77ac6f8c1805 100644 +index 89d5c4b17bc4..8cc874715933 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -121,6 +121,14 @@ static const char *sd_cache_types[] = { @@ -4111,10 +4072,10 @@ index 950d8c9fb884..77ac6f8c1805 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 9f19fc7494e0..595b7b294f0f 100644 +index f71b807d71a7..ee8abbe5a43a 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5854,6 +5854,13 @@ static void hub_event(struct work_struct *work) +@@ -5857,6 +5857,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); diff --git a/sources b/sources index 777702028..05bf4e51f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15.5.tar.xz) = ffa4636a1d74620ece8dad87a909696673cdf070d8a4ec29e10399698a1fdf98209d8a8a8745cecf7197082d5cf02b3cacdbc65322fd98c9798cbb9ef504e2ab -SHA512 (kernel-abi-stablelists-6.15.5.tar.xz) = c81c40182daf2e2809419d2bf5a7a8c4ee277ecb4a8bcfbb74617f8eef6eed500aab2db5049249bd6eb6eaaf6ab9ad5751ab046e918312af478e2cebf389ffdd -SHA512 (kernel-kabi-dw-6.15.5.tar.xz) = 0fbee67a20b67186d7505b31e28fe8c10aaa7c6132bbc8b113dcf11dbcd5e3d891ebbb06bb3300322652e954a3198104c3426d8be80a8775a97af2801507cd82 +SHA512 (linux-6.15.6.tar.xz) = 8524f784eb56152b9e32d9ad9ae70020028eaf5fee49818396dcf38e1d85de3edc3af9510f60e476704fc7800a8cb0e6f0a785228327794003809c7fba57ead1 +SHA512 (kernel-abi-stablelists-6.15.6.tar.xz) = 44a436e9d31c710a7b1ecb6bc6fd8cfd7fa3398ec207fadad60f4394715d998a0f07eaa17398a4dbcc3c07f3f5e026f485029a28fb1a5f20176efb8cfa1c454c +SHA512 (kernel-kabi-dw-6.15.6.tar.xz) = 09545ba685dab161481331c6918fee9e1f60644f4922917e3174cc049cb68486468df01f12673bbbf4c52883f0c5edf1a8837e9244637f7f6c8c6bfc31112508