From 3f8443051f3e66c6e2a59dfdf569469643af6330 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 21 Jul 2025 13:25:05 +0000 Subject: [PATCH] Import from CS git --- .gitignore | 2 +- .kernel-rt.metadata | 2 +- SOURCES/kernel-rt-aarch64-debug.config | 1 + SOURCES/kernel-rt-aarch64.config | 1 + SOURCES/kernel-rt-ppc64le-debug.config | 1 + SOURCES/kernel-rt-ppc64le.config | 1 + SOURCES/kernel-rt-s390x-debug.config | 1 + SOURCES/kernel-rt-s390x-zfcpdump.config | 1 + SOURCES/kernel-rt-s390x.config | 1 + SOURCES/kernel-rt-x86_64-debug.config | 1 + SOURCES/kernel-rt-x86_64.config | 1 + SPECS/kernel.spec | 27 ++++++++++++++++++++++--- 12 files changed, 35 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4059614..b14b781 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/centossecureboot201.cer SOURCES/centossecurebootca2.cer -SOURCES/linux-4.18.0-553.62.1.rt7.403.el8_10.tar.xz +SOURCES/linux-4.18.0-553.63.1.rt7.404.el8_10.tar.xz SOURCES/redhatsecureboot302.cer SOURCES/redhatsecureboot303.cer SOURCES/redhatsecureboot501.cer diff --git a/.kernel-rt.metadata b/.kernel-rt.metadata index 34de6de..2e72327 100644 --- a/.kernel-rt.metadata +++ b/.kernel-rt.metadata @@ -1,6 +1,6 @@ 2ba40bf9138b48311e5aa1b737b7f0a8ad66066f SOURCES/centossecureboot201.cer bfdb3d7cffc43f579655af5155d50c08671d95e5 SOURCES/centossecurebootca2.cer -d16e682b320d247d05c21f338b929404692eaba3 SOURCES/linux-4.18.0-553.62.1.rt7.403.el8_10.tar.xz +4aa57f3cb9421d735c6e817973232d6bd05a7ed8 SOURCES/linux-4.18.0-553.63.1.rt7.404.el8_10.tar.xz 13e5cd3f856b472fde80a4deb75f4c18dfb5b255 SOURCES/redhatsecureboot302.cer e89890ca0ded2f9058651cc5fa838b78db2e6cc2 SOURCES/redhatsecureboot303.cer ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer diff --git a/SOURCES/kernel-rt-aarch64-debug.config b/SOURCES/kernel-rt-aarch64-debug.config index 064c9eb..12a29ba 100644 --- a/SOURCES/kernel-rt-aarch64-debug.config +++ b/SOURCES/kernel-rt-aarch64-debug.config @@ -1591,6 +1591,7 @@ # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set # CONFIG_RH_KABI_SIZE_ALIGN_CHECKS is not set +# CONFIG_RH_KABI_STABLE_ASM_OFFSETS is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RMI4_F54 is not set # CONFIG_RMNET is not set diff --git a/SOURCES/kernel-rt-aarch64.config b/SOURCES/kernel-rt-aarch64.config index 62f3b6f..f78f6e5 100644 --- a/SOURCES/kernel-rt-aarch64.config +++ b/SOURCES/kernel-rt-aarch64.config @@ -4743,6 +4743,7 @@ CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RH_KABI_SIZE_ALIGN_CHECKS=y +CONFIG_RH_KABI_STABLE_ASM_OFFSETS=y CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RMI4_2D_SENSOR=y CONFIG_RMI4_CORE=m diff --git a/SOURCES/kernel-rt-ppc64le-debug.config b/SOURCES/kernel-rt-ppc64le-debug.config index aeeea39..cf91aee 100644 --- a/SOURCES/kernel-rt-ppc64le-debug.config +++ b/SOURCES/kernel-rt-ppc64le-debug.config @@ -1457,6 +1457,7 @@ # CONFIG_RFD_FTL is not set # CONFIG_RFKILL_GPIO is not set # CONFIG_RH_KABI_SIZE_ALIGN_CHECKS is not set +# CONFIG_RH_KABI_STABLE_ASM_OFFSETS is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RMI4_F54 is not set # CONFIG_RMNET is not set diff --git a/SOURCES/kernel-rt-ppc64le.config b/SOURCES/kernel-rt-ppc64le.config index d36880c..ee6239b 100644 --- a/SOURCES/kernel-rt-ppc64le.config +++ b/SOURCES/kernel-rt-ppc64le.config @@ -4403,6 +4403,7 @@ CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RH_KABI_SIZE_ALIGN_CHECKS=y +CONFIG_RH_KABI_STABLE_ASM_OFFSETS=y CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RMI4_2D_SENSOR=y CONFIG_RMI4_CORE=m diff --git a/SOURCES/kernel-rt-s390x-debug.config b/SOURCES/kernel-rt-s390x-debug.config index 49beb9b..7bc3dda 100644 --- a/SOURCES/kernel-rt-s390x-debug.config +++ b/SOURCES/kernel-rt-s390x-debug.config @@ -1552,6 +1552,7 @@ # CONFIG_RFD_FTL is not set # CONFIG_RFKILL_GPIO is not set # CONFIG_RH_KABI_SIZE_ALIGN_CHECKS is not set +# CONFIG_RH_KABI_STABLE_ASM_OFFSETS is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RMI4_CORE is not set # CONFIG_RMI4_F54 is not set diff --git a/SOURCES/kernel-rt-s390x-zfcpdump.config b/SOURCES/kernel-rt-s390x-zfcpdump.config index 3e61fd8..9135e31 100644 --- a/SOURCES/kernel-rt-s390x-zfcpdump.config +++ b/SOURCES/kernel-rt-s390x-zfcpdump.config @@ -1760,6 +1760,7 @@ # CONFIG_RFD_FTL is not set # CONFIG_RFKILL is not set # CONFIG_RFKILL_GPIO is not set +# CONFIG_RH_KABI_STABLE_ASM_OFFSETS is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RMI4_CORE is not set # CONFIG_RMI4_F54 is not set diff --git a/SOURCES/kernel-rt-s390x.config b/SOURCES/kernel-rt-s390x.config index 7708b72..8f8e46f 100644 --- a/SOURCES/kernel-rt-s390x.config +++ b/SOURCES/kernel-rt-s390x.config @@ -4348,6 +4348,7 @@ CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RH_KABI_SIZE_ALIGN_CHECKS=y +CONFIG_RH_KABI_STABLE_ASM_OFFSETS=y CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RMI4_2D_SENSOR=y CONFIG_RMI4_F03=y diff --git a/SOURCES/kernel-rt-x86_64-debug.config b/SOURCES/kernel-rt-x86_64-debug.config index 425abb1..f12a012 100644 --- a/SOURCES/kernel-rt-x86_64-debug.config +++ b/SOURCES/kernel-rt-x86_64-debug.config @@ -1442,6 +1442,7 @@ # CONFIG_RFD_FTL is not set # CONFIG_RFKILL_GPIO is not set # CONFIG_RH_KABI_SIZE_ALIGN_CHECKS is not set +# CONFIG_RH_KABI_STABLE_ASM_OFFSETS is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RMI4_F54 is not set # CONFIG_RMNET is not set diff --git a/SOURCES/kernel-rt-x86_64.config b/SOURCES/kernel-rt-x86_64.config index 4d064e6..d9f4382 100644 --- a/SOURCES/kernel-rt-x86_64.config +++ b/SOURCES/kernel-rt-x86_64.config @@ -4732,6 +4732,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=y CONFIG_RHEL_DIFFERENCES=y +CONFIG_RH_KABI_STABLE_ASM_OFFSETS=y CONFIG_RING_BUFFER=y CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RMI4_2D_SENSOR=y diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 45b0bb1..26fa719 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -38,10 +38,10 @@ # define buildid .local %define specversion 4.18.0 -%define pkgrelease 553.62.1.rt7.403.el8_10 +%define pkgrelease 553.63.1.rt7.404.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.62.1.rt7.403%{?dist} +%define specrelease 553.63.1.rt7.404%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -148,7 +148,7 @@ # The preempt RT patch level %global rttag .rt7 # realtimeN -%global rtbuild .403 +%global rtbuild .404 %define with_doc 0 %define with_headers 0 %define with_cross_headers 0 @@ -522,6 +522,11 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 +Source221: standalone-aarch64.c +Source222: standalone-ppc64le.c +Source223: standalone-s390x.c +Source224: standalone-x86_64.c + Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2 Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2 %endif @@ -1430,6 +1435,10 @@ BuildKernel() { else echo "**** NOTE: Cannot find reference Module.kabi file. ****" fi + + if [ -e $RPM_SOURCE_DIR/standalone-%{_target_cpu}$Flavour.c ]; then + gcc -I./include/ -c $RPM_SOURCE_DIR/standalone-%{_target_cpu}$Flavour.c + fi %endif %if %{with_kabidupchk} @@ -2699,6 +2708,18 @@ fi # # %changelog +* Thu Jul 17 2025 Denys Vlasenko [4.18.0-553.63.1.rt7.404.el8_10] +- [rt] build kernel-rt-4.18.0-553.63.1.rt7.404.el8_10 +- tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink(). (Guillaume Nault) [RHEL-66324] {CVE-2024-50154} +- net: ch9200: fix uninitialised access during mii_nway_restart (CKI Backport Bot) [RHEL-101200] {CVE-2025-38086} +- mm/swapfile: add cond_resched() in get_swap_pages() (Nico Pache) [RHEL-80401] {CVE-2023-52932} +- dlm: fix possible lkb_resource null dereference (Alexander Aring) [RHEL-64452] +- fs: dlm: handle -EINVAL as log_error() (Alexander Aring) [RHEL-64452] +- redhat/configs: enable CONFIG_RH_KABI_STABLE_ASM_OFFSETS (Čestmír Kalina) [RHEL-90099] +- kabi: freeze stablelist and stackprotector-related constants (Čestmír Kalina) [RHEL-90099] +- kabi: add redhat/kabi/asm-offsets (Čestmír Kalina) [RHEL-90099] +- kabi: add RH_KABI_ASSERT_EQ_CONST{,EXPR} (Čestmír Kalina) [RHEL-90099] + * Thu Jul 10 2025 Denys Vlasenko [4.18.0-553.62.1.rt7.403.el8_10] - [rt] build kernel-rt-4.18.0-553.62.1.rt7.403.el8_10 - s390/virtio_ccw: Don't allocate/assign airqs for non-existing queues (David Hildenbrand) [RHEL-87557]