diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-06-28 07:27:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-06-28 07:27:16 +1000 |
| commit | 3e6d5e1199e8643729c20fa7d9fbc6bebda45b84 (patch) | |
| tree | 4cbf310f3b28eabed569ad3f791094953b678a7f | |
| parent | 7a1b3f318b5c8f8b60be130c550e33148ecb9b2a (diff) | |
| parent | 996c3412a06578e9d779a16b9e79ace18125ab50 (diff) | |
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 <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87ikxudcpd.fsf@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c index 40371b8a9bbb..93bc1cc1ee7e 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c @@ -298,6 +298,7 @@ void i915_vma_revoke_fence(struct i915_vma *vma) return; GEM_BUG_ON(fence->vma != vma); + i915_active_wait(&fence->active); GEM_BUG_ON(!i915_active_is_idle(&fence->active)); GEM_BUG_ON(atomic_read(&fence->pin_count)); |