From: Greg Kroah-Hartman Date: Wed, 12 Jun 2024 14:53:13 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v4.19.316~101 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7db9b91985988e3ca5571860ed7a59de0e15926;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: drm-amdgpu-add-error-handle-to-avoid-out-of-bounds.patch --- diff --git a/queue-6.1/drm-amdgpu-add-error-handle-to-avoid-out-of-bounds.patch b/queue-6.1/drm-amdgpu-add-error-handle-to-avoid-out-of-bounds.patch new file mode 100644 index 00000000000..08f39e958cb --- /dev/null +++ b/queue-6.1/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 +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 + +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 +Acked-by: Christian König +Reviewed-by: Le Ma +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -2049,6 +2049,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.1/series b/queue-6.1/series index 94815ed9e27..c84508b481f 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -15,3 +15,4 @@ vxlan-fix-regression-when-dropping-packets-due-to-invalid-src-addresses.patch scripts-gdb-fix-sb_-constants-parsing.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