From 00010ce23730d85bf49d692d6930a307a9f44ef0 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Wed, 17 Jul 2024 08:28:04 +0000 Subject: [PATCH] import OSE kernel-5.14.0-427.26.1.el9_4 --- .gitignore | 8 ++---- .kernel.metadata | 8 ++---- SOURCES/Makefile.rhelver | 2 +- SPECS/kernel.spec | 59 +++++++++++++++++++++++++++++++++++----- 4 files changed, 59 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 66b87049b..9ed736210 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,7 @@ -SOURCES/kernel-abi-stablelists-5.14.0-427.24.1.el9_4.tar.bz2 -SOURCES/kernel-kabi-dw-5.14.0-427.24.1.el9_4.tar.bz2 -SOURCES/linux-5.14.0-427.24.1.el9_4.tar.xz +SOURCES/kernel-abi-stablelists-5.14.0-427.26.1.el9_4.tar.bz2 +SOURCES/kernel-kabi-dw-5.14.0-427.26.1.el9_4.tar.bz2 +SOURCES/linux-5.14.0-427.26.1.el9_4.tar.xz SOURCES/nvidiagpuoot001.x509 -SOURCES/olima1.x509 -SOURCES/olimaca1.x509 SOURCES/rheldup3.x509 SOURCES/rhelima.x509 SOURCES/rhelima_centos.x509 diff --git a/.kernel.metadata b/.kernel.metadata index 53748a109..be4caec74 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,9 +1,7 @@ -56a45ec0856cc99d484ff4cdd4f8ac5815edbfdf SOURCES/kernel-abi-stablelists-5.14.0-427.24.1.el9_4.tar.bz2 -b79d6fe34a5808f05a46d8903e75bf33cbc297da SOURCES/kernel-kabi-dw-5.14.0-427.24.1.el9_4.tar.bz2 -b062d1073df13444338f4230a643590517510152 SOURCES/linux-5.14.0-427.24.1.el9_4.tar.xz +5868e5bb4568dcdb6bdd26ec2fd39dee695e70ee SOURCES/kernel-abi-stablelists-5.14.0-427.26.1.el9_4.tar.bz2 +f6472b30897edf427e816e9ae8667dd2df1d8b19 SOURCES/kernel-kabi-dw-5.14.0-427.26.1.el9_4.tar.bz2 +a5f69b63040d9916e509120fe05b482e7495973d SOURCES/linux-5.14.0-427.26.1.el9_4.tar.xz 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 -706ae01dd14efa38f0f565a3706acac19c78df02 SOURCES/olima1.x509 -6e3f0d61414c0b50f48dc2d4c3b3cd024e1c3a43 SOURCES/olimaca1.x509 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 99e571f9de4188f3b5fdf1f84ff73f6cc4bb6a0e SOURCES/rhelima.x509 61d5a223ff0c79189505abae77e0087c4b2d2b47 SOURCES/rhelima_centos.x509 diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 9ac07a769..fef414422 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 4 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 427.24.1 +RHEL_RELEASE = 427.26.1 # # ZSTREAM diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 09dbc19ff..6efbce479 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -165,15 +165,15 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 427.24.1 +%define pkgrelease 427.26.1 %define kversion 5 -%define tarfile_release 5.14.0-427.24.1.el9_4 +%define tarfile_release 5.14.0-427.26.1.el9_4 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 427.24.1%{?buildid}%{?dist} +%define specrelease 427.26.1%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.14.0-427.24.1.el9_4 +%define kabiversion 5.14.0-427.26.1.el9_4 # # End of genspec.sh variables @@ -2198,12 +2198,12 @@ BuildKernel() { cp --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp --parents tools/objtool/sync-check.sh $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - cp -a --parents tools/bpf/resolve_btfids/main.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - cp -a --parents tools/bpf/resolve_btfids/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp -a --parents tools/bpf/resolve_btfids $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp --parents security/selinux/include/policycap_names.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp --parents security/selinux/include/policycap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp -a --parents tools/include/asm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp -a --parents tools/include/asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp -a --parents tools/include/linux $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp -a --parents tools/include/uapi/asm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -2241,6 +2241,9 @@ BuildKernel() { if [ -d arch/%{asmarch}/include ]; then cp -a --parents arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ fi + if [ -d tools/arch/%{asmarch}/include ]; then + cp -a --parents tools/arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + fi %ifarch aarch64 # arch/arm64/include/asm/xen references arch/arm cp -a --parents arch/arm/include/asm/xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ @@ -2528,6 +2531,7 @@ BuildKernel() { %if %{with_cross} make -C $RPM_BUILD_ROOT/lib/modules/$KernelVer/build M=scripts clean + make -C $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/bpf/resolve_btfids clean sed -i 's/REBUILD_SCRIPTS_FOR_CROSS:=0/REBUILD_SCRIPTS_FOR_CROSS:=1/' $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile %endif @@ -3181,7 +3185,7 @@ then\ )\ fi\ %if %{with_cross}\ - echo "Building scripts"\ + echo "Building scripts and resolve_btfids"\ env --unset=ARCH make -C /usr/src/kernels/%{KVERREL}%{?1:+%{1}} prepare_after_cross\ %endif\ %{nil} @@ -3728,6 +3732,47 @@ fi # # %changelog +* Fri Jul 05 2024 Scott Weaver [5.14.0-427.26.1.el9_4] +- net: ena: Fix incorrect descriptor free behavior (Kamal Heib) [RHEL-39217 RHEL-37430] {CVE-2024-35958} +- tcp: Use refcount_inc_not_zero() in tcp_twsk_unique(). (Guillaume Nault) [RHEL-41749 RHEL-39837] {CVE-2024-36904} +- mm/mglru: Revert "don't sync disk for each aging cycle" (Waiman Long) [RHEL-44418] +- tipc: fix UAF in error path (Xin Long) [RHEL-34848 RHEL-34280] {CVE-2024-36886} +- selftest/cgroup: Update test_cpuset_prs.sh to match changes (Waiman Long) [RHEL-45139] +- cgroup/cpuset: Make cpuset.cpus.exclusive independent of cpuset.cpus (Waiman Long) [RHEL-45139] +- cgroup/cpuset: Delay setting of CS_CPU_EXCLUSIVE until valid partition (Waiman Long) [RHEL-45139] +- selftest/cgroup: Fix test_cpuset_prs.sh problems reported by test robot (Waiman Long) [RHEL-45139] +- cgroup/cpuset: Fix remote root partition creation problem (Waiman Long) [RHEL-45139] +- cgroup/cpuset: Optimize isolated partition only generate_sched_domains() calls (Waiman Long) [RHEL-45139] +- cgroup/cpuset: Fix retval in update_cpumask() (Waiman Long) [RHEL-45139] +- cgroup/cpuset: Fix a memory leak in update_exclusive_cpumask() (Waiman Long) [RHEL-45139] +- ice: implement AQ download pkg retry (Petr Oros) [RHEL-38907 RHEL-17318] +- redhat: include resolve_btfids in kernel-devel (Viktor Malik) [RHEL-43426 RHEL-40707] +- blk-cgroup: fix list corruption from resetting io stat (cki-backport-bot) [RHEL-44977] {CVE-2024-38663} +- misc: rtsx: do clear express reg every SD_INT (David Arcari) [RHEL-39985 RHEL-33706] +- misc: rtsx: Fix rts5264 driver status incorrect when card removed (David Arcari) [RHEL-39985 RHEL-33706] +- netfilter: tproxy: bail out if IP has been disabled on the device (cki-backport-bot) [RHEL-44371] {CVE-2024-36270} +- lib/test_hmm.c: handle src_pfns and dst_pfns allocation failure (cki-backport-bot) [RHEL-44263 RHEL-44261] {CVE-2024-38543} +- r8169: Fix possible ring buffer corruption on fragmented Tx packets. (cki-backport-bot) [RHEL-44039] {CVE-2024-38586} +- net: micrel: Fix receiving the timestamp in the frame for lan8841 (cki-backport-bot) [RHEL-43996] {CVE-2024-38593} +- vt: fix memory overlapping when deleting chars in the buffer (Waiman Long) [RHEL-43379 RHEL-27780] {CVE-2022-48627} +- net/mlx5e: Use a memory barrier to enforce PTP WQ xmit submission tracking occurs after populating the metadata_map (Kamal Heib) [RHEL-42728 RHEL-34192] {CVE-2024-26858} +- locking/atomic: Make test_and_*_bit() ordered on failure (Paolo Bonzini) [RHEL-45896] +- mm/vmscan: fix a bug calling wakeup_kswapd() with a wrong zone index (Rafael Aquini) [RHEL-42659 RHEL-31840] {CVE-2024-26783} +- can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock (Jose Ignacio Tornos Martinez) [RHEL-42379 RHEL-31530] {CVE-2023-52638} +- ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port() (Ken Cox) [RHEL-42226 RHEL-38715] {CVE-2021-47548} + +* Mon Jul 01 2024 Scott Weaver [5.14.0-427.25.1.el9_4] +- nvme: fix reconnection fail due to reserved tag allocation (Maurizio Lombardi) [RHEL-42896 RHEL-36896] {CVE-2024-27435} +- net: hns3: fix use-after-free bug in hclgevf_send_mbx_msg (cki-backport-bot) [RHEL-43625] {CVE-2021-47596} +- scsi: sg: Avoid race in error handling & drop bogus warn (Ewan D. Milne) [RHEL-36106 RHEL-35659] +- scsi: sg: Avoid sg device teardown race (Ewan D. Milne) [RHEL-36106 RHEL-35659] +- netfilter: nf_tables: use timestamp to check for set element timeout (Florian Westphal) [RHEL-38032 RHEL-33985] {CVE-2024-27397} +- netfilter: nft_set_rbtree: Remove unused variable nft_net (Florian Westphal) [RHEL-38032 RHEL-33985] +- netfilter: nft_set_rbtree: prefer sync gc to async worker (Florian Westphal) [RHEL-38032 RHEL-33985] +- netfilter: nft_set_rbtree: rename gc deactivate+erase function (Florian Westphal) [RHEL-38032 RHEL-33985] +- netfilter: nf_tables: de-constify set commit ops function argument (Florian Westphal) [RHEL-38032 RHEL-33985] +- octeontx2-af: avoid off-by-one read from userspace (Kamal Heib) [RHEL-40486 RHEL-39873] {CVE-2024-36957} + * Sun Jun 23 2024 Scott Weaver [5.14.0-427.24.1.el9_4] - net/bnx2x: Prevent access to a freed page in page_pool (Michal Schmidt) [RHEL-43272 RHEL-23117] - bnx2x: new flag for track HW resource allocation (Michal Schmidt) [RHEL-43272 RHEL-23117]