lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 434/639] drm/msm/mdp5: Fix mdp5_cfg_init error return
    Date
    From: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>

    [ Upstream commit fc19cbb785d7bbd1a1af26229b5240a3ab332744 ]

    If mdp5_cfg_init fails because of an unknown major version, a null pointer
    dereference occurs. This is because the caller of init expects error
    pointers, but init returns NULL on error. Fix this by returning the
    expected values on error.

    Fixes: 2e362e1772b8 (drm/msm/mdp5: introduce mdp5_cfg module)
    Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Rob Clark <robdclark@chromium.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
    index 824067d2d4277..42f0ecb0cf35f 100644
    --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
    +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
    @@ -635,7 +635,7 @@ fail:
    if (cfg_handler)
    mdp5_cfg_destroy(cfg_handler);

    - return NULL;
    + return ERR_PTR(ret);
    }

    static struct mdp5_cfg_platform *mdp5_get_config(struct platform_device *dev)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:25    [W:2.427 / U:1.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site