Skip to content

Commit 3e6d5e1

Browse files
committed
Merge tag 'drm-intel-fixes-2024-06-27' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
drm/i915 fixes for v6.10-rc6: - Fix potential UAF due to race on fence register revocation Signed-off-by: Dave Airlie <[email protected]> From: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 7a1b3f3 + 996c341 commit 3e6d5e1

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ void i915_vma_revoke_fence(struct i915_vma *vma)
298298
return;
299299

300300
GEM_BUG_ON(fence->vma != vma);
301+
i915_active_wait(&fence->active);
301302
GEM_BUG_ON(!i915_active_is_idle(&fence->active));
302303
GEM_BUG_ON(atomic_read(&fence->pin_count));
303304

0 commit comments

Comments
 (0)