From b9332797696de317158bd9a14ebe78230623ad1a Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Tue, 14 Oct 2025 09:02:18 +0800 Subject: [PATCH 1/2] [CVE]update to kernel-4.18.0-553.79.1 to #ID1P91 update to kernel-4.18.0-553.79.1 for CVE-2022-50228 CVE-2023-53305 Project: TC2024080204 Signed-off-by: Jacob Wang --- ...r-dwarves-causes-kernel-compilation-to-fail.patch | 11 ----------- download | 6 +++--- kernel.spec | 12 +++++------- 3 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 1000-repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch b/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch deleted file mode 100644 index 74f4020..0000000 --- a/1000-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 diff --git a/download b/download index c1232dc..2325c76 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -97849b1a9ac1541d5bb822eea827f454 kernel-abi-stablelists-4.18.0-553.tar.bz2 -dacb6c59855053065f7f64fcfb9aa828 kernel-kabi-dw-4.18.0-553.tar.bz2 -8cb77a851482c0760cbe00590f80e488 linux-4.18.0-553.78.1.el8_10.tar.xz +966919de6ad5490c082090f0b6649b3a kernel-abi-stablelists-4.18.0-553.tar.bz2 +607d4269d50cb377d94f3bcb7405fbd9 kernel-kabi-dw-4.18.0-553.tar.bz2 +99e58cdeecaf979e8551c6217f72cb20 linux-4.18.0-553.79.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index 4d0c536..dd6b4e9 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.78.1.el8_10 +%define pkgrelease 553.79.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.78.1%{anolis_release}%{?dist} +%define specrelease 553.79.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -550,7 +549,6 @@ Source4001: rpminspect.yaml # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch -Patch1000: 1000-repair-dwarves-causes-kernel-compilation-to-fail.patch # END OF PATCH DEFINITIONS @@ -1108,7 +1106,6 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL} cd linux-%{KVERREL} ApplyOptionalPatch linux-kernel-test.patch -%patch1000 -p0 -b .1000-repair-dwarves-causes-kernel-compilation-to-fail # END OF PATCH APPLICATIONS @@ -2708,8 +2705,9 @@ fi # # %changelog -* Fri Oct 10 2025 Xiaoping Liu - 4.18.0-553.78.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* Thu Oct 02 2025 Alexandra Hájková [4.18.0-553.79.1.el8_10] +- Bluetooth: L2CAP: Fix use-after-free (CKI Backport Bot) [RHEL-116277] {CVE-2023-53305} +- KVM: SVM: Don't BUG if userspace injects an interrupt with GIF=0 (CKI Backport Bot) [RHEL-109748] {CVE-2022-50228} * Thu Sep 25 2025 Denys Vlasenko [4.18.0-553.78.1.el8_10] - mm/migrate: set swap entry values of THP tail pages properly. (Luiz Capitulino) [RHEL-101302] -- Gitee From bae8f22c9d4f0883b6c616aa2fdfd91d3c59bf52 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 --- ...ir-dwarves-causes-kernel-compilation-to-fail.patch | 11 +++++++++++ kernel.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 1000-repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch b/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch new file mode 100644 index 0000000..74f4020 --- /dev/null +++ b/1000-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 diff --git a/kernel.spec b/kernel.spec index dd6b4e9..1912ce1 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.79.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.79.1%{?dist} +%define specrelease 553.79.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -549,6 +550,7 @@ Source4001: rpminspect.yaml # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch +Patch1000: 1000-repair-dwarves-causes-kernel-compilation-to-fail.patch # END OF PATCH DEFINITIONS @@ -1106,6 +1108,7 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL} cd linux-%{KVERREL} ApplyOptionalPatch linux-kernel-test.patch +%patch1000 -p0 -b .1000-repair-dwarves-causes-kernel-compilation-to-fail # END OF PATCH APPLICATIONS @@ -2705,6 +2708,9 @@ fi # # %changelog +* Tue Oct 14 2025 Xiaoping Liu - 4.18.0-553.79.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * Thu Oct 02 2025 Alexandra Hájková [4.18.0-553.79.1.el8_10] - Bluetooth: L2CAP: Fix use-after-free (CKI Backport Bot) [RHEL-116277] {CVE-2023-53305} - KVM: SVM: Don't BUG if userspace injects an interrupt with GIF=0 (CKI Backport Bot) [RHEL-109748] {CVE-2022-50228} -- Gitee