From 832871f7cc4fcb0fbe76c161e8dc2bd520028c53 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Wed, 1 Jul 2026 20:39:11 +0800 Subject: [PATCH 1/2] [CVE]update to kernel-4.18.0-553.139.1 to #ICMUM1 update to kernel-4.18.0-553.139.1 for CVE-2026-23216 CVE-2026-45984 CVE-2026-46189 Project: TC2024080204 Signed-off-by: Jacob Wang --- ...es-causes-kernel-compilation-to-fail.patch | 11 --------- download | 6 ++--- kernel.spec | 23 +++++++++++++------ 3 files changed, 19 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 a90f23e..b0ea56a 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -12546e11395f6c5050ec62fc6c1f2915 kernel-abi-stablelists-4.18.0-553.tar.bz2 -3ec9585e3478e61dc4006ececde4bd77 kernel-kabi-dw-4.18.0-553.tar.bz2 -3a62dd7575edb7e3091e6daff3b14aa8 linux-4.18.0-553.137.1.el8_10.tar.xz +0534f95428dc397dafae254011fbc6df kernel-abi-stablelists-4.18.0-553.tar.bz2 +e45f3819582e2134af7e4d133c1071d6 kernel-kabi-dw-4.18.0-553.tar.bz2 +92fa1772b6a77323e7b5f54def78390c linux-4.18.0-553.139.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index 183cf04..b8d1516 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.137.1.el8_10 +%define pkgrelease 553.139.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.137.1%{anolis_release}%{?dist} +%define specrelease 553.139.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 # Any further pre-build tree manipulations happen here. @@ -2707,8 +2704,20 @@ fi # # %changelog -* Wed Jun 24 2026 Xiaoping Liu - 4.18.0-553.137.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* Mon Jun 29 2026 CKI KWF Bot [4.18.0-553.139.1.el8_10] +- NFS: improve "Server wrote zero bytes" error (Olga Kornievskaia) [RHEL-147665] + +* Wed Jun 24 2026 CKI KWF Bot [4.18.0-553.138.1.el8_10] +- redhat: Temporary stop adding 'kernel' component to SBAT (Thomas Huth) [RHEL-182788] +- redhat: Switch to implicit enablement of CONFIG_EFI_SBAT_FILE (Thomas Huth) [RHEL-182788] +- redhat: Add SBAT information to Linux kernel (Thomas Huth) [RHEL-182788] +- x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths (Thomas Huth) [RHEL-182788] +- x86/efi: Implement support for embedding SBAT data for x86 (Thomas Huth) [RHEL-182788] +- redhat: Add Kconfig switch for embedding SBAT section (Thomas Huth) [RHEL-182788] +- gfs2: Fix use-after-free in iomap inline data write path (Andrew Price) [RHEL-179596] {CVE-2026-45984} +- gfs2: Add metapath_dibh helper (Andrew Price) [RHEL-179596] {CVE-2026-45984} +- RDMA/vmw_pvrdma: Fix double free on pvrdma_alloc_ucontext() error path (CKI Backport Bot) [RHEL-179963] {CVE-2026-46189} +- scsi: target: iscsi: Fix use-after-free in iscsit_dec_conn_usage_count() (CKI Backport Bot) [RHEL-165556] {CVE-2026-23216} * Fri Jun 19 2026 CKI KWF Bot [4.18.0-553.137.1.el8_10] - selinux: RHEL-only hotfix for execmem regression (Ondrej Mosnacek) [RHEL-179435] {CVE-2026-46054} -- Gitee From 60d83578f5d734374580c6f8e782ef12c5408a94 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 b8d1516..73e84b6 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.139.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.139.1%{?dist} +%define specrelease 553.139.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 # Any further pre-build tree manipulations happen here. @@ -2704,6 +2707,9 @@ fi # # %changelog +* Thu Jul 02 2026 Xiaoping Liu - 4.18.0-553.139.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * Mon Jun 29 2026 CKI KWF Bot [4.18.0-553.139.1.el8_10] - NFS: improve "Server wrote zero bytes" error (Olga Kornievskaia) [RHEL-147665] -- Gitee