Patch "drm/amdgpu: Use unsigned ring indices in amdgpu_queue_mgr_map" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/amdgpu: Use unsigned ring indices in amdgpu_queue_mgr_map
to the 4.14-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-use-unsigned-ring-indices-in-amdgpu_queue_mgr_map.patch
and it can be found in the queue-4.14 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
fa7c7939b4bf112cd06ba166b739244077898990Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
Date: Wed, 22 Nov 2017 15:55:21 +0100
Subject: drm/amdgpu: Use unsigned ring indices in amdgpu_queue_mgr_map
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Michel Dänzer <[email protected]>
commit fa7c7939b4bf112cd06ba166b739244077898990 upstream.
This matches the corresponding UAPI fields. Treating the ring index as signed could result in accessing random unrelated memory if the MSB was set.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -697,7 +697,7 @@ int amdgpu_queue_mgr_fini(struct amdgpu_ struct amdgpu_queue_mgr *mgr);int amdgpu_queue_mgr_map (struct amdgpu_device *adev,struct amdgpu_queue_mgr *mgr, -int hw_ip,int instance,int ring, +u32 hw_ip,u32 instance,u32 ring,struct amdgpu_ring **out_ring);/*
drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c +3 -3
@@ -63,7 +63,7 @@ static int amdgpu_update_cached_map(strustatic int amdgpu_identity_map (struct amdgpu_device *adev,struct amdgpu_queue_mapper *mapper, -int ring, +u32 ring,struct amdgpu_ring **out_ring) {switch (mapper->hw_ip) {
@@ -121,7 +121,7 @@ static enum amdgpu_ring_type amdgpu_hw_istatic int amdgpu_lru_map (struct amdgpu_device *adev,struct amdgpu_queue_mapper *mapper, -int user_ring, +u32 user_ring,struct amdgpu_ring **out_ring) {int r, i, j;
@@ -208,7 +208,7 @@ int amdgpu_queue_mgr_fini(struct amdgpu_*/ int amdgpu_queue_mgr_map (struct amdgpu_device *adev,struct amdgpu_queue_mgr *mgr, -int hw_ip,int instance,int ring, +u32 hw_ip,u32 instance,u32 ring,struct amdgpu_ring **out_ring) {int r, ip_num_rings;
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/drm-amdgpu-use-unsigned-ring-indices-in-amdgpu_queue_mgr_map.patch