Skip to content

Commit fde9f39

Browse files
Mazin Rezkalexdeucher
Mazin Rezk
authored andcommitted
drm/amd/display: Clear dm_state for fast updates
This patch fixes a race condition that causes a use-after-free during amdgpu_dm_atomic_commit_tail. This can occur when 2 non-blocking commits are requested and the second one finishes before the first. Essentially, this bug occurs when the following sequence of events happens: 1. Non-blocking commit gregkh#1 is requested w/ a new dm_state gregkh#1 and is deferred to the workqueue. 2. Non-blocking commit gregkh#2 is requested w/ a new dm_state gregkh#2 and is deferred to the workqueue. 3. Commit gregkh#2 starts before commit gregkh#1, dm_state gregkh#1 is used in the commit_tail and commit gregkh#2 completes, freeing dm_state gregkh#1. 4. Commit gregkh#1 starts after commit gregkh#2 completes, uses the freed dm_state 1 and dereferences a freelist pointer while setting the context. Since this bug has only been spotted with fast commits, this patch fixes the bug by clearing the dm_state instead of using the old dc_state for fast updates. In addition, since dm_state is only used for its dc_state and amdgpu_dm_atomic_commit_tail will retain the dc_state if none is found, removing the dm_state should not have any consequences in fast updates. This use-after-free bug has existed for a while now, but only caused a noticeable issue starting from 5.7-rc1 due to 3202fa6 ("slub: relocate freelist pointer to middle of object") moving the freelist pointer from dm_state->base (which was unused) to dm_state->context (which is dereferenced). Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207383 Fixes: bd200d1 ("drm/amd/display: Don't replace the dc_state for fast updates") Reported-by: Duncan <[email protected]> Signed-off-by: Mazin Rezk <[email protected]> Reviewed-by: Nicholas Kazlauskas <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent 543e866 commit fde9f39

File tree

1 file changed

+27
-9
lines changed

1 file changed

+27
-9
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8717,20 +8717,38 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
87178717
* the same resource. If we have a new DC context as part of
87188718
* the DM atomic state from validation we need to free it and
87198719
* retain the existing one instead.
8720+
*
8721+
* Furthermore, since the DM atomic state only contains the DC
8722+
* context and can safely be annulled, we can free the state
8723+
* and clear the associated private object now to free
8724+
* some memory and avoid a possible use-after-free later.
87208725
*/
8721-
struct dm_atomic_state *new_dm_state, *old_dm_state;
87228726

8723-
new_dm_state = dm_atomic_get_new_state(state);
8724-
old_dm_state = dm_atomic_get_old_state(state);
8727+
for (i = 0; i < state->num_private_objs; i++) {
8728+
struct drm_private_obj *obj = state->private_objs[i].ptr;
87258729

8726-
if (new_dm_state && old_dm_state) {
8727-
if (new_dm_state->context)
8728-
dc_release_state(new_dm_state->context);
8730+
if (obj->funcs == adev->dm.atomic_obj.funcs) {
8731+
int j = state->num_private_objs-1;
87298732

8730-
new_dm_state->context = old_dm_state->context;
8733+
dm_atomic_destroy_state(obj,
8734+
state->private_objs[i].state);
8735+
8736+
/* If i is not at the end of the array then the
8737+
* last element needs to be moved to where i was
8738+
* before the array can safely be truncated.
8739+
*/
8740+
if (i != j)
8741+
state->private_objs[i] =
8742+
state->private_objs[j];
87318743

8732-
if (old_dm_state->context)
8733-
dc_retain_state(old_dm_state->context);
8744+
state->private_objs[j].ptr = NULL;
8745+
state->private_objs[j].state = NULL;
8746+
state->private_objs[j].old_state = NULL;
8747+
state->private_objs[j].new_state = NULL;
8748+
8749+
state->num_private_objs = j;
8750+
break;
8751+
}
87348752
}
87358753
}
87368754

0 commit comments

Comments
 (0)