drm/msm: Fix null pointer dereferences without iommu

[ Upstream commit 36a1d1bda77e1851bddfa9cf4e8ada94476dbaff ]

Check if 'aspace' is set before using it as it will stay null without
IOMMU, such as on msm8974.

Fixes: bc2112583a0b ("drm/msm/gpu: Track global faults per address-space")
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Link: https://lore.kernel.org/r/20220421203455.313523-1-luca@z3ntu.xyz
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 9efc84929be0b5cc1a06a5e6a5bbf00d0f3e3445..1219f71629a52aa1f5f3d3db6204f8e37741c91f 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -272,7 +272,10 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx,
                *value = 0;
                return 0;
        case MSM_PARAM_FAULTS:
-               *value = gpu->global_faults + ctx->aspace->faults;
+               if (ctx->aspace)
+                       *value = gpu->global_faults + ctx->aspace->faults;
+               else
+                       *value = gpu->global_faults;
                return 0;
        case MSM_PARAM_SUSPENDS:
                *value = gpu->suspend_count;

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index faf0c242874e8382013bcd0d88c9413034ac786d..58eb3e1662cb9480792f48316da1e99df6918730 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -371,7 +371,8 @@ static void recover_worker(struct kthread_work *work)
 
                /* Increment the fault counts */
                submit->queue->faults++;
-               submit->aspace->faults++;
+               if (submit->aspace)
+                       submit->aspace->faults++;
 
                task = get_pid_task(submit->pid, PIDTYPE_PID);
                if (task) {