2020-07-25 00:16:33

by Yi Wang

Subject: [PATCH] block: Fix reference count leak in blk_integrity_add

From: Liao Pingfang <[email protected]>

kobject_init_and_add() takes reference even when it fails. If this
function returns an error, kobject_put() must be called to properly
clean up the memory associated with the object.

Signed-off-by: Liao Pingfang <[email protected]>
Signed-off-by: Yi Wang <[email protected]>
---
block/blk-integrity.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index c03705c..118b2f2 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -436,8 +436,10 @@ EXPORT_SYMBOL(blk_integrity_unregister);
void blk_integrity_add(struct gendisk *disk)
{
if (kobject_init_and_add(&disk->integrity_kobj, &integrity_ktype,
- &disk_to_dev(disk)->kobj, "%s", "integrity"))
+ &disk_to_dev(disk)->kobj, "%s", "integrity")) {
+ kobject_put(&disk->integrity_kobj);
return;
+ }

kobject_uevent(&disk->integrity_kobj, KOBJ_ADD);
}
--
2.9.5

2020-07-25 11:36:37

by Markus Elfring

Subject: Re: [PATCH] block: Fix reference count leak in blk_integrity_add

> kobject_init_and_add() takes reference even when it fails. If this
> function returns an error, kobject_put() must be called to properly
> clean up the memory associated with the object.

* An imperative wording can be preferred for the change description,
can't it?

* Would you like to add the tag “Fixes” to the commit message?

Regards,
Markus