Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/xe: Add NULL check before deferencing pointer
@ 2024-08-19  7:15 apoorva.singh
  2024-08-19  7:22 ` ✓ CI.Patch_applied: success for drm/xe: Add NULL check before deferencing pointer (rev2) Patchwork
                   ` (8 more replies)
  0 siblings, 9 replies; 15+ messages in thread
From: apoorva.singh @ 2024-08-19  7:15 UTC (permalink / raw)
  To: intel-xe; +Cc: Apoorva Singh

From: Apoorva Singh <apoorva.singh@intel.com>

Add NULL check before deferencing of lrc->bo in
xe_lrc_snapshot_capture().

Free the dynamically allocated memory for snapshot
to avoid memory leak

Signed-off-by: Apoorva Singh <apoorva.singh@intel.com>
---
 drivers/gpu/drm/xe/xe_lrc.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 974a9cd8c379..e31d9bc64ff6 100644
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -1652,20 +1652,24 @@ struct xe_lrc_snapshot *xe_lrc_snapshot_capture(struct xe_lrc *lrc)
 	if (lrc->bo && lrc->bo->vm)
 		xe_vm_get(lrc->bo->vm);
 
-	snapshot->context_desc = xe_lrc_ggtt_addr(lrc);
-	snapshot->indirect_context_desc = xe_lrc_indirect_ring_ggtt_addr(lrc);
-	snapshot->head = xe_lrc_ring_head(lrc);
-	snapshot->tail.internal = lrc->ring.tail;
-	snapshot->tail.memory = xe_lrc_ring_tail(lrc);
-	snapshot->start_seqno = xe_lrc_start_seqno(lrc);
-	snapshot->seqno = xe_lrc_seqno(lrc);
-	snapshot->lrc_bo = xe_bo_get(lrc->bo);
-	snapshot->lrc_offset = xe_lrc_pphwsp_offset(lrc);
-	snapshot->lrc_size = lrc->bo->size - snapshot->lrc_offset;
-	snapshot->lrc_snapshot = NULL;
-	snapshot->ctx_timestamp = xe_lrc_ctx_timestamp(lrc);
-	snapshot->ctx_job_timestamp = xe_lrc_ctx_job_timestamp(lrc);
-	return snapshot;
+	if (lrc->bo) {
+		snapshot->context_desc = xe_lrc_ggtt_addr(lrc);
+		snapshot->indirect_context_desc = xe_lrc_indirect_ring_ggtt_addr(lrc);
+		snapshot->head = xe_lrc_ring_head(lrc);
+		snapshot->tail.internal = lrc->ring.tail;
+		snapshot->tail.memory = xe_lrc_ring_tail(lrc);
+		snapshot->start_seqno = xe_lrc_start_seqno(lrc);
+		snapshot->seqno = xe_lrc_seqno(lrc);
+		snapshot->lrc_bo = xe_bo_get(lrc->bo);
+		snapshot->lrc_offset = xe_lrc_pphwsp_offset(lrc);
+		snapshot->lrc_size = lrc->bo->size - snapshot->lrc_offset;
+		snapshot->lrc_snapshot = NULL;
+		snapshot->ctx_timestamp = xe_lrc_ctx_timestamp(lrc);
+		snapshot->ctx_job_timestamp = xe_lrc_ctx_job_timestamp(lrc);
+		return snapshot;
+	}
+	kfree(snapshot);
+	return NULL;
 }
 
 void xe_lrc_snapshot_capture_delayed(struct xe_lrc_snapshot *snapshot)
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [PATCH] drm/xe: Add NULL check before deferencing pointer
@ 2024-08-14 10:17 apoorva.singh
  2024-08-14 11:02 ` Nirmoy Das
  2024-08-14 11:21 ` Jani Nikula
  0 siblings, 2 replies; 15+ messages in thread
From: apoorva.singh @ 2024-08-14 10:17 UTC (permalink / raw)
  To: intel-xe; +Cc: Apoorva Singh

From: Apoorva Singh <apoorva.singh@intel.com>

- Add NULL check before deferencing of lrc->bo in
  xe_lrc_snapshot_capture()

