Commit a4ab05bc authored by Biju Das's avatar Biju Das Committed by Wen Zhiwei
Browse files

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

stable inclusion
from stable-v6.6.70
commit 1f49aaf55652580ae63ab83d67211fe6a55d83dc
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBOHV1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1f49aaf55652580ae63ab83d67211fe6a55d83dc



--------------------------------

commit 81adbd3ff21c1182e06aa02c6be0bfd9ea02d8e8 upstream.

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: 1e4d58cd ("drm/bridge: adv7533: Create a MIPI DSI device")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarBiju 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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 232b8a4d

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+8 −2
Original line number Diff line number Diff line
@@ -1225,8 +1225,10 @@ static int adv7511_probe(struct i2c_client *i2c) 
		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
@@ -1346,6 +1348,8 @@ static int adv7511_probe(struct i2c_client *i2c) 
	i2c_unregister_device(adv7511->i2c_edid);

uninit_regulators:

	adv7511_uninit_regulators(adv7511);

err_of_node_put:

	of_node_put(adv7511->host_node);



	return ret;

}
@@ -1354,6 +1358,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);

drivers/gpu/drm/bridge/adv7511/adv7533.c

+0 −2
Original line number Diff line number Diff line
@@ -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");