From 27b1061f2df678e93f5ee727cabfb24b28dfd293 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Wed, 12 Feb 2025 09:43:04 +0800 Subject: [PATCH 1/2] [CVE]update to kernel-4.18.0-553.40.1 to #IBLOFA update to kernel-4.18.0-553.40.1 for CVE-2024-53104 Project: TC2024080204 Signed-off-by: Zhao Hang --- download | 4 +-- kernel.spec | 25 +++++++++++++------ ...es-causes-kernel-compilation-to-fail.patch | 11 -------- 3 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/download b/download index 2db14a0..aeeda25 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -a59f79c83f87a2eeb4d3451e49eefd83 kernel-abi-stablelists-4.18.0-553.tar.bz2 +1ee195930cbe85466027fa94891d89c6 kernel-abi-stablelists-4.18.0-553.tar.bz2 559191ff3ea6f1f91b7d06563f479e39 kernel-kabi-dw-4.18.0-553.tar.bz2 -ba7be3c38fca1758f0d9a843ca7e880b linux-4.18.0-553.37.1.el8_10.tar.xz +c6bc78ab71b1ae8a79147dfda9ad4c57 linux-4.18.0-553.40.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index c268183..ba1e32f 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.37.1.el8_10 +%define pkgrelease 553.40.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.37.1%{anolis_release}%{?dist} +%define specrelease 553.40.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,22 @@ fi # # %changelog -* Thu Feb 06 2025 Xiaoping Liu - 4.18.0-553.37.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* Thu Feb 06 2025 Denys Vlasenko [4.18.0-553.40.1.el8_10] +- media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format (Desnes Nunes) [RHEL-69571] {CVE-2024-53104} + +* Fri Jan 31 2025 Denys Vlasenko [4.18.0-553.39.1.el8_10] +- gfs2: Truncate address space when flipping GFS2_DIF_JDATA flag (Andreas Gruenbacher) [RHEL-73915] + +* Thu Jan 23 2025 Denys Vlasenko [4.18.0-553.38.1.el8_10] +- net: usb: lan78xx: add Allied Telesis AT29M2-AF (Jose Ignacio Tornos Martinez) [RHEL-70891] +- s390/pci: Allow allocation of more than 1 MSI interrupt (Mete Durlu) [RHEL-74385] +- s390/pci: Refactor arch_setup_msi_irqs() (Mete Durlu) [RHEL-74385] +- s390/pci: Fix leak of struct zpci_dev when zpci_add_device() fails (Mete Durlu) [RHEL-71451] +- s390/pci: Ignore RID for isolated VFs (Mete Durlu) [RHEL-71451] +- s390/pci: Use topology ID for multi-function devices (Mete Durlu) [RHEL-71451] +- s390/pci: Sort PCI functions prior to creating virtual busses (Mete Durlu) [RHEL-71451] +- s390/iucv: MSG_PEEK causes memory leak in iucv_sock_destruct() (Mete Durlu) [RHEL-74387] +- s390/pci: Handle PCI error codes other than 0x3a (Mete Durlu) [RHEL-74383] * 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} 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 df3014f74ce848b3b5bb55c11a97a9a2e4785942 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 ba1e32f..2439565 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.40.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.40.1%{?dist} +%define specrelease 553.40.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 +* Wed Feb 12 2025 Xiaoping Liu - 4.18.0-553.40.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * Thu Feb 06 2025 Denys Vlasenko [4.18.0-553.40.1.el8_10] - media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format (Desnes Nunes) [RHEL-69571] {CVE-2024-53104} 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