diff mbox series

[v2,1/1] drm/msm/a6xx: Fix null pointer access in a6xx_get_indexed_registers

Message ID 20220726044446.21102-2-quic_ddhamara@quicinc.com
State New
Headers show
Series [v2,1/1] drm/msm/a6xx: Fix null pointer access in a6xx_get_indexed_registers | expand

Commit Message

quic_ddhamara@quicinc.com July 26, 2022, 4:44 a.m. UTC 
From: Akhil P Oommen <quic_akhilpo@quicinc.com>

Fix a null pointer access when memory allocation fails in
a6xx_get_indexed_registers().

Change-Id: I33e13745cd8e5841d2f377f48a199af98be2ed02
Signed-off-by: Akhil P Oommen <quic_akhilpo@quicinc.com>
Signed-off-by: Devi prasad Dhamarasingi <quic_ddhamara@quicinc.com>
---

Changes in v2:
- Corrected the signoff name and email id.

 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 6 ++++++
 1 file changed, 6 insertions(+)
diff mbox series

Patch

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
index 55f443328d8e..507074f6222c 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
@@ -952,6 +952,12 @@  static void a6xx_get_indexed_registers(struct msm_gpu *gpu,
 	a6xx_get_indexed_regs(gpu, a6xx_state, &a6xx_cp_mempool_indexed,
 		&a6xx_state->indexed_regs[i]);
 
+	if (!a6xx_state->indexed_regs[i].data) {
+		gpu_write(gpu, REG_A6XX_CP_MEM_POOL_SIZE, mempool_size);
+		a6xx_state->nr_indexed_regs = count - 1;
+		return;
+	}
+
 	/*
 	 * Offset 0x2000 in the mempool is the size - copy the saved size over
 	 * so the data is consistent