parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries

[PATCH] parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries

Posted by Miaoqian Lin 4 years, 5 months ago

kobject_init_and_add() takes reference even when it fails.
According to the doc of kobject_init_and_add()：

   If this function returns an error, kobject_put() must be called to
   properly clean up the memory associated with the object.

Fix memory leak by calling kobject_put().

Fixes: 73f368cf679b ("Kobject: change drivers/parisc/pdc_stable.c to use kobject_init_and_add")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/parisc/pdc_stable.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 9513c39719d1..d9e51036a4fa 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -980,8 +980,10 @@ pdcs_register_pathentries(void)
 		entry->kobj.kset = paths_kset;
 		err = kobject_init_and_add(&entry->kobj, &ktype_pdcspath, NULL,
 					   "%s", entry->name);
-		if (err)
+		if (err) {
+			kobject_put(&entry->kobj);
 			return err;
+		}
 
 		/* kobject is now registered */
 		write_lock(&entry->rw_lock);
-- 
2.17.1

Re: [PATCH] parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries

Posted by Helge Deller 4 years, 5 months ago

On 1/20/22 13:18, Miaoqian Lin wrote:
> kobject_init_and_add() takes reference even when it fails.
> According to the doc of kobject_init_and_add()：
>
>    If this function returns an error, kobject_put() must be called to
>    properly clean up the memory associated with the object.
>
> Fix memory leak by calling kobject_put().
>
> Fixes: 73f368cf679b ("Kobject: change drivers/parisc/pdc_stable.c to use kobject_init_and_add")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>

applied.
Thanks!
Helge


> ---
>  drivers/parisc/pdc_stable.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
> index 9513c39719d1..d9e51036a4fa 100644
> --- a/drivers/parisc/pdc_stable.c
> +++ b/drivers/parisc/pdc_stable.c
> @@ -980,8 +980,10 @@ pdcs_register_pathentries(void)
>  		entry->kobj.kset = paths_kset;
>  		err = kobject_init_and_add(&entry->kobj, &ktype_pdcspath, NULL,
>  					   "%s", entry->name);
> -		if (err)
> +		if (err) {
> +			kobject_put(&entry->kobj);
>  			return err;
> +		}
>
>  		/* kobject is now registered */
>  		write_lock(&entry->rw_lock);
>