From 35a5e67d4485bcf42b9759632c88df1ef1890aa3 Mon Sep 17 00:00:00 2001 From: Julio Faracco Date: Tue, 29 Apr 2025 18:16:57 -0300 Subject: [PATCH] kernel-6.12.0-79.el10 * Tue Apr 29 2025 Julio Faracco [6.12.0-79.el10] - redhat: find-debuginfo workaround is no longer needed on F42 (Jan Stancek) [RHEL-85401] - redhat/kernel.spec: use target versions of tools for debugedit and gdb-add-index (Jan Stancek) [RHEL-85401] - thermal: intel: int340x: Fix Panther Lake DLVR support (Steve Best) [RHEL-88233] - redhat/configs: Adjust CONFIG_TUNE for s390x (Mete Durlu) [RHEL-86680] - ASoC: soc-pcm: don't use soc_pcm_ret() on .prepare callback (CKI Backport Bot) [RHEL-82520] {CVE-2024-58077} - redhat: remove kernel-ipaclones-internal package (Joe Lawrence) [RHEL-86517] - keys: Fix UAF in key_put() (CKI Backport Bot) [RHEL-86852] {CVE-2025-21893} - efi/libstub: Bump up EFI_MMAP_NR_SLACK_SLOTS to 32 (Marcin Juszkiewicz) [RHEL-83074] - mm/kasan: Convert symbol namespace to string literal [cont.] (Julio Faracco) Resolves: RHEL-82520, RHEL-83074, RHEL-85401, RHEL-86517, RHEL-86680, RHEL-86852, RHEL-88233 Signed-off-by: Julio Faracco --- Makefile.rhelver | 2 +- kernel-s390x-debug-rhel.config | 4 +- kernel-s390x-rhel.config | 4 +- kernel-s390x-zfcpdump-rhel.config | 4 +- kernel.changelog | 12 ++++ kernel.spec | 105 +++++++++--------------------- sources | 6 +- 7 files changed, 53 insertions(+), 84 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 17973664b..1e0a29428 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 78 +RHEL_RELEASE = 79 # # RHEL_REBASE_NUM diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 1bb23cc9e..5ed4828ce 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -6874,8 +6874,8 @@ CONFIG_TTY=y # CONFIG_TUNE_Z10 is not set # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set -CONFIG_TUNE_Z15=y -# CONFIG_TUNE_Z16 is not set +# CONFIG_TUNE_Z15 is not set +CONFIG_TUNE_Z16=y # CONFIG_TUNE_Z196 is not set # CONFIG_TUNE_Z900 is not set # CONFIG_TUNE_Z9_109 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 1ee803515..28ce8a0a3 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -6851,8 +6851,8 @@ CONFIG_TTY=y # CONFIG_TUNE_Z10 is not set # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set -CONFIG_TUNE_Z15=y -# CONFIG_TUNE_Z16 is not set +# CONFIG_TUNE_Z15 is not set +CONFIG_TUNE_Z16=y # CONFIG_TUNE_Z196 is not set # CONFIG_TUNE_Z900 is not set # CONFIG_TUNE_Z9_109 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 109e7d61b..8af4fe13e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6873,8 +6873,8 @@ CONFIG_TTY=y # CONFIG_TUNE_Z10 is not set # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set -CONFIG_TUNE_Z15=y -# CONFIG_TUNE_Z16 is not set +# CONFIG_TUNE_Z15 is not set +CONFIG_TUNE_Z16=y # CONFIG_TUNE_Z196 is not set # CONFIG_TUNE_Z900 is not set # CONFIG_TUNE_Z9_109 is not set diff --git a/kernel.changelog b/kernel.changelog index 0541df8eb..ba11f3f31 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,15 @@ +* Tue Apr 29 2025 Julio Faracco [6.12.0-79.el10] +- redhat: find-debuginfo workaround is no longer needed on F42 (Jan Stancek) [RHEL-85401] +- redhat/kernel.spec: use target versions of tools for debugedit and gdb-add-index (Jan Stancek) [RHEL-85401] +- thermal: intel: int340x: Fix Panther Lake DLVR support (Steve Best) [RHEL-88233] +- redhat/configs: Adjust CONFIG_TUNE for s390x (Mete Durlu) [RHEL-86680] +- ASoC: soc-pcm: don't use soc_pcm_ret() on .prepare callback (CKI Backport Bot) [RHEL-82520] {CVE-2024-58077} +- redhat: remove kernel-ipaclones-internal package (Joe Lawrence) [RHEL-86517] +- keys: Fix UAF in key_put() (CKI Backport Bot) [RHEL-86852] {CVE-2025-21893} +- efi/libstub: Bump up EFI_MMAP_NR_SLACK_SLOTS to 32 (Marcin Juszkiewicz) [RHEL-83074] +- mm/kasan: Convert symbol namespace to string literal [cont.] (Julio Faracco) +Resolves: RHEL-82520, RHEL-83074, RHEL-85401, RHEL-86517, RHEL-86680, RHEL-86852, RHEL-88233 + * Mon Apr 28 2025 Julio Faracco [6.12.0-78.el10] - redhat: Remove kernel-rt-kvm package (Juri Lelli) [RHEL-62687] - nfsd: clear acl_access/acl_default after releasing them (Olga Kornievskaia) [RHEL-81534] {CVE-2025-21796} diff --git a/kernel.spec b/kernel.spec index beaace783..5ae677119 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,15 +162,15 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 78 +%define pkgrelease 79 %define kversion 6 -%define tarfile_release 6.12.0-78.el10 +%define tarfile_release 6.12.0-79.el10 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 78%{?buildid}%{?dist} +%define specrelease 79%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.12.0-78.el10 +%define kabiversion 6.12.0-79.el10 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -286,10 +286,6 @@ Summary: The Linux kernel # gcov support %define with_gcov %{?_with_gcov:1}%{?!_with_gcov:0} -# -# ipa_clone support -%define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1} - # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -303,8 +299,6 @@ Summary: The Linux kernel # Kernel headers are being split out into a separate package %define with_headers 0 %define with_cross_headers 0 -# no ipa_clone for now -%define with_ipaclones 0 # no stablelist %define with_kernel_abi_stablelists 0 %define with_arm64_64k 0 @@ -331,8 +325,6 @@ Summary: The Linux kernel %global clang_make_opts %{clang_make_opts} LLVM=1 %endif %global make_opts %{make_opts} %{clang_make_opts} -# clang does not support the -fdump-ipa-clones option -%global with_ipaclones 0 %endif # turn off debug kernel and kabichk for gcov builds @@ -350,16 +342,6 @@ Summary: The Linux kernel %define with_kabidwchk 0 %endif -# kpatch_kcflags are extra compiler flags applied to base kernel -# -fdump-ipa-clones is enabled only for base kernels on selected arches -%if %{with_ipaclones} -%ifarch x86_64 ppc64le -%define kpatch_kcflags -fdump-ipa-clones -%else -%define with_ipaclones 0 -%endif -%endif - %define make_target bzImage %define image_install_path boot @@ -398,7 +380,6 @@ Summary: The Linux kernel %define with_tools 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_ipaclones 0 %endif # if requested, only build debug kernel @@ -410,7 +391,6 @@ Summary: The Linux kernel %define with_tools 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_ipaclones 0 %endif # if requested, only build realtime kernel @@ -427,7 +407,6 @@ Summary: The Linux kernel %define with_tools 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_ipaclones 0 %define with_headers 0 %define with_efiuki 0 %define with_zfcpdump 0 @@ -473,7 +452,6 @@ Summary: The Linux kernel %define with_kabichk 0 %define with_kernel_abi_stablelists 0 %define with_kabidw_base 0 -%define with_ipaclones 0 %endif @@ -837,13 +815,16 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu %define cross_opts CROSS_COMPILE=%{_build_arch}-linux-gnu- %define __strip %{_build_arch}-linux-gnu-strip +%if 0%{?fedora} && 0%{?fedora} <= 41 # Work around find-debuginfo for cross builds. # find-debuginfo doesn't support any of CROSS options (RHEL-21797), # and since debugedit > 5.0-16.el10, or since commit # dfe1f7ff30f4 ("find-debuginfo.sh: Exit with real exit status in parallel jobs") -# it now aborts and build fails. +# it now aborts on failure and build fails. +# debugedit-5.1-5 in F42 added support to override tools with target versions. %undefine _include_gdb_index %endif +%endif # These below are required to build man pages %if %{with_perf} @@ -1458,18 +1439,6 @@ Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{release}\ This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\ %{nil} -# -# kernel--ipaclones-internal package -# -%define kernel_ipaclones_package() \ -%package %{?1:%{1}-}ipaclones-internal\ -Summary: *.ipa-clones files generated by -fdump-ipa-clones for kernel%{?1:-%{1}}\ -Group: System Environment/Kernel\ -AutoReqProv: no\ -%description %{?1:%{1}-}ipaclones-internal\ -This package provides *.ipa-clones files.\ -%{nil} - # # This macro creates a kernel--modules-internal package. # %%kernel_modules_internal_package @@ -1850,10 +1819,6 @@ Prebuilt 64k unified kernel image for virtual machines. Prebuilt 64k unified kernel image addons for virtual machines. %endif -%if %{with_ipaclones} -%kernel_ipaclones_package -%endif - %define log_msg() \ { set +x; } 2>/dev/null \ _log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec | grep log_msg | cut -d":" -f1) \ @@ -2193,12 +2158,6 @@ InitBuildVars() { %{log_msg "InitBuildVars: USING ARCH=$Arch"} KCFLAGS="%{?kcflags}" - - # add kpatch flags for base kernel - %{log_msg "InitBuildVars: Configure KCFLAGS"} - if [ "$Variant" == "" ]; then - KCFLAGS="$KCFLAGS %{?kpatch_kcflags}" - fi } #Build bootstrap bpftool @@ -2978,18 +2937,6 @@ BuildKernel() { fi %endif -%if %{with_ipaclones} - %{log_msg "install IPA clones"} - MAXPROCS=$(echo %{?_smp_mflags} | sed -n 's/-j\s*\([0-9]\+\)/\1/p') - if [ -z "$MAXPROCS" ]; then - MAXPROCS=1 - fi - if [ "$Variant" == "" ]; then - mkdir -p $RPM_BUILD_ROOT/$DevelDir-ipaclones - find . -name '*.ipa-clones' | xargs -i{} -r -n 1 -P $MAXPROCS install -m 644 -D "{}" "$RPM_BUILD_ROOT/$DevelDir-ipaclones/{}" - fi -%endif - %if %{with_gcov} popd %endif @@ -3346,12 +3293,24 @@ find Documentation -type d | xargs chmod u+w rm -rf $RPM_BUILD_ROOT/usr/lib/debug/usr/src; \ %{nil} +# Make debugedit and gdb-add-index use target versions of tools +# when cross-compiling. This is supported since debugedit-5.1-5.fc42 +# https://inbox.sourceware.org/debugedit/20250220153858.963312-1-mark@klomp.org/ +%if %{with_cross} +%define __override_target_tools_for_debugedit \ + export OBJCOPY=%{_build_arch}-linux-gnu-objcopy \ + export NM=%{_build_arch}-linux-gnu-nm \ + export READELF=%{_build_arch}-linux-gnu-readelf \ +%{nil} +%endif + # # Disgusting hack alert! We need to ensure we sign modules *after* all # invocations of strip occur, which is in __debug_install_post if # find-debuginfo.sh runs, and __os_install_post if not. # %define __spec_install_post \ + %{?__override_target_tools_for_debugedit:%{__override_target_tools_for_debugedit}}\ %{?__debug_package:%{__debug_install_post}}\ %{__arch_install_post}\ %{__os_install_post}\ @@ -4266,24 +4225,22 @@ fi\ %kernel_variant_files %{_use_vdso} %{with_debug} rt-64k-debug %endif -%define kernel_variant_ipaclones(k:) \ -%if %{1}\ -%if %{with_ipaclones}\ -%{expand:%%files %{?2:%{2}-}ipaclones-internal}\ -%defattr(-,root,root)\ -%defverify(not mtime)\ -/usr/src/kernels/%{KVERREL}%{?2:+%{2}}-ipaclones\ -%endif\ -%endif\ -%{nil} - -%kernel_variant_ipaclones %{with_up_base} - # plz don't put in a version string unless you're going to tag # and build. # # %changelog +* Tue Apr 29 2025 Julio Faracco [6.12.0-79.el10] +- redhat: find-debuginfo workaround is no longer needed on F42 (Jan Stancek) [RHEL-85401] +- redhat/kernel.spec: use target versions of tools for debugedit and gdb-add-index (Jan Stancek) [RHEL-85401] +- thermal: intel: int340x: Fix Panther Lake DLVR support (Steve Best) [RHEL-88233] +- redhat/configs: Adjust CONFIG_TUNE for s390x (Mete Durlu) [RHEL-86680] +- ASoC: soc-pcm: don't use soc_pcm_ret() on .prepare callback (CKI Backport Bot) [RHEL-82520] {CVE-2024-58077} +- redhat: remove kernel-ipaclones-internal package (Joe Lawrence) [RHEL-86517] +- keys: Fix UAF in key_put() (CKI Backport Bot) [RHEL-86852] {CVE-2025-21893} +- efi/libstub: Bump up EFI_MMAP_NR_SLACK_SLOTS to 32 (Marcin Juszkiewicz) [RHEL-83074] +- mm/kasan: Convert symbol namespace to string literal [cont.] (Julio Faracco) + * Mon Apr 28 2025 Julio Faracco [6.12.0-78.el10] - redhat: Remove kernel-rt-kvm package (Juri Lelli) [RHEL-62687] - nfsd: clear acl_access/acl_default after releasing them (Olga Kornievskaia) [RHEL-81534] {CVE-2025-21796} diff --git a/sources b/sources index 866fab883..abc64702e 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.12.0-78.el10.tar.xz) = 7a10e6e2d17c83cc9c02fb75d4d082dea4bcbb66c08fac7f18a5a1d8b314f8fbfaf2ffbfa08da8f6aaa913e7b94723db52b7429bc303ca432f8b7ccae95ee0c1 -SHA512 (kernel-abi-stablelists-6.12.0-78.el10.tar.xz) = abc13bba9d0226b676e62a0cf301ce803bfe7a3bd64c0f274d917343b1f3d22036185e54f6b06d515361b9dc8147fae372a90769d74f080a76b4a405c694935a -SHA512 (kernel-kabi-dw-6.12.0-78.el10.tar.xz) = 363638a37d0822f41ee10a642eba36b7442adc8697b96afc32d0dfe7cdfef25279d16621d6a9d75e29ec659a379ba2be6b7a92e59255bdeb00c17b5d4b54690d +SHA512 (linux-6.12.0-79.el10.tar.xz) = c3b3c005cdb47f74d79132271816ef50c98b6241fa46ac359699cdd2677e2663e3b4ce7fed55b6754de500cfed7251c5c5d4ca2b4a6e55d78d16b80693c1b117 +SHA512 (kernel-abi-stablelists-6.12.0-79.el10.tar.xz) = cedf931ec77e42880ebe71ed8c9b780b0d1ad6531d7b3231cd7491c00a01c58d62abd73170bd58e6024c079cd0d707454163d2ece8e5371dad2f9fd08fc54ebf +SHA512 (kernel-kabi-dw-6.12.0-79.el10.tar.xz) = 363638a37d0822f41ee10a642eba36b7442adc8697b96afc32d0dfe7cdfef25279d16621d6a9d75e29ec659a379ba2be6b7a92e59255bdeb00c17b5d4b54690d