| Message ID | 20220120101025.22411-1-linmq006@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: fix memory leak in disk_register_independent_access_ranges | expand |
On 1/20/22 19:10, 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 this issue by adding kobject_put(). > Callback function blk_ia_ranges_sysfs_release() in kobject_put() > can handle the pointer "iars" properly. > > Fixes: a2247f19ee1c ("block: Add independent access ranges support") > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > --- > block/blk-ia-ranges.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/blk-ia-ranges.c b/block/blk-ia-ranges.c > index b925f3db3ab7..18c68d8b9138 100644 > --- a/block/blk-ia-ranges.c > +++ b/block/blk-ia-ranges.c > @@ -144,7 +144,7 @@ int disk_register_independent_access_ranges(struct gendisk *disk, > &q->kobj, "%s", "independent_access_ranges"); > if (ret) { > q->ia_ranges = NULL; > - kfree(iars); > + kobject_put(&iars->kobj); > return ret; > } > Looks good. Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
On Thu, 20 Jan 2022 10:10:25 +0000, 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 this issue by adding kobject_put(). > Callback function blk_ia_ranges_sysfs_release() in kobject_put() > can handle the pointer "iars" properly. > > [...] Applied, thanks! [1/1] block: fix memory leak in disk_register_independent_access_ranges commit: c321e650a45c4228cce1107680ac74e06f014906 Best regards,
diff --git a/block/blk-ia-ranges.c b/block/blk-ia-ranges.c index b925f3db3ab7..18c68d8b9138 100644 --- a/block/blk-ia-ranges.c +++ b/block/blk-ia-ranges.c @@ -144,7 +144,7 @@ int disk_register_independent_access_ranges(struct gendisk *disk, &q->kobj, "%s", "independent_access_ranges"); if (ret) { q->ia_ranges = NULL; - kfree(iars); + kobject_put(&iars->kobj); return ret; }
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 this issue by adding kobject_put(). Callback function blk_ia_ranges_sysfs_release() in kobject_put() can handle the pointer "iars" properly. Fixes: a2247f19ee1c ("block: Add independent access ranges support") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> --- block/blk-ia-ranges.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)