diff --git a/.gitignore b/.gitignore index e348cc6..f998858 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -SOURCES/kernel-abi-stablelists-5.14.0-162.18.1.el9_1.tar.bz2 -SOURCES/kernel-kabi-dw-5.14.0-162.18.1.el9_1.tar.bz2 -SOURCES/linux-5.14.0-162.18.1.el9_1.tar.xz +SOURCES/kernel-abi-stablelists-5.14.0-162.22.2.el9_1.tar.bz2 +SOURCES/kernel-kabi-dw-5.14.0-162.22.2.el9_1.tar.bz2 +SOURCES/linux-5.14.0-162.22.2.el9_1.tar.xz SOURCES/rheldup3.x509 SOURCES/rhelkpatch1.x509 diff --git a/.kernel.metadata b/.kernel.metadata index 1d2cd68..0667524 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,5 +1,5 @@ -9aa08045acd795fb5b5ed7e5198c68d76d10fa0f SOURCES/kernel-abi-stablelists-5.14.0-162.18.1.el9_1.tar.bz2 -773afc71541939b819f39419d7710d2d8070cff0 SOURCES/kernel-kabi-dw-5.14.0-162.18.1.el9_1.tar.bz2 -5cd60c72a95d966a3e11bc4fa9eb2a6b0664cdcb SOURCES/linux-5.14.0-162.18.1.el9_1.tar.xz +d47517429c707f43f125a9dd99ae700e165e8d89 SOURCES/kernel-abi-stablelists-5.14.0-162.22.2.el9_1.tar.bz2 +21924b65969ad51155a61403a5c1db474f050f8b SOURCES/kernel-kabi-dw-5.14.0-162.22.2.el9_1.tar.bz2 +33508bffa9aec76e83766d2c1d641c0bd1ebc222 SOURCES/linux-5.14.0-162.22.2.el9_1.tar.xz 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509 diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 37472c7..ba89766 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 162.18.1 +RHEL_RELEASE = 162.22.2 # # ZSTREAM diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config index f9c9824..e9b1b42 100644 --- a/SOURCES/kernel-aarch64-debug-rhel.config +++ b/SOURCES/kernel-aarch64-debug-rhel.config @@ -1789,7 +1789,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_CDEV_V1 is not set +CONFIG_GPIO_CDEV_V1=y CONFIG_GPIO_DWAPB=m # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config index 1bdbe50..05a5524 100644 --- a/SOURCES/kernel-aarch64-rhel.config +++ b/SOURCES/kernel-aarch64-rhel.config @@ -1773,7 +1773,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_CDEV_V1 is not set +CONFIG_GPIO_CDEV_V1=y CONFIG_GPIO_DWAPB=m # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config index 4f23474..b073d03 100644 --- a/SOURCES/kernel-ppc64le-debug-rhel.config +++ b/SOURCES/kernel-ppc64le-debug-rhel.config @@ -1565,7 +1565,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_CDEV_V1 is not set +CONFIG_GPIO_CDEV_V1=y # CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config index b815278..07e6140 100644 --- a/SOURCES/kernel-ppc64le-rhel.config +++ b/SOURCES/kernel-ppc64le-rhel.config @@ -1549,7 +1549,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_CDEV_V1 is not set +CONFIG_GPIO_CDEV_V1=y # CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set diff --git a/SOURCES/kernel-s390x-debug-rhel.config b/SOURCES/kernel-s390x-debug-rhel.config index fd65e10..b77e59b 100644 --- a/SOURCES/kernel-s390x-debug-rhel.config +++ b/SOURCES/kernel-s390x-debug-rhel.config @@ -1565,7 +1565,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_CDEV_V1 is not set +CONFIG_GPIO_CDEV_V1=y # CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set diff --git a/SOURCES/kernel-s390x-rhel.config b/SOURCES/kernel-s390x-rhel.config index 29da7d5..2939f5c 100644 --- a/SOURCES/kernel-s390x-rhel.config +++ b/SOURCES/kernel-s390x-rhel.config @@ -1549,7 +1549,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_CDEV_V1 is not set +CONFIG_GPIO_CDEV_V1=y # CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config index 9904236..7f589f7 100644 --- a/SOURCES/kernel-s390x-zfcpdump-rhel.config +++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config @@ -1560,7 +1560,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_CDEV_V1 is not set +CONFIG_GPIO_CDEV_V1=y # CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index c34d514..a8b9b4f 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -1669,7 +1669,7 @@ CONFIG_GPIO_AMDPT=m # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_CDEV_V1 is not set +CONFIG_GPIO_CDEV_V1=y # CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index 2e67cfb..dd9c74a 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -1653,7 +1653,7 @@ CONFIG_GPIO_AMDPT=m # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_CDEV_V1 is not set +CONFIG_GPIO_CDEV_V1=y # CONFIG_GPIO_DWAPB is not set # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 7a28319..df9e28f 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -121,13 +121,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 162.18.1.el9_1 +%define pkgrelease 162.22.2.el9_1 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 162.18.1%{?buildid}%{?dist} +%define specrelease 162.22.2%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -678,7 +678,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-162.18.1.el9_1.tar.xz +Source0: linux-5.14.0-162.22.2.el9_1.tar.xz Source1: Makefile.rhelver @@ -1350,8 +1350,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-162.18.1.el9_1 -c -mv linux-5.14.0-162.18.1.el9_1 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-162.22.2.el9_1 -c +mv linux-5.14.0-162.22.2.el9_1 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3017,8 +3017,50 @@ fi # # %changelog -* Tue Feb 28 2023 CentOS Sources - 5.14.0-162.18.1.el9.centos -- Apply debranding changes +* Wed Mar 15 2023 Lucas Zampieri [5.14.0-162.22.2.el9_1] +- tun: avoid double free in tun_free_netdev (Jon Maloy) [2156373] {CVE-2022-4744} + +* Thu Mar 09 2023 Patrick Talbert [5.14.0-162.22.1.el9_1] +- ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF (Jaroslav Kysela) [2163390 2125540] {CVE-2023-0266} + +* Thu Mar 02 2023 Patrick Talbert [5.14.0-162.21.1.el9_1] +- s390/boot: add secure boot trailer (Tobias Huschle) [2151528 2141966] +- s390/kexec: fix ipl report address for kdump (Tobias Huschle) [2166903 2161327] +- s390/qeth: cache link_info for ethtool (Tobias Huschle) [2166304 2110436] +- scsi: zfcp: Fix missing auto port scan and thus missing target ports (Tobias Huschle) [2127880 2121088] + +* Thu Feb 23 2023 Patrick Talbert [5.14.0-162.20.1.el9_1] +- cgroup/cpuset: remove unreachable code (Waiman Long) [2161105 1946801] +- kselftest/cgroup: Add cpuset v2 partition root state test (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Update description of cpuset.cpus.partition in cgroup-v2.rst (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Make partition invalid if cpumask change violates exclusivity rule (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Relocate a code block in validate_change() (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Show invalid partition reason string (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Add a new isolated cpus.partition type (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Relax constraints to partition & cpus changes (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Allow no-task partition to have empty cpuset.cpus.effective (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Miscellaneous cleanups & add helper functions (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Enable update_tasks_cpumask() on top_cpuset (Waiman Long) [2161105 1946801] +- cpuset: convert 'allowed' in __cpuset_node_allowed() to be boolean (Waiman Long) [2161105 1946801] +- cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp() (Waiman Long) [2161105 1946801] +- cgroup: cleanup comments (Waiman Long) [2161105 1946801] +- act_mirred: use the backlog for nested calls to mirred ingress (Davide Caratti) [2164655 2150278] {CVE-2022-4269} +- net/sched: act_mirred: better wording on protection against excessive stack growth (Davide Caratti) [2164655 2150278] {CVE-2022-4269} +- scsi: storvsc: Fix swiotlb bounce buffer leak in confidential VM (Emanuele Giuseppe Esposito) [2170227 2150660] + +* Thu Feb 16 2023 Patrick Talbert [5.14.0-162.19.1.el9_1] +- sched/core: Use kfree_rcu() in do_set_cpus_allowed() (Waiman Long) [2160614 2143847] +- sched/core: Fix use-after-free bug in dup_user_cpus_ptr() (Waiman Long) [2160614 2143847] +- sched: Always clear user_cpus_ptr in do_set_cpus_allowed() (Waiman Long) [2143766 2107354] +- sched: Enforce user requested affinity (Waiman Long) [2143766 2107354] +- sched: Always preserve the user requested cpumask (Waiman Long) [2143766 2107354] +- sched: Introduce affinity_context (Waiman Long) [2143766 2107354] +- sched: Add __releases annotations to affine_move_task() (Waiman Long) [2143766 2107354] +- x86/fpu: Fix copy_xstate_to_uabi() to copy init states correctly (Dean Nelson) [2168382 2122851] +- x86/fpu: Exclude dynamic states from init_fpstate (Dean Nelson) [2168382 2122851] +- x86/fpu: Fix the init_fpstate size check with the actual size (Dean Nelson) [2168382 2122851] +- x86/fpu: Configure init_fpstate attributes orderly (Dean Nelson) [2168382 2122851] +- x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation (Dean Nelson) [2168382 2122851] * Thu Feb 09 2023 Patrick Talbert [5.14.0-162.18.1.el9_1] - powerpc/pseries: Use lparcfg to reconfig VAS windows for DLPAR CPU (Steve Best) [2154305 2133101]