From af4b3eecc7341e21566fdab8497b936e24374c49 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Tue, 3 Jun 2025 14:25:13 +0800 Subject: [PATCH 1/2] [CVE]update to kernel-4.18.0-553.54.1 to #ICBD9H update to kernel-4.18.0-553.54.1 for CVE-2024-43842 Project: TC2024080204 Signed-off-by: Jacob Wang --- download | 4 ++-- kernel.spec | 13 ++++++------- ...-dwarves-causes-kernel-compilation-to-fail.patch | 11 ----------- 3 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/download b/download index fe22fdd..91f0d9b 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -0c1c44adb91e656a57e79ee305f4106e kernel-abi-stablelists-4.18.0-553.tar.bz2 +c621e2183d07ae5632a37aaecf9eaf6f kernel-abi-stablelists-4.18.0-553.tar.bz2 dacb6c59855053065f7f64fcfb9aa828 kernel-kabi-dw-4.18.0-553.tar.bz2 -10c0d729ef1598f958571d233b88bbcd linux-4.18.0-553.53.1.el8_10.tar.xz +5a4766ba157cdd7f10454d5de6988a63 linux-4.18.0-553.54.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index e9f1a67..889141d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,6 +1,5 @@ # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} -%define anolis_release .0.1 # At the time of this writing (2019-03), RHEL8 packages use w2.xzdio # compression for rpms (xz, level 2). @@ -39,10 +38,10 @@ # define buildid .local %define specversion 4.18.0 -%define pkgrelease 553.53.1.el8_10 +%define pkgrelease 553.54.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.53.1%{anolis_release}%{?dist} +%define specrelease 553.54.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -545,7 +544,6 @@ Source4001: rpminspect.yaml # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch -Patch1000: repair-dwarves-causes-kernel-compilation-to-fail.patch # END OF PATCH DEFINITIONS @@ -1103,7 +1101,6 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL} cd linux-%{KVERREL} ApplyOptionalPatch linux-kernel-test.patch -%patch1000 -p0 -b .repair-dwarves-causes-kernel-compilation-to-fail # END OF PATCH APPLICATIONS @@ -2699,8 +2696,10 @@ fi # # %changelog -* Thu May 22 2025 Xiaoping Liu - 4.18.0-553.53.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* Thu May 15 2025 Denys Vlasenko [4.18.0-553.54.1.el8_10] +- ice: fix stats being updated by way too large values (CKI Backport Bot) [RHEL-70834] +- wifi: rtw89: Fix array index mistake in rtw89_sta_info_get_iter() (CKI Backport Bot) [RHEL-54802] {CVE-2024-43842} +- sched/rt: Fix race in push_rt_task (Phil Auld) [RHEL-84963] * Fri May 09 2025 Denys Vlasenko [4.18.0-553.53.1.el8_10] - net/mlx5: Always stop health timer during driver removal (Michal Schmidt) [RHEL-47712] {CVE-2024-40906} diff --git a/repair-dwarves-causes-kernel-compilation-to-fail.patch b/repair-dwarves-causes-kernel-compilation-to-fail.patch deleted file mode 100644 index 74f4020..0000000 --- a/repair-dwarves-causes-kernel-compilation-to-fail.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2022-10-07 22:45:37.000000000 +0800 -+++ Makefile 2023-02-22 15:37:33.069118145 +0800 -@@ -378,7 +378,7 @@ - STRIP = $(CROSS_COMPILE)strip - OBJCOPY = $(CROSS_COMPILE)objcopy - OBJDUMP = $(CROSS_COMPILE)objdump --PAHOLE = pahole -+PAHOLE = pahole --skip_encoding_btf_enum64 - RESOLVE_BTFIDS = $(objtree)/tools/bpf/resolve_btfids/resolve_btfids - LEX = flex - YACC = bison -- Gitee From 1b25b12976645e4b49c2bd34fa01313e80bb196e Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Wed, 22 Feb 2023 15:53:19 +0800 Subject: [PATCH 2/2] kernel:repair dwarves causes kernel compilation to fail --- kernel.spec | 8 +++++++- ...ir-dwarves-causes-kernel-compilation-to-fail.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/kernel.spec b/kernel.spec index 889141d..0a1f2d4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,5 +1,6 @@ # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} +%define anolis_release .0.1 # At the time of this writing (2019-03), RHEL8 packages use w2.xzdio # compression for rpms (xz, level 2). @@ -41,7 +42,7 @@ %define pkgrelease 553.54.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.54.1%{?dist} +%define specrelease 553.54.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -544,6 +545,7 @@ Source4001: rpminspect.yaml # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch +Patch1000: repair-dwarves-causes-kernel-compilation-to-fail.patch # END OF PATCH DEFINITIONS @@ -1101,6 +1103,7 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL} cd linux-%{KVERREL} ApplyOptionalPatch linux-kernel-test.patch +%patch1000 -p0 -b .repair-dwarves-causes-kernel-compilation-to-fail # END OF PATCH APPLICATIONS @@ -2696,6 +2699,9 @@ fi # # %changelog +* Tue Jun 03 2025 Xiaoping Liu - 4.18.0-553.54.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * Thu May 15 2025 Denys Vlasenko [4.18.0-553.54.1.el8_10] - ice: fix stats being updated by way too large values (CKI Backport Bot) [RHEL-70834] - wifi: rtw89: Fix array index mistake in rtw89_sta_info_get_iter() (CKI Backport Bot) [RHEL-54802] {CVE-2024-43842} diff --git a/repair-dwarves-causes-kernel-compilation-to-fail.patch b/repair-dwarves-causes-kernel-compilation-to-fail.patch new file mode 100644 index 0000000..74f4020 --- /dev/null +++ b/repair-dwarves-causes-kernel-compilation-to-fail.patch @@ -0,0 +1,11 @@ +--- Makefile.orig 2022-10-07 22:45:37.000000000 +0800 ++++ Makefile 2023-02-22 15:37:33.069118145 +0800 +@@ -378,7 +378,7 @@ + STRIP = $(CROSS_COMPILE)strip + OBJCOPY = $(CROSS_COMPILE)objcopy + OBJDUMP = $(CROSS_COMPILE)objdump +-PAHOLE = pahole ++PAHOLE = pahole --skip_encoding_btf_enum64 + RESOLVE_BTFIDS = $(objtree)/tools/bpf/resolve_btfids/resolve_btfids + LEX = flex + YACC = bison -- Gitee