From bd4732d7936a70e2a85257ee8edb41fd9e20d155 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 9 Jan 2025 11:43:37 +0800 Subject: [PATCH 1/2] [CVE]update to kernel-4.18.0-553.34.1 to #IBGLPM update to kernel-4.18.0-553.34.1 for CVE-2024-53088 CVE-2024-53122 Project: TC2024080204 Signed-off-by: Zhao Hang --- download | 4 ++-- kernel.spec | 23 +++++++++++++------ ...es-causes-kernel-compilation-to-fail.patch | 11 --------- 3 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/download b/download index 59600d8..71defd0 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -3b177bbe46d9eb465549cc79177b9ca8 kernel-abi-stablelists-4.18.0-553.tar.bz2 +c89daa6bd340684db954f2f03201f062 kernel-abi-stablelists-4.18.0-553.tar.bz2 559191ff3ea6f1f91b7d06563f479e39 kernel-kabi-dw-4.18.0-553.tar.bz2 -0d2554e5babb463fe7ad5b0ae7416b22 linux-4.18.0-553.32.1.el8_10.tar.xz +aaeb58a117db1a96068f2c351df15a21 linux-4.18.0-553.34.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index 729201e..944e8ef 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.32.1.el8_10 +%define pkgrelease 553.34.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.32.1%{anolis_release}%{?dist} +%define specrelease 553.34.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,20 @@ fi # # %changelog -* Fri Dec 13 2024 Xiaoping Liu - 4.18.0-553.32.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* Thu Dec 12 2024 Denys Vlasenko [4.18.0-553.34.1.el8_10] +- mptcp: cope racing subflow creation in mptcp_rcv_space_adjust (Davide Caratti) [RHEL-69667] {CVE-2024-53122} +- NFS: nfs_async_write_reschedule_io must not recurse into the writeback code (Benjamin Coddington) [RHEL-68647] +- xfs: fix sparse inode limits on runt AG (Pavel Reichl) [RHEL-62924] +- KVM: SVM: Get source vCPUs from source VM for SEV-ES intrahost migration (Maxim Levitsky) [RHEL-67974] +- x86/cpu/intel: Detect TME keyid bits before setting MTRR mask registers (Vitaly Kuznetsov) [RHEL-65362] +- dlm: fix recovery of middle conversions (Alexander Aring) [RHEL-64860] +- i40e: fix race condition by adding filter's intermediate sync state (Michal Schmidt) [RHEL-68271] {CVE-2024-53088} +- i40e: fix i40e_count_filters() to count only active/new filters (Michal Schmidt) [RHEL-68271] {CVE-2024-53088} + +* Fri Dec 06 2024 Denys Vlasenko [4.18.0-553.33.1.el8_10] +- Revert "scsi: lpfc: Fix mbuf pool resource detected as busy at driver unload" This patch is dependent on the mbox refactor patch that was not added to rh8. (Dick Kennedy) [RHEL-64073] +- drm/i915: Fix HPD polling, reenabling the output poll work as needed (Lyude Paul) [RHEL-62796] +- drm: Add an HPD poll helper to reschedule the poll work (Lyude Paul) [RHEL-62796] * Fri Nov 29 2024 Denys Vlasenko [4.18.0-553.32.1.el8_10] - irqchip/gic-v4: Correctly deal with set_affinity on lazily-mapped VPEs (Charles Mirabile) [RHEL-66965] {CVE-2024-50192} 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 c9a3628abd2d420fe6e7f4d7d8d242287bd28bc8 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 944e8ef..5a290d6 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.34.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.34.1%{?dist} +%define specrelease 553.34.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 Jan 09 2025 Xiaoping Liu - 4.18.0-553.34.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * Thu Dec 12 2024 Denys Vlasenko [4.18.0-553.34.1.el8_10] - mptcp: cope racing subflow creation in mptcp_rcv_space_adjust (Davide Caratti) [RHEL-69667] {CVE-2024-53122} - NFS: nfs_async_write_reschedule_io must not recurse into the writeback code (Benjamin Coddington) [RHEL-68647] 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