6.6-stable patches

added patches:
	drm-amdgpu-add-error-handle-to-avoid-out-of-bounds.patch

diff --git a/queue-6.6/drm-amdgpu-add-error-handle-to-avoid-out-of-bounds.patch b/queue-6.6/drm-amdgpu-add-error-handle-to-avoid-out-of-bounds.patch
new file mode 100644 (file)
index 0000000..f0fd034
--- /dev/null
+++ b/queue-6.6/drm-amdgpu-add-error-handle-to-avoid-out-of-bounds.patch
@@ -0,0 +1,36 @@
+From 8b2faf1a4f3b6c748c0da36cda865a226534d520 Mon Sep 17 00:00:00 2001
+From: Bob Zhou <bob.zhou@amd.com>
+Date: Tue, 23 Apr 2024 16:58:11 +0800
+Subject: drm/amdgpu: add error handle to avoid out-of-bounds
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Bob Zhou <bob.zhou@amd.com>
+
+commit 8b2faf1a4f3b6c748c0da36cda865a226534d520 upstream.
+
+if the sdma_v4_0_irq_id_to_seq return -EINVAL, the process should
+be stop to avoid out-of-bounds read, so directly return -EINVAL.
+
+Signed-off-by: Bob Zhou <bob.zhou@amd.com>
+Acked-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Le Ma <le.ma@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+@@ -2031,6 +2031,9 @@ static int sdma_v4_0_process_trap_irq(st
+ 
+       DRM_DEBUG("IH: SDMA trap\n");
+       instance = sdma_v4_0_irq_id_to_seq(entry->client_id);
++      if (instance < 0)
++              return instance;
++
+       switch (entry->ring_id) {
+       case 0:
+               amdgpu_fence_process(&adev->sdma.instance[instance].ring);

diff --git a/queue-6.6/series b/queue-6.6/series
index de86e4be0e9190020ed1b793c031203f6e0c2276..d92ab82a81f8bfaf11f04970e521d625fa26bf33 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -16,3 +16,4 @@ drm-sun4i-hdmi-convert-encoder-to-atomic.patch
 drm-sun4i-hdmi-move-mode_set-into-enable.patch
 f2fs-fix-to-do-sanity-check-on-i_xattr_nid-in-sanity_check_inode.patch
 media-lgdt3306a-add-a-check-against-null-pointer-def.patch
+drm-amdgpu-add-error-handle-to-avoid-out-of-bounds.patch