openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jeykumar Sankaran 2018-08-07 19:56:51 -07:00 committed by Rob Clark
parent bec2dd6969
commit 77a209cd71
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
View File

@ -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++) { for (i = 0; i < dpu_enc->num_phys_encs; i++) {
struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
if (!phys)
continue;
switch (event) { switch (event) {
case MSM_ENC_COMMIT_DONE: case MSM_ENC_COMMIT_DONE:
@ -2461,7 +2463,7 @@ int dpu_encoder_wait_for_event(struct drm_encoder *drm_enc,
return -EINVAL; return -EINVAL;
}; };
if (phys && fn_wait) { if (fn_wait) {
DPU_ATRACE_BEGIN("wait_for_completion_event"); DPU_ATRACE_BEGIN("wait_for_completion_event");
ret = fn_wait(phys); ret = fn_wait(phys);
DPU_ATRACE_END("wait_for_completion_event"); DPU_ATRACE_END("wait_for_completion_event");