diff options
| author |   Jeykumar Sankaran <jsanka@codeaurora.org> | 2018-08-07 19:56:51 -0700 |
|---|---|---|
| committer |   Rob Clark <robdclark@gmail.com> | 2018-08-10 18:49:18 -0400 |
| commit | 77a209cd7153cd758aa1b1417fb10017bead9454 (patch) | |
| tree | 5d2edeb2e8eb075757262063a1fb4b9990589bb5 /drivers/gpu/drm/msm/disp/dpu1 | |
| parent | drm/msm/adreno: Remove VLA usage (diff) | |
| download | linux-dev-77a209cd7153cd758aa1b1417fb10017bead9454.tar.xz linux-dev-77a209cd7153cd758aa1b1417fb10017bead9454.zip | |
drm/msm/disp/dpu: fix early dereference of physical encoder
This change validates the physical encoder before it
is dereferenced.
Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/disp/dpu1')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 0922d3536412..1b4de3486ef9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -2444,6 +2444,8 @@ int dpu_encoder_wait_for_event(struct drm_encoder *drm_enc, for (i = 0; i < dpu_enc->num_phys_encs; i++) { struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; + if (!phys) + continue; switch (event) { case MSM_ENC_COMMIT_DONE: @@ -2461,7 +2463,7 @@ int dpu_encoder_wait_for_event(struct drm_encoder *drm_enc, return -EINVAL; }; - if (phys && fn_wait) { + if (fn_wait) { DPU_ATRACE_BEGIN("wait_for_completion_event"); ret = fn_wait(phys); DPU_ATRACE_END("wait_for_completion_event"); |