lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 248/779] drm/meson: encoder_hdmi: Fix refcount leak in meson_encoder_hdmi_init
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit d82a5a4aae9d0203234737caed1bf470aa317568 ]

    of_graph_get_remote_node() returns remote device nodepointer with
    refcount incremented, we should use of_node_put() on it when done.
    Add missing of_node_put() to avoid refcount leak.

    Fixes: e67f6037ae1b ("drm/meson: split out encoder from meson_dw_hdmi")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
    Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20220601033927.47814-3-linmq006@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/meson/meson_encoder_hdmi.c | 15 +++++++++++----
    1 file changed, 11 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
    index 5e306de6f485..0d532e8e8cca 100644
    --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
    +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
    @@ -365,7 +365,8 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
    meson_encoder_hdmi->next_bridge = of_drm_find_bridge(remote);
    if (!meson_encoder_hdmi->next_bridge) {
    dev_err(priv->dev, "Failed to find HDMI transceiver bridge\n");
    - return -EPROBE_DEFER;
    + ret = -EPROBE_DEFER;
    + goto err_put_node;
    }

    /* HDMI Encoder Bridge */
    @@ -383,7 +384,7 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
    DRM_MODE_ENCODER_TMDS);
    if (ret) {
    dev_err(priv->dev, "Failed to init HDMI encoder: %d\n", ret);
    - return ret;
    + goto err_put_node;
    }

    meson_encoder_hdmi->encoder.possible_crtcs = BIT(0);
    @@ -393,7 +394,7 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
    DRM_BRIDGE_ATTACH_NO_CONNECTOR);
    if (ret) {
    dev_err(priv->dev, "Failed to attach bridge: %d\n", ret);
    - return ret;
    + goto err_put_node;
    }

    /* Initialize & attach Bridge Connector */
    @@ -401,7 +402,8 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
    &meson_encoder_hdmi->encoder);
    if (IS_ERR(meson_encoder_hdmi->connector)) {
    dev_err(priv->dev, "Unable to create HDMI bridge connector\n");
    - return PTR_ERR(meson_encoder_hdmi->connector);
    + ret = PTR_ERR(meson_encoder_hdmi->connector);
    + goto err_put_node;
    }
    drm_connector_attach_encoder(meson_encoder_hdmi->connector,
    &meson_encoder_hdmi->encoder);
    @@ -428,6 +430,7 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
    meson_encoder_hdmi->connector->ycbcr_420_allowed = true;

    pdev = of_find_device_by_node(remote);
    + of_node_put(remote);
    if (pdev) {
    struct cec_connector_info conn_info;
    struct cec_notifier *notifier;
    @@ -444,4 +447,8 @@ int meson_encoder_hdmi_init(struct meson_drm *priv)
    dev_dbg(priv->dev, "HDMI encoder initialized\n");

    return 0;
    +
    +err_put_node:
    + of_node_put(remote);
    + return ret;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 20:47    [W:2.161 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site