From a811c28bbbde8cc9a72668ce8d90d4084e4ced48 Mon Sep 17 00:00:00 2001
From: Jan Stancek <jstancek@redhat.com>
Date: Wed, 15 Nov 2023 07:53:42 +0100
Subject: [PATCH] kernel-5.14.0-386.el9
* Wed Nov 15 2023 Jan Stancek <jstancek@redhat.com> [5.14.0-386.el9]
- KVM: arm64: selftest: Perform ISB before reading PAR_EL1 (Gavin Shan) [RHEL-16004]
- KVM: arm64: selftest: Add the missing .guest_prepare() (Gavin Shan) [RHEL-16004]
- scsi: mpt3sas: Drop redundant pci_enable_pcie_error_reporting() (Tomas Henzl) [RHEL-8247]
- scsi: mpt3sas: Fix in error path (Tomas Henzl) [RHEL-8247]
- scsi: mpt3sas: Fix loop logic (Tomas Henzl) [RHEL-8247]
- scsi: mpt3sas: Remove volatile qualifier (Tomas Henzl) [RHEL-8247]
- scsi: mpt3sas: Perform additional retries if doorbell read returns 0 (Tomas Henzl) [RHEL-8247]
- net/ism: Remove redundant pci_clear_master (Tobias Huschle) [RHEL-11199]
- net/smc: Fix dependency of SMC on ISM (Tobias Huschle) [RHEL-11199]
- s390/ism: Do not unregister clients with registered DMBs (Tobias Huschle) [RHEL-11199]
- s390/ism: Fix and simplify add()/remove() callback handling (Tobias Huschle) [RHEL-11199]
- s390/ism: Fix locking for forwarding of IRQs and events to clients (Tobias Huschle) [RHEL-11199]
- s390/ism: Fix trying to free already-freed IRQ by repeated ism_dev_exit() (Tobias Huschle) [RHEL-11199]
- s390/ism: Set DMA coherent mask (Tobias Huschle) [RHEL-11199]
- net/ism: Remove extra include (Tobias Huschle) [RHEL-11199]
- net/smc: Introduce explicit check for v2 support (Tobias Huschle) [RHEL-11199]
- cifs: Fix UAF in cifs_demultiplex_thread() (Scott Mayhew) [RHEL-15170 RHEL-15174] {CVE-2023-1192}
- scsi: mpi3mr: Split off bus_reset function from host_reset (Tomas Henzl) [RHEL-8231]
- scsi: mpi3mr: Update driver version to 8.5.0.0.0 (Tomas Henzl) [RHEL-8231]
- scsi: mpi3mr: Enhance handling of devices removed after controller reset (Tomas Henzl) [RHEL-8231]
- scsi: mpi3mr: WRITE SAME implementation (Tomas Henzl) [RHEL-8231]
- scsi: mpi3mr: Add support for more than 1MB I/O (Tomas Henzl) [RHEL-8231]
- scsi: mpi3mr: Update MPI Headers to version 3.00.28 (Tomas Henzl) [RHEL-8231]
- scsi: mpi3mr: Invoke soft reset upon TSU or event ack time out (Tomas Henzl) [RHEL-8231]
- scsi: mpi3mr: Propagate sense data for admin queue SCSI I/O (Tomas Henzl) [RHEL-8231]
- scsi: mpi3mr: Fix the type used for pointers to bitmap (Tomas Henzl) [RHEL-8231]
- redhat: self-test: Use a more complete SRPM file suffix (Andrew Halaney) [RHEL-15147]
- redhat: makefile: remove stray rpmbuild --without (Andrew Halaney) [RHEL-15147]
- redhat: kernel.spec: amend license macro expansion (Eric Chanudet) [RHEL-15147]
- wireguard: allowedips: expand maximum node depth (Hangbin Liu) [RHEL-13966]
- wireguard: timers: move to using timer_delete_sync (Hangbin Liu) [RHEL-13966]
- wireguard: netlink: send staged packets when setting initial private key (Hangbin Liu) [RHEL-13966]
- wireguard: queueing: use saner cpu selection wrapping (Hangbin Liu) [RHEL-13966]
- wireguard: timers: cast enum limits members to int in prints (Hangbin Liu) [RHEL-13966]
- wireguard: allowedips: don't corrupt stack when detecting overflow (Hangbin Liu) [RHEL-13966]
- x86/speculation: Provide a debugfs file to dump SPEC_CTRL MSRs (Waiman Long) [RHEL-8620]
- x86/idle: Disable IBRS entering mwait idle and enable it on wakeup (Waiman Long) [RHEL-8620]
- intel_idle: Add ibrs_off module parameter to force-disable IBRS (Waiman Long) [RHEL-8620]
- intel_idle: Use __update_spec_ctrl() in intel_idle_ibrs() (Waiman Long) [RHEL-8620]
- x86/idle: Disable IBRS when CPU is offline to improve single-threaded performance (Waiman Long) [RHEL-8620]
- x86/speculation: Add __update_spec_ctrl() helper (Waiman Long) [RHEL-8620]
- redhat/configs: Increase CONFIG_NODES_SHIFT from 6 to 8 for arm64 (Waiman Long) [RHEL-11395]
- lib: cpu_rmap: Add irq_cpu_rmap_remove to complement irq_cpu_rmap_add (Petr Oros) [RHEL-5076]
- vc_screen: don't clobber return value in vcs_read (Ricardo Robaina) [2221465] {CVE-2023-3567}
- vc_screen: move load of struct vc_data pointer in vcs_read() to avoid UAF (Ricardo Robaina) [2221465] {CVE-2023-3567}
Resolves: rhbz#2221465, RHEL-11199, RHEL-11395, RHEL-13966, RHEL-15147, RHEL-15170, RHEL-15174, RHEL-16004, RHEL-5076, RHEL-8231, RHEL-8247, RHEL-8620
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
Makefile.rhelver | 2 +-
kernel-aarch64-64k-debug-rhel.config | 2 +-
kernel-aarch64-64k-rhel.config | 2 +-
kernel-aarch64-debug-rhel.config | 2 +-
kernel-aarch64-rhel.config | 2 +-
kernel-aarch64-rt-debug-rhel.config | 2 +-
kernel-aarch64-rt-rhel.config | 2 +-
kernel.spec | 57 +++++++++++++++++++++++++---
sources | 6 +--
9 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 189956b..9a7f9eb 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 4
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 385
+RHEL_RELEASE = 386
#
# ZSTREAM
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index 60801b3..9afd6ff 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -4030,7 +4030,7 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=8
CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ=y
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index b7b8933..2d59528 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -4009,7 +4009,7 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=8
CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 10c2a8a..9b946cc 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -4027,7 +4027,7 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=8
CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index d4f9312..03fd056 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4006,7 +4006,7 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=8
CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ=y
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 9a90ddf..f6a865e 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -4098,7 +4098,7 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=8
CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ=y
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 76d1c18..a5af92a 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -4077,7 +4077,7 @@ CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_NLS=y
# CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=8
CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ=y
diff --git a/kernel.spec b/kernel.spec
index b19f11c..b843ae9 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -165,15 +165,15 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 5.14.0
%define patchversion 5.14
-%define pkgrelease 385
+%define pkgrelease 386
%define kversion 5
-%define tarfile_release 5.14.0-385.el9
+%define tarfile_release 5.14.0-386.el9
# This is needed to do merge window version magic
%define patchlevel 14
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 385%{?buildid}%{?dist}
+%define specrelease 386%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 5.14.0-385.el9
+%define kabiversion 5.14.0-386.el9
#
# End of genspec.sh variables
@@ -3618,7 +3618,7 @@ fi
%if %{2}\
%{expand:%%files %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\
%{!?_licensedir:%global license %%doc}\
-%license linux-%{KVERREL}/COPYING-%{version}-%{release}\
+%%license linux-%{KVERREL}/COPYING-%{version}-%{release}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\
%ghost /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/.vmlinuz.hmac \
@@ -3745,6 +3745,53 @@ fi
#
#
%changelog
+* Wed Nov 15 2023 Jan Stancek <jstancek@redhat.com> [5.14.0-386.el9]
+- KVM: arm64: selftest: Perform ISB before reading PAR_EL1 (Gavin Shan) [RHEL-16004]
+- KVM: arm64: selftest: Add the missing .guest_prepare() (Gavin Shan) [RHEL-16004]
+- scsi: mpt3sas: Drop redundant pci_enable_pcie_error_reporting() (Tomas Henzl) [RHEL-8247]
+- scsi: mpt3sas: Fix in error path (Tomas Henzl) [RHEL-8247]
+- scsi: mpt3sas: Fix loop logic (Tomas Henzl) [RHEL-8247]
+- scsi: mpt3sas: Remove volatile qualifier (Tomas Henzl) [RHEL-8247]
+- scsi: mpt3sas: Perform additional retries if doorbell read returns 0 (Tomas Henzl) [RHEL-8247]
+- net/ism: Remove redundant pci_clear_master (Tobias Huschle) [RHEL-11199]
+- net/smc: Fix dependency of SMC on ISM (Tobias Huschle) [RHEL-11199]
+- s390/ism: Do not unregister clients with registered DMBs (Tobias Huschle) [RHEL-11199]
+- s390/ism: Fix and simplify add()/remove() callback handling (Tobias Huschle) [RHEL-11199]
+- s390/ism: Fix locking for forwarding of IRQs and events to clients (Tobias Huschle) [RHEL-11199]
+- s390/ism: Fix trying to free already-freed IRQ by repeated ism_dev_exit() (Tobias Huschle) [RHEL-11199]
+- s390/ism: Set DMA coherent mask (Tobias Huschle) [RHEL-11199]
+- net/ism: Remove extra include (Tobias Huschle) [RHEL-11199]
+- net/smc: Introduce explicit check for v2 support (Tobias Huschle) [RHEL-11199]
+- cifs: Fix UAF in cifs_demultiplex_thread() (Scott Mayhew) [RHEL-15170 RHEL-15174] {CVE-2023-1192}
+- scsi: mpi3mr: Split off bus_reset function from host_reset (Tomas Henzl) [RHEL-8231]
+- scsi: mpi3mr: Update driver version to 8.5.0.0.0 (Tomas Henzl) [RHEL-8231]
+- scsi: mpi3mr: Enhance handling of devices removed after controller reset (Tomas Henzl) [RHEL-8231]
+- scsi: mpi3mr: WRITE SAME implementation (Tomas Henzl) [RHEL-8231]
+- scsi: mpi3mr: Add support for more than 1MB I/O (Tomas Henzl) [RHEL-8231]
+- scsi: mpi3mr: Update MPI Headers to version 3.00.28 (Tomas Henzl) [RHEL-8231]
+- scsi: mpi3mr: Invoke soft reset upon TSU or event ack time out (Tomas Henzl) [RHEL-8231]
+- scsi: mpi3mr: Propagate sense data for admin queue SCSI I/O (Tomas Henzl) [RHEL-8231]
+- scsi: mpi3mr: Fix the type used for pointers to bitmap (Tomas Henzl) [RHEL-8231]
+- redhat: self-test: Use a more complete SRPM file suffix (Andrew Halaney) [RHEL-15147]
+- redhat: makefile: remove stray rpmbuild --without (Andrew Halaney) [RHEL-15147]
+- redhat: kernel.spec: amend license macro expansion (Eric Chanudet) [RHEL-15147]
+- wireguard: allowedips: expand maximum node depth (Hangbin Liu) [RHEL-13966]
+- wireguard: timers: move to using timer_delete_sync (Hangbin Liu) [RHEL-13966]
+- wireguard: netlink: send staged packets when setting initial private key (Hangbin Liu) [RHEL-13966]
+- wireguard: queueing: use saner cpu selection wrapping (Hangbin Liu) [RHEL-13966]
+- wireguard: timers: cast enum limits members to int in prints (Hangbin Liu) [RHEL-13966]
+- wireguard: allowedips: don't corrupt stack when detecting overflow (Hangbin Liu) [RHEL-13966]
+- x86/speculation: Provide a debugfs file to dump SPEC_CTRL MSRs (Waiman Long) [RHEL-8620]
+- x86/idle: Disable IBRS entering mwait idle and enable it on wakeup (Waiman Long) [RHEL-8620]
+- intel_idle: Add ibrs_off module parameter to force-disable IBRS (Waiman Long) [RHEL-8620]
+- intel_idle: Use __update_spec_ctrl() in intel_idle_ibrs() (Waiman Long) [RHEL-8620]
+- x86/idle: Disable IBRS when CPU is offline to improve single-threaded performance (Waiman Long) [RHEL-8620]
+- x86/speculation: Add __update_spec_ctrl() helper (Waiman Long) [RHEL-8620]
+- redhat/configs: Increase CONFIG_NODES_SHIFT from 6 to 8 for arm64 (Waiman Long) [RHEL-11395]
+- lib: cpu_rmap: Add irq_cpu_rmap_remove to complement irq_cpu_rmap_add (Petr Oros) [RHEL-5076]
+- vc_screen: don't clobber return value in vcs_read (Ricardo Robaina) [2221465] {CVE-2023-3567}
+- vc_screen: move load of struct vc_data pointer in vcs_read() to avoid UAF (Ricardo Robaina) [2221465] {CVE-2023-3567}
+
* Mon Nov 13 2023 Jan Stancek <jstancek@redhat.com> [5.14.0-385.el9]
- s390/qdio: fix do_sqbs() inline assembly constraint (Tobias Huschle) [RHEL-11201]
- s390/lcs: Convert sysfs sprintf to sysfs_emit (Tobias Huschle) [RHEL-11201]
diff --git a/sources b/sources
index d8d98f6..0733a0c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.0-385.el9.tar.xz) = 5bf2d56172efd2c678c689058a750c874a3a2731ec639d1710e240603a5b3b619766704f703b060df8644028e3a803472459f553808f93faa963dd09e5fd7a2b
-SHA512 (kernel-abi-stablelists-5.14.0-385.el9.tar.bz2) = baf9c2bfb843a2c950bf1c3578d87bfdd6946c388f41650e74de3e43321b91f954280ca62bd372840a5ec47c58a84167e43445c2ae99904a54dfd51d30526670
-SHA512 (kernel-kabi-dw-5.14.0-385.el9.tar.bz2) = 3bc50566f89eafd18aedadb1739f8c9736a61870fa7af0bc1c29c06653187e010a389ccdac85b7263245c689ed1da15bce42a54110f21e7ae9619db9d279e6b5
+SHA512 (linux-5.14.0-386.el9.tar.xz) = 2c98f02e11b5bda072c64e1a51b824687cd34a13fe5bd7be502c7e7b7355cbfab70d2df32ff2f22a73541bbf1f3cb94667d74744f34c830a277cbd8cbe4e008c
+SHA512 (kernel-abi-stablelists-5.14.0-386.el9.tar.bz2) = e0c962576c4c65a6fede5297dcefb7053302e7bceec292fa78d0c90cf086d9fe186deb31e3a287733c4b468380be5fa8837090f36467f3d47f218c088dd94355
+SHA512 (kernel-kabi-dw-5.14.0-386.el9.tar.bz2) = 3bc50566f89eafd18aedadb1739f8c9736a61870fa7af0bc1c29c06653187e010a389ccdac85b7263245c689ed1da15bce42a54110f21e7ae9619db9d279e6b5