Skip to content

Commit bce674c

Browse files
nirmoyopsiff
authored andcommitted
drm/i915: Prevent potential null-ptr-deref in engine_init_common
If measure_breadcrumb_dw() returns an error and bce isn't created, this commit ensures that intel_engine_destroy_pinned_context() is not called with a NULL bce. v2: Fix the subject s/UAF/null-ptr-deref(Jani) Fixes: b352749 ("drm/i915: Create a kernel context for GGTT updates") Cc: Oak Zeng <oak.zeng@intel.com> Cc: Andi Shyti <andi.shyti@linux.intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231011122547.7085-1-nirmoy.das@intel.com
1 parent b76d489 commit bce674c

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1515,7 +1515,8 @@ static int engine_init_common(struct intel_engine_cs *engine)
15151515
return 0;
15161516

15171517
err_bce_context:
1518-
intel_engine_destroy_pinned_context(bce);
1518+
if (bce)
1519+
intel_engine_destroy_pinned_context(bce);
15191520
err_ce_context:
15201521
intel_engine_destroy_pinned_context(ce);
15211522
return ret;

0 commit comments

Comments
 (0)