xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/msm: Fix potential NULL dereference in DPU SSPP

Browse Source 
[ Upstream commit 8bf71a5719b6cc5b6ba358096081e5d50ea23ab6 ]

Move initialization of sblk in _sspp_subblk_offset() after NULL check to
avoid potential NULL pointer dereference.

Fixes: 25fdd5933e ("drm/msm: Add SDM845 DPU support")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jessica Zhang <jesszhan@codeaurora.org>
Link: https://lore.kernel.org/r/20211020175733.3379-1-jesszhan@codeaurora.org
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jessica Zhang
2021-10-20 10:57:33 -07:00
committed by Greg Kroah-Hartman
parent 6d1f3157aa
commit 807f01f60c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
View File

@@ -138,11 +138,13 @@ static int _sspp_subblk_offset(struct dpu_hw_pipe *ctx,
u32 *idx) u32 *idx)
{ {
int rc = 0; int rc = 0;
const struct dpu_sspp_sub_blks *sblk = ctx->cap->sblk; const struct dpu_sspp_sub_blks *sblk;
if (!ctx) if (!ctx || !ctx->cap || !ctx->cap->sblk)
return -EINVAL; return -EINVAL;
sblk = ctx->cap->sblk;
switch (s_id) { switch (s_id) {
case DPU_SSPP_SRC: case DPU_SSPP_SRC:
*idx = sblk->src_blk.base; *idx = sblk->src_blk.base;
@@ -419,7 +421,7 @@ static void _dpu_hw_sspp_setup_scaler3(struct dpu_hw_pipe *ctx,
(void)pe; (void)pe;
if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx) || !sspp if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx) || !sspp
|| !scaler3_cfg || !ctx || !ctx->cap || !ctx->cap->sblk) || !scaler3_cfg)
return; return;
dpu_hw_setup_scaler3(&ctx->hw, scaler3_cfg, idx, dpu_hw_setup_scaler3(&ctx->hw, scaler3_cfg, idx,