Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] drm/i915: Fixed NULL pointer dereference in capture_engine
@ 2024-11-25 15:27 Eugene Kobyak
  2024-11-25 19:31 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Fixed NULL pointer dereference in capture_engine (rev3) Patchwork
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Eugene Kobyak @ 2024-11-25 15:27 UTC (permalink / raw)
  To: intel-gfx; +Cc: John.C.Harrison, andi.shyti

When the intel_context structure contains NULL,
it raises a NULL pointer dereference error in drm_info().

Fixes: e8a3319c31a1 ("drm/i915: Allow error capture without a request")
Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12309

Signed-off-by: Eugene Kobyak <eugene.kobyak@intel.com>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 135ded17334e..1c614c74c2cf 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1643,9 +1643,16 @@ capture_engine(struct intel_engine_cs *engine,
 		return NULL;
 
 	intel_engine_get_hung_entity(engine, &ce, &rq);
-	if (rq && !i915_request_started(rq))
-		drm_info(&engine->gt->i915->drm, "Got hung context on %s with active request %lld:%lld [0x%04X] not yet started\n",
-			 engine->name, rq->fence.context, rq->fence.seqno, ce->guc_id.id);
+	if (rq && !i915_request_started(rq)) {
+		char guc_id[9];
+		if (ce)
+			scnprintf(guc_id, sizeof(guc_id), "[0x%04X]", ce->guc_id.id);
+		else
+			scnprintf(guc_id, sizeof(guc_id), " ");
+
+		drm_info(&engine->gt->i915->drm, "Got hung context on %s with active request %lld:%lld%s not yet started\n",
+			 engine->name, rq->fence.context, rq->fence.seqno, guc_id);
+	}
 
 	if (rq) {
 		capture = intel_engine_coredump_add_request(ee, rq, ATOMIC_MAYFAIL);
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-11-28 12:57 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-25 15:27 [PATCH v3] drm/i915: Fixed NULL pointer dereference in capture_engine Eugene Kobyak
2024-11-25 19:31 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Fixed NULL pointer dereference in capture_engine (rev3) Patchwork
2024-11-25 19:49 ` ✓ i915.CI.BAT: success " Patchwork
2024-11-25 22:33 ` ✗ i915.CI.Full: failure " Patchwork
2024-11-28 11:00 ` [PATCH v3] drm/i915: Fixed NULL pointer dereference in capture_engine Andi Shyti
2024-11-28 12:57 ` Jani Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox