Skip to content

Commit f4d4097

Browse files
KKaras169169Andi Shyti
authored andcommitted
drm/i915/gem: Avoid accessing uninitialized context in emit_rpcs_query()
Following the error path in that function may lead to usage of uninitialized struct i915_gem_ww_ctx object, so move call to i915_gem_ww_ctx_init() a bit earlier. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com> Reviewed-by: Sebastian Brzezinka <sebastian.brzezinka@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://lore.kernel.org/r/casutxyfjv7o4ivadvbich2sq2dt22btc5wcke55r56ptgxx2h@lv7hnxrqw5rq
1 parent ba391a1 commit f4d4097

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,13 +962,14 @@ emit_rpcs_query(struct drm_i915_gem_object *obj,
962962
if (IS_ERR(rpcs))
963963
return PTR_ERR(rpcs);
964964

965+
i915_gem_ww_ctx_init(&ww, false);
966+
965967
batch = i915_vma_instance(rpcs, ce->vm, NULL);
966968
if (IS_ERR(batch)) {
967969
err = PTR_ERR(batch);
968970
goto err_put;
969971
}
970972

971-
i915_gem_ww_ctx_init(&ww, false);
972973
retry:
973974
err = i915_gem_object_lock(obj, &ww);
974975
if (!err)

0 commit comments

Comments
 (0)