* [PATCH] cxl: Fix kobject memleak
@ 2020-06-02 12:07 ` Wang Hai
0 siblings, 0 replies; 10+ messages in thread
From: Wang Hai @ 2020-06-02 12:07 UTC (permalink / raw)
To: fbarrat, ajd, arnd, gregkh
Cc: mpe, imunsie, linuxppc-dev, linux-kernel, wanghai38
Currently the error return path from kobject_init_and_add() is not
followed by a call to kobject_put() - which means we are leaking
the kobject.
Fix it by adding a call to kobject_put() in the error path of
kobject_init_and_add().
Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record in sysfs")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
---
drivers/misc/cxl/sysfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c
index f0263d1..d97a243 100644
--- a/drivers/misc/cxl/sysfs.c
+++ b/drivers/misc/cxl/sysfs.c
@@ -624,7 +624,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c
rc = kobject_init_and_add(&cr->kobj, &afu_config_record_type,
&afu->dev.kobj, "cr%i", cr->cr);
if (rc)
- goto err;
+ goto err1;
rc = sysfs_create_bin_file(&cr->kobj, &cr->config_attr);
if (rc)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] cxl: Fix kobject memleak
@ 2020-06-02 12:07 ` Wang Hai
0 siblings, 0 replies; 10+ messages in thread
From: Wang Hai @ 2020-06-02 12:07 UTC (permalink / raw)
To: fbarrat, ajd, arnd, gregkh; +Cc: wanghai38, linuxppc-dev, imunsie, linux-kernel
Currently the error return path from kobject_init_and_add() is not
followed by a call to kobject_put() - which means we are leaking
the kobject.
Fix it by adding a call to kobject_put() in the error path of
kobject_init_and_add().
Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record in sysfs")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
---
drivers/misc/cxl/sysfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c
index f0263d1..d97a243 100644
--- a/drivers/misc/cxl/sysfs.c
+++ b/drivers/misc/cxl/sysfs.c
@@ -624,7 +624,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c
rc = kobject_init_and_add(&cr->kobj, &afu_config_record_type,
&afu->dev.kobj, "cr%i", cr->cr);
if (rc)
- goto err;
+ goto err1;
rc = sysfs_create_bin_file(&cr->kobj, &cr->config_attr);
if (rc)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] cxl: Fix kobject memleak
2020-06-02 12:07 ` Wang Hai
@ 2020-06-02 16:21 ` Frederic Barrat
-1 siblings, 0 replies; 10+ messages in thread
From: Frederic Barrat @ 2020-06-02 16:21 UTC (permalink / raw)
To: Wang Hai, ajd, arnd, gregkh; +Cc: mpe, imunsie, linuxppc-dev, linux-kernel
Le 02/06/2020 à 14:07, Wang Hai a écrit :
> Currently the error return path from kobject_init_and_add() is not
> followed by a call to kobject_put() - which means we are leaking
> the kobject.
>
> Fix it by adding a call to kobject_put() in the error path of
> kobject_init_and_add().
>
> Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record in sysfs")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
Indeed, a call to kobject_put() is needed when the init fails.
Thanks!
Acked-by: Frederic Barrat <fbarrat@linux.ibm.com>
> ---
> drivers/misc/cxl/sysfs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c
> index f0263d1..d97a243 100644
> --- a/drivers/misc/cxl/sysfs.c
> +++ b/drivers/misc/cxl/sysfs.c
> @@ -624,7 +624,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c
> rc = kobject_init_and_add(&cr->kobj, &afu_config_record_type,
> &afu->dev.kobj, "cr%i", cr->cr);
> if (rc)
> - goto err;
> + goto err1;
>
> rc = sysfs_create_bin_file(&cr->kobj, &cr->config_attr);
> if (rc)
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cxl: Fix kobject memleak
@ 2020-06-02 16:21 ` Frederic Barrat
0 siblings, 0 replies; 10+ messages in thread
From: Frederic Barrat @ 2020-06-02 16:21 UTC (permalink / raw)
To: Wang Hai, ajd, arnd, gregkh; +Cc: linuxppc-dev, imunsie, linux-kernel
Le 02/06/2020 à 14:07, Wang Hai a écrit :
> Currently the error return path from kobject_init_and_add() is not
> followed by a call to kobject_put() - which means we are leaking
> the kobject.
>
> Fix it by adding a call to kobject_put() in the error path of
> kobject_init_and_add().
>
> Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record in sysfs")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
Indeed, a call to kobject_put() is needed when the init fails.
Thanks!
Acked-by: Frederic Barrat <fbarrat@linux.ibm.com>
> ---
> drivers/misc/cxl/sysfs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c
> index f0263d1..d97a243 100644
> --- a/drivers/misc/cxl/sysfs.c
> +++ b/drivers/misc/cxl/sysfs.c
> @@ -624,7 +624,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c
> rc = kobject_init_and_add(&cr->kobj, &afu_config_record_type,
> &afu->dev.kobj, "cr%i", cr->cr);
> if (rc)
> - goto err;
> + goto err1;
>
> rc = sysfs_create_bin_file(&cr->kobj, &cr->config_attr);
> if (rc)
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cxl: Fix kobject memleak
2020-06-02 12:07 ` Wang Hai
@ 2020-06-03 11:33 ` Andrew Donnellan
-1 siblings, 0 replies; 10+ messages in thread
From: Andrew Donnellan @ 2020-06-03 11:33 UTC (permalink / raw)
To: Wang Hai, fbarrat, arnd, gregkh; +Cc: mpe, imunsie, linuxppc-dev, linux-kernel
On 2/6/20 10:07 pm, Wang Hai wrote:
> Currently the error return path from kobject_init_and_add() is not
> followed by a call to kobject_put() - which means we are leaking
> the kobject.
>
> Fix it by adding a call to kobject_put() in the error path of
> kobject_init_and_add().
>
> Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record in sysfs")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
Thanks for the fix!
I note that the err1 label returns without calling kfree(cr) and I can't
see a reason why we do that - so perhaps we should remove the return
statement in err1: so it falls through?
--
Andrew Donnellan OzLabs, ADL Canberra
ajd@linux.ibm.com IBM Australia Limited
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cxl: Fix kobject memleak
@ 2020-06-03 11:33 ` Andrew Donnellan
0 siblings, 0 replies; 10+ messages in thread
From: Andrew Donnellan @ 2020-06-03 11:33 UTC (permalink / raw)
To: Wang Hai, fbarrat, arnd, gregkh; +Cc: linuxppc-dev, imunsie, linux-kernel
On 2/6/20 10:07 pm, Wang Hai wrote:
> Currently the error return path from kobject_init_and_add() is not
> followed by a call to kobject_put() - which means we are leaking
> the kobject.
>
> Fix it by adding a call to kobject_put() in the error path of
> kobject_init_and_add().
>
> Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record in sysfs")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
Thanks for the fix!
I note that the err1 label returns without calling kfree(cr) and I can't
see a reason why we do that - so perhaps we should remove the return
statement in err1: so it falls through?
--
Andrew Donnellan OzLabs, ADL Canberra
ajd@linux.ibm.com IBM Australia Limited
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cxl: Fix kobject memleak
2020-06-03 11:33 ` Andrew Donnellan
@ 2020-06-03 11:57 ` wanghai (M)
-1 siblings, 0 replies; 10+ messages in thread
From: wanghai (M) @ 2020-06-03 11:57 UTC (permalink / raw)
To: Andrew Donnellan, fbarrat, arnd, gregkh
Cc: mpe, imunsie, linuxppc-dev, linux-kernel
在 2020/6/3 19:33, Andrew Donnellan 写道:
> On 2/6/20 10:07 pm, Wang Hai wrote:
>> Currently the error return path from kobject_init_and_add() is not
>> followed by a call to kobject_put() - which means we are leaking
>> the kobject.
>>
>> Fix it by adding a call to kobject_put() in the error path of
>> kobject_init_and_add().
>>
>> Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record
>> in sysfs")
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: Wang Hai <wanghai38@huawei.com>
>
> Thanks for the fix!
>
> I note that the err1 label returns without calling kfree(cr) and I
> can't see a reason why we do that - so perhaps we should remove the
> return statement in err1: so it falls through?
>
kfree(cr) can be called when
kobject_put()-->kobject_release()-->kobject_cleanup()-->kobj_type->release()
is called. The kobj_type here is afu_config_record_type
Thanks,
Wang Hai
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cxl: Fix kobject memleak
@ 2020-06-03 11:57 ` wanghai (M)
0 siblings, 0 replies; 10+ messages in thread
From: wanghai (M) @ 2020-06-03 11:57 UTC (permalink / raw)
To: Andrew Donnellan, fbarrat, arnd, gregkh
Cc: linuxppc-dev, imunsie, linux-kernel
在 2020/6/3 19:33, Andrew Donnellan 写道:
> On 2/6/20 10:07 pm, Wang Hai wrote:
>> Currently the error return path from kobject_init_and_add() is not
>> followed by a call to kobject_put() - which means we are leaking
>> the kobject.
>>
>> Fix it by adding a call to kobject_put() in the error path of
>> kobject_init_and_add().
>>
>> Fixes: b087e6190ddc ("cxl: Export optional AFU configuration record
>> in sysfs")
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: Wang Hai <wanghai38@huawei.com>
>
> Thanks for the fix!
>
> I note that the err1 label returns without calling kfree(cr) and I
> can't see a reason why we do that - so perhaps we should remove the
> return statement in err1: so it falls through?
>
kfree(cr) can be called when
kobject_put()-->kobject_release()-->kobject_cleanup()-->kobj_type->release()
is called. The kobj_type here is afu_config_record_type
Thanks,
Wang Hai
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cxl: Fix kobject memleak
2020-06-03 11:57 ` wanghai (M)
@ 2020-06-04 0:08 ` Andrew Donnellan
-1 siblings, 0 replies; 10+ messages in thread
From: Andrew Donnellan @ 2020-06-04 0:08 UTC (permalink / raw)
To: wanghai (M), fbarrat, arnd, gregkh
Cc: mpe, imunsie, linuxppc-dev, linux-kernel
On 3/6/20 9:57 pm, wanghai (M) wrote:
> kfree(cr) can be called when
> kobject_put()-->kobject_release()-->kobject_cleanup()-->kobj_type->release()
> is called. The kobj_type here is afu_config_record_type
Of course, I missed that.
In that case
Acked-by: Andrew Donnellan <ajd@linux.ibm.com>
Thanks for the fix!
--
Andrew Donnellan OzLabs, ADL Canberra
ajd@linux.ibm.com IBM Australia Limited
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cxl: Fix kobject memleak
@ 2020-06-04 0:08 ` Andrew Donnellan
0 siblings, 0 replies; 10+ messages in thread
From: Andrew Donnellan @ 2020-06-04 0:08 UTC (permalink / raw)
To: wanghai (M), fbarrat, arnd, gregkh; +Cc: linuxppc-dev, imunsie, linux-kernel
On 3/6/20 9:57 pm, wanghai (M) wrote:
> kfree(cr) can be called when
> kobject_put()-->kobject_release()-->kobject_cleanup()-->kobj_type->release()
> is called. The kobj_type here is afu_config_record_type
Of course, I missed that.
In that case
Acked-by: Andrew Donnellan <ajd@linux.ibm.com>
Thanks for the fix!
--
Andrew Donnellan OzLabs, ADL Canberra
ajd@linux.ibm.com IBM Australia Limited
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-06-04 0:13 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-02 12:07 [PATCH] cxl: Fix kobject memleak Wang Hai
2020-06-02 12:07 ` Wang Hai
2020-06-02 16:21 ` Frederic Barrat
2020-06-02 16:21 ` Frederic Barrat
2020-06-03 11:33 ` Andrew Donnellan
2020-06-03 11:33 ` Andrew Donnellan
2020-06-03 11:57 ` wanghai (M)
2020-06-03 11:57 ` wanghai (M)
2020-06-04 0:08 ` Andrew Donnellan
2020-06-04 0:08 ` Andrew Donnellan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.