extcon: fix possible name leak in extcon_dev_register()
[ Upstream commit e66523c72c9aae0ff0dae6859eb77b04de1e8e5f ] In the error path after calling dev_set_name(), the device name is leaked. To fix this, moving dev_set_name() after the error path and before device_register. Link: https://lore.kernel.org/lkml/TYZPR01MB4784ADCD3E951E0863F3DB72D5B8A@TYZPR01MB4784.apcprd01.prod.exchangelabs.com/ Signed-off-by: Yaxiong Tian <tianyaxiong@kylinos.cn> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
7c5276c44d
commit
8b755fc728
@ -1280,8 +1280,6 @@ int extcon_dev_register(struct extcon_dev *edev)
|
||||
|
||||
edev->id = ret;
|
||||
|
||||
dev_set_name(&edev->dev, "extcon%d", edev->id);
|
||||
|
||||
ret = extcon_alloc_cables(edev);
|
||||
if (ret < 0)
|
||||
goto err_alloc_cables;
|
||||
@ -1310,6 +1308,7 @@ int extcon_dev_register(struct extcon_dev *edev)
|
||||
RAW_INIT_NOTIFIER_HEAD(&edev->nh_all);
|
||||
|
||||
dev_set_drvdata(&edev->dev, edev);
|
||||
dev_set_name(&edev->dev, "extcon%d", edev->id);
|
||||
edev->state = 0;
|
||||
|
||||
ret = device_register(&edev->dev);
|
||||
|
Loading…
x
Reference in New Issue
Block a user