[PATCH] extcon: fix possible name leak in extcon_dev_register()

[PATCH] extcon: fix possible name leak in extcon_dev_register()

[Yaxiong Tian]

From: Yaxiong Tian <tianyaxiong@kylinos.cn>

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.

Signed-off-by: Yaxiong Tian <tianyaxiong@kylinos.cn>
---
 drivers/extcon/extcon.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index 6f7a60d2ed91..e7f55c021e56 100644
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -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);
-- 
2.25.1

RE: [PATCH] extcon: fix possible name leak in extcon_dev_register()

[Chanwoo Choi]

> -----Original Message-----
> From: Yaxiong Tian <iambestgod@outlook.com>
> Sent: Friday, November 24, 2023 10:49 AM
> To: myungjoo.ham@samsung.com; cw00.choi@samsung.com
> Cc: linux-kernel@vger.kernel.org; tianyaxiong@kylinos.cn
> Subject: [PATCH] extcon: fix possible name leak in extcon_dev_register()
> 
> From: Yaxiong Tian <tianyaxiong@kylinos.cn>
> 
> 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.
> 
> Signed-off-by: Yaxiong Tian <tianyaxiong@kylinos.cn>
> ---
>  drivers/extcon/extcon.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index
> 6f7a60d2ed91..e7f55c021e56 100644
> --- a/drivers/extcon/extcon.c
> +++ b/drivers/extcon/extcon.c
> @@ -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);
> --
> 2.25.1


Applied it. Thanks.

Best Regards,
Chanwoo Choi