From 055ac6f7f8f89f2239f1802c861ce43d564c25f9 Mon Sep 17 00:00:00 2001 From: Zhao Hnag Date: Thu, 20 Mar 2025 09:44:50 +0800 Subject: [PATCH 1/2] [CVE]update to kernel-4.18.0-553.45.1 to #IBUTHQ update to kernel-4.18.0-553.45.1 for CVE-2023-52922 Project: TC2024080204 Signed-off-by: Zhao Hnag --- 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 e0ae3a8..548d74c 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -3f3111a750752f2b7a7ce25cf5ee109a kernel-abi-stablelists-4.18.0-553.tar.bz2 +3a832cb2e6cc1ecb07e88eb321b8aee7 kernel-abi-stablelists-4.18.0-553.tar.bz2 559191ff3ea6f1f91b7d06563f479e39 kernel-kabi-dw-4.18.0-553.tar.bz2 -c29a64dfd452b5da14f18d78c2f08e09 linux-4.18.0-553.44.1.el8_10.tar.xz +25260ca11cd298132f5ea8334f1cc71d linux-4.18.0-553.45.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index 875b878..aa6ccfa 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.44.1.el8_10 +%define pkgrelease 553.45.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.44.1%{anolis_release}%{?dist} +%define specrelease 553.45.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 -* Mon Mar 10 2025 Xiaoping Liu - 4.18.0-553.44.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* 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] +- gve: process XSK TX descriptors as part of RX NAPI (Joshua Washington) [RHEL-73269] +- gve: guard XSK operations on the existence of queues (Joshua Washington) [RHEL-73269] +- gve: guard XDP xmit NDO on existence of xdp queues (Joshua Washington) [RHEL-73269] +- gve: Fix an edge case for TSO skb validity check (Joshua Washington) [RHEL-73269] +- gve: Fix XDP TX completion handling when counters overflow (Joshua Washington) [RHEL-73269] +- gve: Clear napi->skb before dev_kfree_skb_any() (Joshua Washington) [RHEL-73269] {CVE-2024-40937} +- gve: ignore nonrelevant GSO type bits when processing TSO headers (Joshua Washington) [RHEL-73269] +- can: bcm: Fix UAF in bcm_proc_show() (CKI Backport Bot) [RHEL-80733] {CVE-2023-52922} +- gfs2: glock holder GL_NOPID fix (Andreas Gruenbacher) [RHEL-80694] +- gfs2: Decode missing glock flags in tracepoints (Andreas Gruenbacher) [RHEL-80694] +- net/smc: support ipv4 mapped ipv6 addr client for smc-r v2 (Mete Durlu) [RHEL-79810] +- net: smc: fix spurious error message from __sock_release() (Mete Durlu) [RHEL-79812] * Wed Mar 05 2025 Denys Vlasenko [4.18.0-553.44.1.el8_10] - HID: core: zero-initialize the report buffer (CKI Backport Bot) [RHEL-81825] {CVE-2024-50302} 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 f5e2ef3f4a244c0175f6846de7e1847106ba7448 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 aa6ccfa..b077d66 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.45.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.45.1%{?dist} +%define specrelease 553.45.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 20 2025 Xiaoping Liu - 4.18.0-553.45.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * 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] - gve: process XSK TX descriptors as part of RX NAPI (Joshua Washington) [RHEL-73269] 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