Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v5] drm/i915: Fix NULL pointer dereference in capture_engine
@ 2024-12-03 11:59 Eugene Kobyak
  2024-12-03 12:27 ` Jani Nikula
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Eugene Kobyak @ 2024-12-03 11:59 UTC (permalink / raw)
  To: intel-gfx; +Cc: John.C.Harrison, andi.shyti, jani.nikula

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
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: <stable@vger.kernel.org> # v6.3+
Signed-off-by: Eugene Kobyak <eugene.kobyak@intel.com>
---
v2:
  - return drm_info to separate condition
v3:
  - create separate condition which generate string if intel_context exist
v4:
  - rollback and add check intel_context in log condition
v5:
  - create separate string with guc_id if intel_context exist
 drivers/gpu/drm/i915/i915_gpu_error.c | 9 ++++++---
 1 file changed, 6 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..4ca6b9872a48 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1643,9 +1643,12 @@ 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[11];
+		ce ? snprintf(guc_id, sizeof(guc_id), " [0x%04x] ", ce->guc_id.id) : snprintf(guc_id, sizeof(guc_id), " ");
+	        drm_info(&engine->gt->i915->drm, "Got hung context on %s with active request %lld:%lld%snot 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-12-03 14:41 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-03 11:59 [PATCH v5] drm/i915: Fix NULL pointer dereference in capture_engine Eugene Kobyak
2024-12-03 12:27 ` Jani Nikula
2024-12-03 12:33 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Fix NULL pointer dereference in capture_engine (rev2) Patchwork
2024-12-03 12:59 ` ✓ i915.CI.BAT: success " Patchwork
2024-12-03 13:14 ` [PATCH v5] drm/i915: Fix NULL pointer dereference in capture_engine Andi Shyti
2024-12-03 14:40 ` ✓ i915.CI.Full: success for drm/i915: Fix NULL pointer dereference in capture_engine (rev2) Patchwork

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