From 14364f2db4aa8096b0d771f2a94705d062fa7374 Mon Sep 17 00:00:00 2001 From: Gaurav LNU Date: Sun, 12 Mar 2023 22:06:36 -0700 Subject: [PATCH 1/2] disp: msm: sde: out of bounds check for phys_encs array Check for array out of bounds while accessing phys_encs lists. Change-Id: If0af4bd274df5729d8edb62199cbd848586ef0d7 Signed-off-by: Gaurav LNU --- msm/sde/sde_encoder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/msm/sde/sde_encoder.c b/msm/sde/sde_encoder.c index b06ffe37..7b829611 100644 --- a/msm/sde/sde_encoder.c +++ b/msm/sde/sde_encoder.c @@ -3323,7 +3323,8 @@ static void sde_encoder_wait_for_vsync_event_complete(struct sde_encoder_virt *s if (!ret) { SDE_ERROR("vsync event complete timed out %d\n", ret); SDE_EVT32(ret, SDE_EVTLOG_ERROR); - for (i = 0; i < sde_enc->num_phys_encs; i++) { + for (i = 0; (i < sde_enc->num_phys_encs && + i < ARRAY_SIZE(sde_enc->phys_encs)) ; i++) { struct sde_encoder_phys *phys = sde_enc->phys_encs[i]; if (phys && phys->ops.control_vblank_irq) From fca50d4695f1357e277ea4b3d149246e61fa1e7b Mon Sep 17 00:00:00 2001 From: Rajeev Nandan Date: Wed, 15 Mar 2023 17:21:38 +0530 Subject: [PATCH 2/2] disp: msm: dsi: fix the typo in cmd dma trigger pasring Fix the error message typo in dsi cmd dma trigger parsing. Change-Id: I4ee1bfc05197e371270ec421ebd37c1386015274 Signed-off-by: Rajeev Nandan --- msm/dsi/dsi_panel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c index 40394f4e..7fa8919c 100644 --- a/msm/dsi/dsi_panel.c +++ b/msm/dsi/dsi_panel.c @@ -1108,13 +1108,13 @@ static int dsi_panel_parse_triggers(struct dsi_host_common_cfg *host, } else if (!strcmp(trig, "trigger_sw_te")) { host->dma_cmd_trigger = DSI_TRIGGER_SW_TE; } else { - DSI_ERR("[%s] Unrecognized mdp trigger type (%s)\n", + DSI_ERR("[%s] Unrecognized cmd dma trigger type (%s)\n", name, trig); rc = -EINVAL; } } else { - DSI_DEBUG("[%s] Falling back to default MDP trigger\n", name); + DSI_DEBUG("[%s] Falling back to default cmd dma trigger\n", name); host->dma_cmd_trigger = DSI_TRIGGER_SW; }