Commit 90211ea4 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gem: Prevent NULL pointer dereference on missing ctx->vm

If the ctx->vm is freed before we can acquire a local reference to it,
we proceed to call i915_vm_put(NULL), which is invalid.
Reported-by: default avatarColin Ian King <colin.king@canonical.com>
Fixes: 5dbd2b7b ("drm/i915/gem: Convert vm idr to xarray")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Colin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123152602.1432282-1-chris@chris-wilson.co.uk
parent 42317714
...@@ -1002,13 +1002,13 @@ static int get_ppgtt(struct drm_i915_file_private *file_priv, ...@@ -1002,13 +1002,13 @@ static int get_ppgtt(struct drm_i915_file_private *file_priv,
if (!rcu_access_pointer(ctx->vm)) if (!rcu_access_pointer(ctx->vm))
return -ENODEV; return -ENODEV;
err = -ENODEV;
rcu_read_lock(); rcu_read_lock();
vm = context_get_vm_rcu(ctx); vm = context_get_vm_rcu(ctx);
if (vm)
err = xa_alloc(&file_priv->vm_xa, &id, vm,
xa_limit_32b, GFP_KERNEL);
rcu_read_unlock(); rcu_read_unlock();
if (!vm)
return -ENODEV;
err = xa_alloc(&file_priv->vm_xa, &id, vm, xa_limit_32b, GFP_KERNEL);
if (err) if (err)
goto err_put; goto err_put;
......
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