Commit cb8d50df authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: Fixup userptr mmu notifier registration error handling

Avoid dereferencing the error pointer and also avoid returning NULL
from i915_mmu_notifier_find since the callers do not expect that.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Fixes: 7741b547 ("drm/i915: Preallocate our mmu notifier workequeu to unbreak cpu hotplug deadlock")
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171017150908.12840-1-tvrtko.ursulin@linux.intel.com
parent 930a784d
...@@ -221,15 +221,17 @@ i915_mmu_notifier_find(struct i915_mm_struct *mm) ...@@ -221,15 +221,17 @@ i915_mmu_notifier_find(struct i915_mm_struct *mm)
/* Protected by mm_lock */ /* Protected by mm_lock */
mm->mn = fetch_and_zero(&mn); mm->mn = fetch_and_zero(&mn);
} }
} else { } else if (mm->mn) {
/* someone else raced and successfully installed the mmu /*
* notifier, we can cancel our own errors */ * Someone else raced and successfully installed the mmu
* notifier, we can cancel our own errors.
*/
err = 0; err = 0;
} }
mutex_unlock(&mm->i915->mm_lock); mutex_unlock(&mm->i915->mm_lock);
up_write(&mm->mm->mmap_sem); up_write(&mm->mm->mmap_sem);
if (mn) { if (mn && !IS_ERR(mn)) {
destroy_workqueue(mn->wq); destroy_workqueue(mn->wq);
kfree(mn); kfree(mn);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment