From f4d8c2ab3bc4f7f078c0b41146a32d9d25122594 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Sat, 3 Jun 2023 17:32:21 +0800 Subject: [PATCH 1/2] update to kernel-4.18.0-477.13.1.el8_8 Signed-off-by: anolis-bot --- download | 6 +-- kernel-aarch64-debug.config | 1 + kernel-aarch64.config | 1 + kernel-ppc64le-debug.config | 8 +-- kernel-ppc64le.config | 4 +- kernel-s390x-debug.config | 1 + kernel-s390x-zfcpdump.config | 3 +- kernel-s390x.config | 1 + kernel-x86_64-debug.config | 1 + kernel-x86_64.config | 1 + kernel.spec | 52 ++++++++++++++++--- ...es-causes-kernel-compilation-to-fail.patch | 11 ---- 12 files changed, 64 insertions(+), 26 deletions(-) delete mode 100644 repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/download b/download index cb4c852..b0a77f5 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -fa77f0c212e46dfe176af5a12fa20175 kernel-abi-stablelists-4.18.0-477.tar.bz2 -c64f473f415364538a34873be76a8d4d kernel-kabi-dw-4.18.0-477.tar.bz2 -a644f9c50188ad2273a305191c7518b8 linux-4.18.0-477.10.1.el8_8.tar.xz +468e6b0d8b0f16fa4d05f28d1f0c5083 kernel-abi-stablelists-4.18.0-477.tar.bz2 +cf125c67c37d90e77505c37a66bed0ec kernel-kabi-dw-4.18.0-477.tar.bz2 +64c46169f6afc2f2fd091f3b2cbb1a96 linux-4.18.0-477.13.1.el8_8.tar.xz diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index b8ea9fc..b46f57f 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -397,6 +397,7 @@ # CONFIG_DA311 is not set # CONFIG_DDR is not set # CONFIG_DEBUG_ALIGN_RODATA is not set +# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_DEBUG_DRIVER is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 5ce2575..18975c9 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -410,6 +410,7 @@ # CONFIG_DDR is not set # CONFIG_DEBUG_ALIGN_RODATA is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 25fcfeb..135c12b 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -822,7 +822,9 @@ # CONFIG_JME is not set # CONFIG_JSA1212 is not set # CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG is not set +# CONFIG_KASAN is not set # CONFIG_KASAN_EXTRA is not set +# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN_OUTLINE is not set # CONFIG_KCOV is not set # CONFIG_KCSAN is not set @@ -1375,6 +1377,7 @@ # CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set # CONFIG_PPC_MEMTRACE is not set # CONFIG_PPC_PTDUMP is not set +# CONFIG_PPC_QUEUED_SPINLOCKS is not set # CONFIG_PPS_CLIENT_KTIMER is not set # CONFIG_PPS_DEBUG is not set # CONFIG_PREEMPT is not set @@ -2186,7 +2189,6 @@ # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set # CONFIG_ZX_TDM is not set -# PPC_QUEUED_SPINLOCKS is not set CONFIG_64BIT=y CONFIG_6LOWPAN=m CONFIG_8139CP=m @@ -2645,6 +2647,7 @@ CONFIG_DAVICOM_PHY=m CONFIG_DCB=y CONFIG_DEBUGGER=y CONFIG_DEBUG_ATOMIC_SLEEP=y +CONFIG_DEBUG_BLK_CGROUP=y CONFIG_DEBUG_CREDENTIALS=y CONFIG_DEBUG_FS=y CONFIG_DEBUG_INFO=y @@ -2696,6 +2699,7 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEV_DAX=m CONFIG_DEV_DAX_PMEM=m CONFIG_DEV_DAX_PMEM_COMPAT=m +CONFIG_DEV_PAGEMAP_OPS=y CONFIG_DE_AOC=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 @@ -3482,8 +3486,6 @@ CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_KARMA_PARTITION=y -CONFIG_KASAN=y -CONFIG_KASAN_INLINE=y CONFIG_KASAN_VMALLOC=y CONFIG_KDB_CONTINUE_CATASTROPHIC=0 CONFIG_KDB_DEFAULT_ENABLE=0x0 diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index a9a7d18..2e51473 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -340,6 +340,7 @@ # CONFIG_DA311 is not set # CONFIG_DDR is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_DEBUG_DEVRES is not set @@ -1440,6 +1441,7 @@ # CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set # CONFIG_PPC_MEMTRACE is not set # CONFIG_PPC_PTDUMP is not set +# CONFIG_PPC_QUEUED_SPINLOCKS is not set # CONFIG_PPS_CLIENT_KTIMER is not set # CONFIG_PPS_DEBUG is not set # CONFIG_PREEMPT is not set @@ -2263,7 +2265,6 @@ # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set # CONFIG_ZX_TDM is not set -# PPC_QUEUED_SPINLOCKS is not set CONFIG_64BIT=y CONFIG_6LOWPAN=m CONFIG_8139CP=m @@ -2731,6 +2732,7 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEV_DAX=m CONFIG_DEV_DAX_PMEM=m CONFIG_DEV_DAX_PMEM_COMPAT=m +CONFIG_DEV_PAGEMAP_OPS=y CONFIG_DE_AOC=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index cf409bf..d7fedd1 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2777,6 +2777,7 @@ CONFIG_DASD_PROFILE=y CONFIG_DCB=y CONFIG_DCSSBLK=m CONFIG_DEBUG_ATOMIC_SLEEP=y +CONFIG_DEBUG_BLK_CGROUP=y CONFIG_DEBUG_CREDENTIALS=y CONFIG_DEBUG_FS=y CONFIG_DEBUG_INFO=y diff --git a/kernel-s390x-zfcpdump.config b/kernel-s390x-zfcpdump.config index 909662d..9eec20e 100644 --- a/kernel-s390x-zfcpdump.config +++ b/kernel-s390x-zfcpdump.config @@ -395,6 +395,7 @@ # CONFIG_DCSSBLK is not set # CONFIG_DDR is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_DEBUG_DEVRES is not set @@ -2484,6 +2485,7 @@ # CONFIG_V4L_TEST_DRIVERS is not set # CONFIG_VCNL4000 is not set # CONFIG_VDPA is not set +# CONFIG_VDPA_SIM is not set # CONFIG_VEML6070 is not set # CONFIG_VFAT_FS is not set # CONFIG_VFIO_NOIOMMU is not set @@ -5170,7 +5172,6 @@ CONFIG_USER_NS=y CONFIG_UTS_NS=y CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m -CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM_NET=m CONFIG_VETH=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 5635a5d..f290d9b 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -350,6 +350,7 @@ # CONFIG_DAVICOM_PHY is not set # CONFIG_DDR is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 460264f..a30c257 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2720,6 +2720,7 @@ CONFIG_DCA=m CONFIG_DCB=y CONFIG_DCDBAS=m CONFIG_DEBUG_ATOMIC_SLEEP=y +CONFIG_DEBUG_BLK_CGROUP=y CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_DEBUG_CREDENTIALS=y CONFIG_DEBUG_FS=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index b070b36..2fdad59 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -343,6 +343,7 @@ # CONFIG_DA311 is not set # CONFIG_DDR is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_DEBUG_DEVRES is not set diff --git a/kernel.spec b/kernel.spec index f2482d2..3dfd11a 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 rpmversion 4.18.0 -%define pkgrelease 477.10.1.el8_8 +%define pkgrelease 477.13.1.el8_8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 477.10.1%{anolis_release}%{?dist} +%define specrelease 477.13.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -542,7 +541,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 @@ -1096,7 +1094,6 @@ mv linux-%{rpmversion}-%{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 @@ -2702,8 +2699,49 @@ fi # # %changelog -* Wed May 17 2023 Xiaoping Liu - 4.18.0-477.10.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* Thu May 18 2023 Lucas Zampieri [4.18.0-477.13.1.el8_8] +- netfilter: nf_tables: deactivate anonymous set from preparation phase (Florian Westphal) [2196147 2196146] {CVE-2023-32233} + +* Wed May 17 2023 Lucas Zampieri [4.18.0-477.12.1.el8_8] +- redhat/configs: Fix incorrect configs location and content (Vladis Dronov) +- wifi: iwlwifi: mvm: protect TXQ list manipulation (Jose Ignacio Tornos Martinez) [2183471 2152168] +- wifi: iwlwifi: mvm: fix mvmtxq->stopped handling (Jose Ignacio Tornos Martinez) [2183471 2152168] +- migrate: grab the compound head in migration_entry_wait_on_locked (Nico Pache) [2189629 2188249] +- redhat/configs: Fix DEBUG_BLK_CGROUP and BFQ_CGROUP_DEBUG configs (Vladis Dronov) +- redhat: switch release to zstream (Lucas Zampieri) + +* Tue May 09 2023 Lucas Zampieri [4.18.0-477.11.1.el8_8] +- crypto: drbg - Only fail when jent is unavailable in FIPS mode (Vladis Dronov) [2181730 2175712] +- crypto: jitter - permanent and intermittent health errors (Vladis Dronov) [2181730 2175712] +- crypto: jitter - quit sample collection loop upon RCT failure (Vladis Dronov) [2181730 2175712] +- crypto: jitter - don't limit ->health_failure check to FIPS mode (Vladis Dronov) [2181730 2175712] +- crypto: jitter - drop kernel-doc notation (Vladis Dronov) [2181730 2175712] +- qede: avoid uninitialized entries in coal_entry array (Michal Schmidt) [2176104 2160054] +- qede: fix interrupt coalescing configuration (Jonathan Toppins) [2176104 2160054] +- crypto: qat - add support for 402xx devices (Vladis Dronov) [2176850 2144529] +- crypto: qat - drop log level of msg in get_instance_node() (Vladis Dronov) [2176850 2144529] +- crypto: qat - fix out-of-bounds read (Vladis Dronov) [2176850 2144529] +- Documentation: qat: change kernel version (Vladis Dronov) [2176850 2144529] +- crypto: qat - add qat_zlib_deflate (Vladis Dronov) [2176850 2144529] +- crypto: qat - extend buffer list logic interface (Vladis Dronov) [2176850 2144529] +- crypto: qat - fix spelling mistakes from 'bufer' to 'buffer' (Vladis Dronov) [2176850 2144529] +- crypto: qat - add resubmit logic for decompression (Vladis Dronov) [2176850 2144529] +- crypto: acomp - define max size for destination (Vladis Dronov) [2176850 2144529] +- crypto: qat - enable deflate for QAT GEN4 (Vladis Dronov) [2176850 2144529] +- crypto: qat - expose deflate through acomp api for QAT GEN2 (Vladis Dronov) [2176850 2144529] +- crypto: qat - rename and relocate GEN2 config function (Vladis Dronov) [2176850 2144529] +- crypto: qat - relocate qat_algs_alloc_flags() (Vladis Dronov) [2176850 2144529] +- crypto: qat - relocate backlog related structures (Vladis Dronov) [2176850 2144529] +- crypto: qat - extend buffer list interface (Vladis Dronov) [2176850 2144529] +- crypto: qat - generalize crypto request buffers (Vladis Dronov) [2176850 2144529] +- crypto: qat - change bufferlist logic interface (Vladis Dronov) [2176850 2144529] +- crypto: qat - rename bufferlist functions (Vladis Dronov) [2176850 2144529] +- crypto: qat - relocate bufferlist logic (Vladis Dronov) [2176850 2144529] +- crypto: qat - Use helper to set reqsize (Vladis Dronov) [2176850 2144529] +- crypto: kpp - Add helper to set reqsize (Vladis Dronov) [2176850 2144529] +- crypto: qat - fix error return code in adf_probe (Vladis Dronov) [2176850 2144529] +- crypto: qat - remove ADF_STATUS_PF_RUNNING flag from probe (Vladis Dronov) [2176850 2144529] +- sched/core: Fix arch_scale_freq_tick() on tickless systems (Phil Auld) [2188067 2184083] * Wed Apr 05 2023 Lucas Zampieri [4.18.0-477.10.1.el8_8] - dm: fix __send_duplicate_bios() to always allow for splitting IO (Benjamin Marzinski) [2184429] 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 78fa0e690b9b680098fc0e61caf6a0efe5212865 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 3dfd11a..cb2280b 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 477.13.1.el8_8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 477.13.1%{?dist} +%define specrelease 477.13.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -541,6 +542,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 @@ -1094,6 +1096,7 @@ mv linux-%{rpmversion}-%{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,6 +2702,9 @@ fi # # %changelog +* Mon Jun 05 2023 Xiaoping Liu - 4.18.0-477.13.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * Thu May 18 2023 Lucas Zampieri [4.18.0-477.13.1.el8_8] - netfilter: nf_tables: deactivate anonymous set from preparation phase (Florian Westphal) [2196147 2196146] {CVE-2023-32233} 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