Unverified Commit 3e25b4f1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

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

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Zucheng <zhengzucheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FW5B5SYBVOZVAZRHC3VOTNOJKVNBX6LQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBID2S 
 
Link:https://gitee.com/openeuler/kernel/pulls/15042

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 234a8718 29776fa6

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

+4 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 
	ret = adv7511_init_regulators(adv7511);

	if (ret) {

		dev_err(dev, "failed to init regulators\n");

		return ret;

		goto err_of_node_put;

	}



	/*
@@ -1235,6 +1235,8 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 
	i2c_unregister_device(adv7511->i2c_edid);

uninit_regulators:

	adv7511_uninit_regulators(adv7511);

err_of_node_put:

	of_node_put(adv7511->host_node);



	return ret;

}
@@ -1249,6 +1251,7 @@ static int adv7511_remove(struct i2c_client *i2c) 
	if (adv7511->cec_clk)

		clk_disable_unprepare(adv7511->cec_clk);



	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
@@ -210,8 +210,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");