Skip to content

Commit

Permalink
drm/msm/dpu: invalid parameter check in dpu_setup_dspp_pcc
Browse files Browse the repository at this point in the history
The function performs a check on the "ctx" input parameter, however, it
is used before the check.

Initialize the "base" variable after the sanity check to avoid a
possible NULL pointer dereference.

Fixes: 4259ff7 ("drm/msm/dpu: add support for pcc color block in dpu driver")
Addresses-Coverity-ID: 1493866 ("Null pointer dereference")
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Link: https://lore.kernel.org/r/20220109192431.135949-1-jose.exposito89@gmail.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
  • Loading branch information
José Expósito authored and Dmitry Baryshkov committed Jan 25, 2022
1 parent 774fe0c commit 170b222
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,16 @@ static void dpu_setup_dspp_pcc(struct dpu_hw_dspp *ctx,
struct dpu_hw_pcc_cfg *cfg)
{

u32 base = ctx->cap->sblk->pcc.base;
u32 base;

if (!ctx || !base) {
if (!ctx) {
DRM_ERROR("invalid ctx %pK\n", ctx);
return;
}

base = ctx->cap->sblk->pcc.base;

if (!base) {
DRM_ERROR("invalid ctx %pK pcc base 0x%x\n", ctx, base);
return;
}
Expand Down

0 comments on commit 170b222

Please sign in to comment.