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 018/639] drm/sti: do not remove the drm_bridge that was never added
    Date
    From: Peter Rosin <peda@axentia.se>

    [ Upstream commit 66e31a72dc38543b2d9d1ce267dc78ba9beebcfd ]

    Removing the drm_bridge_remove call should avoid a NULL dereference
    during list processing in drm_bridge_remove if the error path is ever
    taken.

    The more natural approach would perhaps be to add a drm_bridge_add,
    but there are several other bridges that never call drm_bridge_add.
    Just removing the drm_bridge_remove is the easier fix.

    Fixes: 84601dbdea36 ("drm: sti: rework init sequence")
    Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Peter Rosin <peda@axentia.se>
    Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/20180806061910.29914-2-peda@axentia.se
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/sti/sti_hda.c | 1 -
    drivers/gpu/drm/sti/sti_hdmi.c | 1 -
    2 files changed, 2 deletions(-)

    diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
    index 49438337f70dc..19b9b5ed12970 100644
    --- a/drivers/gpu/drm/sti/sti_hda.c
    +++ b/drivers/gpu/drm/sti/sti_hda.c
    @@ -721,7 +721,6 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
    return 0;

    err_sysfs:
    - drm_bridge_remove(bridge);
    return -EINVAL;
    }

    diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
    index 34cdc46444350..ccf718404a1c2 100644
    --- a/drivers/gpu/drm/sti/sti_hdmi.c
    +++ b/drivers/gpu/drm/sti/sti_hdmi.c
    @@ -1315,7 +1315,6 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
    return 0;

    err_sysfs:
    - drm_bridge_remove(bridge);
    hdmi->drm_connector = NULL;
    return -EINVAL;
    }
    --
    2.20.1


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