Patch "drm/amdgpu: make UVD handle checking more strict" has been added to the 4.2-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/amdgpu: make UVD handle checking more strict
to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-make-uvd-handle-checking-more-strict.patch
and it can be found in the queue-4.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
5146419e6feb99cfbc8dbf005dd2f62603e15efbMon Sep 17 00:00:00 2001
From: Leo Liu <[email protected]>
Date: Tue, 15 Sep 2015 10:38:38 -0400
Subject: drm/amdgpu: make UVD handle checking more strict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Leo Liu <[email protected]>
commit 5146419e6feb99cfbc8dbf005dd2f62603e15efb upstream.
Invalid messages can crash the hw otherwise
Ported from radeon commit a1b403da70e038ca6c6c6fe434d1d873546873a3
--- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 68 +++++++++++++++++++------------- 1 file changed, 41 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +41 -27
@@ -543,46 +543,60 @@ static int amdgpu_uvd_cs_msg(struct amdgreturn -EINVAL ; } -if (msg_type ==1 ) { +switch (msg_type) { +case 0 : +/* it's a create msg, calc image size (width * height) */ +amdgpu_bo_kunmap (bo); + +/* try to alloc a new handle */ +for (i =0 ; i <AMDGPU_MAX_UVD_HANDLES ; ++i) { +if (atomic_read (&adev->uvd.handles[i]) == handle) { +DRM_ERROR ("Handle 0x%x already in use!\n" , handle); +return -EINVAL ; + } + +if (!atomic_cmpxchg (&adev->uvd.handles[i],0 , handle)) { + adev->uvd.filp[i] = ctx->parser->filp; +return 0 ; + } + } + +DRM_ERROR ("No more free UVD handles!\n" ); +return -EINVAL ; + +case 1 :/* it's a decode msg, calc buffer sizes */ r =amdgpu_uvd_cs_msg_decode (msg, ctx->buf_sizes);amdgpu_bo_kunmap (bo);if (r)return r; - }else if (msg_type ==2 ) { +/* validate the handle */ +for (i =0 ; i <AMDGPU_MAX_UVD_HANDLES ; ++i) { +if (atomic_read (&adev->uvd.handles[i]) == handle) { +if (adev->uvd.filp[i] != ctx->parser->filp) { +DRM_ERROR ("UVD handle collision detected!\n" ); +return -EINVAL ; + } +return 0 ; + } + } + +DRM_ERROR ("Invalid UVD handle 0x%x!\n" , handle); +return -ENOENT ; + +case 2 :/* it's a destroy msg, free the handle */ for (i =0 ; i <AMDGPU_MAX_UVD_HANDLES ; ++i)atomic_cmpxchg (&adev->uvd.handles[i], handle,0 );amdgpu_bo_kunmap (bo);return 0 ; - }else { -/* it's a create msg */ -amdgpu_bo_kunmap (bo); -if (msg_type !=0 ) { -DRM_ERROR ("Illegal UVD message type (%d)!\n" , msg_type); -return -EINVAL ; - } - -/* it's a create msg, no special handling needed */ - } - -/* create or decode, validate the handle */ -for (i =0 ; i <AMDGPU_MAX_UVD_HANDLES ; ++i) { -if (atomic_read (&adev->uvd.handles[i]) == handle) -return 0 ; - } - -/* handle not found try to alloc a new one */ -for (i =0 ; i <AMDGPU_MAX_UVD_HANDLES ; ++i) { -if (!atomic_cmpxchg (&adev->uvd.handles[i],0 , handle)) { - adev->uvd.filp[i] = ctx->parser->filp; -return 0 ; - } +default : +DRM_ERROR ("Illegal UVD message type (%d)!\n" , msg_type); +return -EINVAL ; } - -DRM_ERROR ("No more free UVD handles!\n" ); +BUG ();return -EINVAL ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.2/drm-amdgpu-fix-the-uvd-suspend-sequence-order.patch queue-4.2/drm-amdgpu-disable-uvd-pg.patch queue-4.2/drm-amdgpu-make-uvd-handle-checking-more-strict.patch