From 0859d78c9598f58ce03e9a2ae8b8be3dab55e109 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Tue, 11 Feb 2025 12:44:55 +0000
Subject: [PATCH] import kernel-5.14.0-503.23.2.el9_5
---
.kernel.checksum | 2 +-
.kernel.metadata | 6 +++---
SOURCES/Makefile.rhelver | 2 +-
SOURCES/kernel.changelog | 4 ++++
SPECS/kernel.spec | 13 ++++++++-----
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/.kernel.checksum b/.kernel.checksum
index 46ea917..06e4b6b 100644
--- a/.kernel.checksum
+++ b/.kernel.checksum
@@ -1 +1 @@
-a80dde49b18b62d9c17287bb517f92d4a97af50cf7975b04da3a367ba4e9f5e5
+66d1106a04f7f79aac25ecc354afbfa05563badc9306a90bc74bf673a2ed18d5
diff --git a/.kernel.metadata b/.kernel.metadata
index 32c952b..c700d7a 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,3 +1,3 @@
-a13a08d85e7c627170d0d9c17818f6aba54fb290fe6ab1051227c757e116cfa3 SOURCES/kernel-abi-stablelists-5.14.0-503.23.1.el9_5.tar.bz2
-6779468e2f041eece619533ee621ff121d71628366ac46a08771e11f596fdb1e SOURCES/kernel-kabi-dw-5.14.0-503.23.1.el9_5.tar.bz2
-9a06233726cf4b5d6a21bf09194ec1b8b745fb0724c8065dbd28b34aa72a4338 SOURCES/linux-5.14.0-503.23.1.el9_5.tar.xz
+ee973bf77f0129de15595235c381d2b0b4ae9872e5ea8fc5f3e90d24e1db4005 SOURCES/kernel-abi-stablelists-5.14.0-503.23.2.el9_5.tar.bz2
+996366658ca45f52bada547c956bba76cafac374b0f9c51c8de7c9bb516d72c2 SOURCES/kernel-kabi-dw-5.14.0-503.23.2.el9_5.tar.bz2
+6d1052ed7687e70860757b09021d270566eb7cd7e2d4c03dcc55292b014f9954 SOURCES/linux-5.14.0-503.23.2.el9_5.tar.xz
diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver
index 9825451..6ac1115 100644
--- a/SOURCES/Makefile.rhelver
+++ b/SOURCES/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 5
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 503.23.1
+RHEL_RELEASE = 503.23.2
#
# ZSTREAM
diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog
index 780c610..bb36b68 100644
--- a/SOURCES/kernel.changelog
+++ b/SOURCES/kernel.changelog
@@ -1,3 +1,7 @@
+* Fri Feb 07 2025 Scott Weaver <scweaver@redhat.com> [5.14.0-503.23.2.el9_5]
+- media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format (CKI Backport Bot) [RHEL-78075 RHEL-69574] {CVE-2024-53104}
+Resolves: RHEL-78075
+
* Mon Jan 20 2025 Chao YE <cye@redhat.com> [5.14.0-503.23.1.el9_5]
- printk: nbcon: Fix illegal RCU usage on thread wakeup (Derek Barbosa) [RHEL-73036]
Resolves: RHEL-73036
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 21e66f9..7ea7504 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 503.23.1
+%define pkgrelease 503.23.2
%define kversion 5
-%define tarfile_release 5.14.0-503.23.1.el9_5
+%define tarfile_release 5.14.0-503.23.2.el9_5
# This is needed to do merge window version magic
%define patchlevel 14
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 503.23.1%{?buildid}%{?dist}
+%define specrelease 503.23.2%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 5.14.0-503.23.1.el9_5
+%define kabiversion 5.14.0-503.23.2.el9_5
#
# End of genspec.sh variables
@@ -3794,10 +3794,13 @@ fi
#
#
%changelog
-* Wed Feb 05 2025 Release Engineering <releng@rockylinux.org> - 5.14.0-503.23.1
+* Tue Feb 11 2025 Release Engineering <releng@rockylinux.org> - 5.14.0-503.23.2
- Porting to Rocky Linux 9, debranding and Rocky branding
- Ensure aarch64 kernel is not compressed
+* Fri Feb 07 2025 Scott Weaver <scweaver@redhat.com> [5.14.0-503.23.2.el9_5]
+- media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format (CKI Backport Bot) [RHEL-78075 RHEL-69574] {CVE-2024-53104}
+
* Mon Jan 20 2025 Chao YE <cye@redhat.com> [5.14.0-503.23.1.el9_5]
- printk: nbcon: Fix illegal RCU usage on thread wakeup (Derek Barbosa) [RHEL-73036]
--
GitLab