Signed-off-by: Apoorva Singh <apoorva.singh@intel.com>
---
 drivers/gpu/drm/xe/xe_lrc.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 974a9cd8c379..e31d9bc64ff6 100644
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -1652,20 +1652,24 @@ struct xe_lrc_snapshot *xe_lrc_snapshot_capture(struct xe_lrc *lrc)
 	if (lrc->bo && lrc->bo->vm)
 		xe_vm_get(lrc->bo->vm);
 
-	snapshot->context_desc = xe_lrc_ggtt_addr(lrc);
-	snapshot->indirect_context_desc = xe_lrc_indirect_ring_ggtt_addr(lrc);
-	snapshot->head = xe_lrc_ring_head(lrc);
-	snapshot->tail.internal = lrc->ring.tail;
-	snapshot->tail.memory = xe_lrc_ring_tail(lrc);
-	snapshot->start_seqno = xe_lrc_start_seqno(lrc);
-	snapshot->seqno = xe_lrc_seqno(lrc);
-	snapshot->lrc_bo = xe_bo_get(lrc->bo);
-	snapshot->lrc_offset = xe_lrc_pphwsp_offset(lrc);
-	snapshot->lrc_size = lrc->bo->size - snapshot->lrc_offset;
-	snapshot->lrc_snapshot = NULL;
-	snapshot->ctx_timestamp = xe_lrc_ctx_timestamp(lrc);
-	snapshot->ctx_job_timestamp = xe_lrc_ctx_job_timestamp(lrc);
-	return snapshot;
+	if (lrc->bo) {
+		snapshot->context_desc = xe_lrc_ggtt_addr(lrc);
+		snapshot->indirect_context_desc = xe_lrc_indirect_ring_ggtt_addr(lrc);
+		snapshot->head = xe_lrc_ring_head(lrc);
+		snapshot->tail.internal = lrc->ring.tail;
+		snapshot->tail.memory = xe_lrc_ring_tail(lrc);
+		snapshot->start_seqno = xe_lrc_start_seqno(lrc);
+		snapshot->seqno = xe_lrc_seqno(lrc);
+		snapshot->lrc_bo = xe_bo_get(lrc->bo);
+		snapshot->lrc_offset = xe_lrc_pphwsp_offset(lrc);
+		snapshot->lrc_size = lrc->bo->size - snapshot->lrc_offset;
+		snapshot->lrc_snapshot = NULL;
+		snapshot->ctx_timestamp = xe_lrc_ctx_timestamp(lrc);
+		snapshot->ctx_job_timestamp = xe_lrc_ctx_job_timestamp(lrc);
+		return snapshot;
+	}
+	kfree(snapshot);
+	return NULL;
 }
 
 void xe_lrc_snapshot_capture_delayed(struct xe_lrc_snapshot *snapshot)
-- 
2.34.1


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

end of thread, other threads:[~2024-08-19  9:33 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-19  7:15 [PATCH] drm/xe: Add NULL check before deferencing pointer apoorva.singh
2024-08-19  7:22 ` ✓ CI.Patch_applied: success for drm/xe: Add NULL check before deferencing pointer (rev2) Patchwork
2024-08-19  7:22 ` ✓ CI.checkpatch: " Patchwork
2024-08-19  7:24 ` ✓ CI.KUnit: " Patchwork
2024-08-19  7:35 ` ✓ CI.Build: " Patchwork
2024-08-19  7:38 ` ✓ CI.Hooks: " Patchwork
2024-08-19  7:39 ` ✓ CI.checksparse: " Patchwork
2024-08-19  7:54 ` ✓ CI.BAT: " Patchwork
2024-08-19  8:58 ` [PATCH] drm/xe: Add NULL check before deferencing pointer Jani Nikula
2024-08-19  9:33   ` Singh, Apoorva
2024-08-19  8:59 ` ✓ CI.FULL: success for drm/xe: Add NULL check before deferencing pointer (rev2) Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2024-08-14 10:17 [PATCH] drm/xe: Add NULL check before deferencing pointer apoorva.singh
2024-08-14 11:02 ` Nirmoy Das
2024-08-14 16:42   ` Matthew Brost
2024-08-14 11:21 ` Jani Nikula

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