drm: adv7511: Fix use-after-free in adv7533_attach_dsi()

[ Upstream commit 81adbd3ff21c1182e06aa02c6be0bfd9ea02d8e8 ]

The host_node pointer was assigned and freed in adv7533_parse_dt(), and
later, adv7533_attach_dsi() uses the same. Fix this use-after-free issue
by dropping of_node_put() in adv7533_parse_dt() and calling of_node_put()
in error path of probe() and also in the remove().

Fixes: 1e4d58cd7f88 ("drm/bridge: adv7533: Create a MIPI DSI device")
Cc: stable@vger.kernel.org
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241119192040.152657-2-biju.das.jz@bp.renesas.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index cb6923eed7ca0c1dfe022a982e0fcf605281544b..3e6fe86049599a8adee40e31a3011fbccc563832 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -1224,8 +1224,10 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
                return ret;
 
        ret = adv7511_init_regulators(adv7511);
-       if (ret)
-               return dev_err_probe(dev, ret, "failed to init regulators\n");
+       if (ret) {
+               dev_err_probe(dev, ret, "failed to init regulators\n");
+               goto err_of_node_put;
+       }
 
        /*
         * The power down GPIO is optional. If present, toggle it from active to
@@ -1345,6 +1347,8 @@ err_i2c_unregister_edid:
        i2c_unregister_device(adv7511->i2c_edid);
 uninit_regulators:
        adv7511_uninit_regulators(adv7511);
+err_of_node_put:
+       of_node_put(adv7511->host_node);
 
        return ret;
 }
@@ -1353,6 +1357,8 @@ static void adv7511_remove(struct i2c_client *i2c)
 {
        struct adv7511 *adv7511 = i2c_get_clientdata(i2c);
 
+       of_node_put(adv7511->host_node);
+
        adv7511_uninit_regulators(adv7511);
 
        drm_bridge_remove(&adv7511->bridge);

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7533.c b/drivers/gpu/drm/bridge/adv7511/adv7533.c
index 3a79297ca980462613a439f5da7e39307decd5bb..6a4733c70827002d1b793f39e715806af67287ff 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7533.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7533.c
@@ -184,8 +184,6 @@ int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv)
        if (!adv->host_node)
                return -ENODEV;
 
-       of_node_put(adv->host_node);
-
        adv->use_timing_gen = !of_property_read_bool(np,
                                                "adi,disable-timing-generator");