From eb8d1c5d55f41725b4b6976cecf549240c9aa57b Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 6 Feb 2025 10:19:43 +0800 Subject: [PATCH 1/2] [CVE]update to kernel-4.18.0-553.37.1 to #IBKB9U update to kernel-4.18.0-553.37.1 for CVE-2024-26935 CVE-2024-50275 Project: TC2024080204 Signed-off-by: Zhao Hang --- download | 4 ++-- kernel.spec | 15 ++++++++------- ...warves-causes-kernel-compilation-to-fail.patch | 11 ----------- 3 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/download b/download index a208285..2db14a0 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -d19da46bc44b636726f1d0561aa56d9e kernel-abi-stablelists-4.18.0-553.tar.bz2 +a59f79c83f87a2eeb4d3451e49eefd83 kernel-abi-stablelists-4.18.0-553.tar.bz2 559191ff3ea6f1f91b7d06563f479e39 kernel-kabi-dw-4.18.0-553.tar.bz2 -67a9425fb71c483023ea282f70a198e7 linux-4.18.0-553.36.1.el8_10.tar.xz +ba7be3c38fca1758f0d9a843ca7e880b linux-4.18.0-553.37.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index 23dec08..c06c5e6 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.36.1.el8_10 +%define pkgrelease 553.37.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.36.1%{anolis_release}%{?dist} +%define specrelease 553.37.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,12 @@ fi # # %changelog -* Wed Jan 22 2025 Xiaoping Liu - 4.18.0-553.36.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* Fri Jan 17 2025 Denys Vlasenko [4.18.0-553.37.1.el8_10] +- arm64/sve: Discard stale CPU state when handling SVE traps (Mark Salter) [RHEL-71535] {CVE-2024-50275} +- scsi: core: Handle devices which return an unusually large VPD page count (Ewan D. Milne) [RHEL-34275] +- scsi: core: Fix unremoved procfs host directory regression (Ewan D. Milne) [RHEL-34275] +- scsi: core: Consult supported VPD page list prior to fetching page (Ewan D. Milne) [RHEL-34275] +- NFSv4: Fix dropped lock for racing OPEN and delegation return (Benjamin Coddington) [RHEL-73889] * Thu Jan 09 2025 Denys Vlasenko [4.18.0-553.36.1.el8_10] - cpufreq: intel_pstate: Support Emerald Rapids OOB mode (David Arcari) [RHEL-59649] 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 b0a2d57e6d5caf8dca4722d1d438e8773fdb61b3 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 c06c5e6..c268183 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.37.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.37.1%{?dist} +%define specrelease 553.37.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 +* Thu Feb 06 2025 Xiaoping Liu - 4.18.0-553.37.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * Fri Jan 17 2025 Denys Vlasenko [4.18.0-553.37.1.el8_10] - arm64/sve: Discard stale CPU state when handling SVE traps (Mark Salter) [RHEL-71535] {CVE-2024-50275} - scsi: core: Handle devices which return an unusually large VPD page count (Ewan D. Milne) [RHEL-34275] 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