From 733660255d12c08e4bd297f244019f3f779d250d Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Thu, 27 Mar 2025 11:09:51 +0800 Subject: [PATCH 1/2] [CVE]update to kernel-4.18.0-553.46.1 to #IBWNBV update to kernel-4.18.0-553.46.1 for CVE-2025-21785 Project: TC2024080204 Signed-off-by: Jacob Wang --- download | 4 ++-- kernel.spec | 16 +++++++++------- ...arves-causes-kernel-compilation-to-fail.patch | 11 ----------- 3 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/download b/download index 548d74c..b18e6d6 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -3a832cb2e6cc1ecb07e88eb321b8aee7 kernel-abi-stablelists-4.18.0-553.tar.bz2 +31635da7a27932ecbffcbf1146017324 kernel-abi-stablelists-4.18.0-553.tar.bz2 559191ff3ea6f1f91b7d06563f479e39 kernel-kabi-dw-4.18.0-553.tar.bz2 -25260ca11cd298132f5ea8334f1cc71d linux-4.18.0-553.45.1.el8_10.tar.xz +69f6504c34c49047f58af485d1c60803 linux-4.18.0-553.46.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index b077d66..5415499 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.45.1.el8_10 +%define pkgrelease 553.46.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.45.1%{anolis_release}%{?dist} +%define specrelease 553.46.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,13 @@ fi # # %changelog -* Thu Mar 20 2025 Xiaoping Liu - 4.18.0-553.45.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* Thu Mar 13 2025 Denys Vlasenko [4.18.0-553.46.1.el8_10] +- s390/pci: Fix handling of isolated VFs (Mete Durlu) [RHEL-81934] +- s390/pci: Pull search for parent PF out of zpci_iov_setup_virtfn() (Mete Durlu) [RHEL-81934] +- s390/pci: Fix SR-IOV for PFs initially in standby (Mete Durlu) [RHEL-81934] +- x86/mm: Fix VDSO and VVAR placement on 5-level paging machines (Herton R. Krzesinski) [RHEL-62832] +- arm64: cacheinfo: Avoid out-of-bounds write to cacheinfo array (CKI Backport Bot) [RHEL-82720] {CVE-2025-21785} +- nouveau/fence: handle cross device fences properly (Dave Airlie) [RHEL-80085] * Thu Mar 06 2025 Denys Vlasenko [4.18.0-553.45.1.el8_10] - gve: trigger RX NAPI instead of TX NAPI in gve_xsk_wakeup (Joshua Washington) [RHEL-73269] 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 5990affac4fdfec1c34e6766a09854b8b66cdf5d 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 5415499..ef6a29a 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.46.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.46.1%{?dist} +%define specrelease 553.46.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 Mar 27 2025 Xiaoping Liu - 4.18.0-553.46.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * Thu Mar 13 2025 Denys Vlasenko [4.18.0-553.46.1.el8_10] - s390/pci: Fix handling of isolated VFs (Mete Durlu) [RHEL-81934] - s390/pci: Pull search for parent PF out of zpci_iov_setup_virtfn() (Mete Durlu) [RHEL-81934] 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