samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/msm/sde: add check to fix null pointer dereference

Browse Source 
Check if sde_enc->crtc exists before using the variable
to avoid possible NULL dereferences.

Change-Id: If7b56c3b3ad3525b3efc22b6536a2dc5c865da48
Signed-off-by: Lei Chen <chenlei@codeaurora.org>
This commit is contained in:
Lei Chen
2021-07-06 19:06:20 +08:00
committed by Gerrit - the friendly Code Review server
parent 6a01182c1e
commit 79d30e7fba
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
msm/sde/sde_encoder.c
View File

@@ -3109,7 +3109,7 @@ static void sde_encoder_virt_disable(struct drm_encoder *drm_enc)
/* reset connector topology name property */ /* reset connector topology name property */
if (sde_enc->cur_master && sde_enc->cur_master->connector && if (sde_enc->cur_master && sde_enc->cur_master->connector &&
sde_enc->crtc->state->active_changed) { sde_enc->crtc && sde_enc->crtc->state->active_changed) {
ret = sde_rm_update_topology(&sde_kms->rm, ret = sde_rm_update_topology(&sde_kms->rm,
sde_enc->cur_master->connector->state, NULL); sde_enc->cur_master->connector->state, NULL);
if (ret) { if (ret) {
@@ -5531,6 +5531,8 @@ int sde_encoder_update_caps_for_cont_splash(struct drm_encoder *encoder,
conn->base.id); conn->base.id);
} }
sde_enc->crtc = encoder->crtc;
ret = sde_rm_reserve(&sde_kms->rm, encoder, encoder->crtc->state, ret = sde_rm_reserve(&sde_kms->rm, encoder, encoder->crtc->state,
conn->state, false); conn->state, false);
if (ret) { if (ret) {