lkml.org 
[lkml]   [2021]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 09/24] drm/bridge/analogix/anx78xx: Cleanup on error in anx78xx_bridge_attach()
    Date
    From: Lyude Paul <lyude@redhat.com>

    [ Upstream commit 212ee8db84600f7b279b8645c62a112bff310995 ]

    Just another issue I noticed while correcting usages of
    drm_dp_aux_init()/drm_dp_aux_register() around the tree. If any of the
    steps in anx78xx_bridge_attach() fail, we end up leaking resources. So,
    let's fix that (and fix leaking a DP AUX adapter in the process) by
    unrolling on errors.

    Signed-off-by: Lyude Paul <lyude@redhat.com>
    Reviewed-by: Robert Foss <robert.foss@linaro.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210219215326.2227596-10-lyude@redhat.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/bridge/analogix-anx78xx.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
    index 16babacb7cf0..5a1121af6664 100644
    --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
    +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
    @@ -1039,7 +1039,7 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge)
    DRM_MODE_CONNECTOR_DisplayPort);
    if (err) {
    DRM_ERROR("Failed to initialize connector: %d\n", err);
    - return err;
    + goto aux_unregister;
    }

    drm_connector_helper_add(&anx78xx->connector,
    @@ -1051,16 +1051,21 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge)
    bridge->encoder);
    if (err) {
    DRM_ERROR("Failed to link up connector to encoder: %d\n", err);
    - return err;
    + goto connector_cleanup;
    }

    err = drm_connector_register(&anx78xx->connector);
    if (err) {
    DRM_ERROR("Failed to register connector: %d\n", err);
    - return err;
    + goto connector_cleanup;
    }

    return 0;
    +connector_cleanup:
    + drm_connector_cleanup(&anx78xx->connector);
    +aux_unregister:
    + drm_dp_aux_unregister(&anx78xx->aux);
    + return err;
    }

    static bool anx78xx_bridge_mode_fixup(struct drm_bridge *bridge,
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-05-03 19:39    [W:3.886 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site