IB/usnic: Fix memory leak in usnic_ib_sysfs_qpn_add
Subsystems (2)
PATCH 1/1 IB/usnic: Fix memory leak in usnic_ib_sysfs_qpn_add
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().
--- drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/usnic/usnic_ib_sysfs.c +1 -0
@@ -280,6 +280,7 @@ void usnic_ib_sysfs_qpn_add(struct usnic_ib_qp_grp *qp_grp)kobject_get (us_ibdev->qpn_kobj), "%d", qp_grp->grp_id);if (err) { +kobject_put (&qp_grp->kobj);kobject_put (us_ibdev->qpn_kobj);return ; }
Signature · 1 line
2.17.1
Quoted 7 lines · Miaoqian Lin
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().
There is no real memory leak here, this kobject will be released in usnic_ib_sysfs_qpn_remove(). Another possible solution is to delete "if (err)" completely.
drivers/infiniband/hw/usnic/usnic_ib_sysfs.c +4 -6
@@ -271,17 +271,15 @@ void usnic_ib_sysfs_unregister_usdev(struct usnic_ib_dev *us_ibdev)void usnic_ib_sysfs_qpn_add (struct usnic_ib_qp_grp *qp_grp) {struct usnic_ib_dev *us_ibdev; -int err; us_ibdev = qp_grp->vf->pf; - err =kobject_init_and_add (&qp_grp->kobj, &usnic_ib_qpn_type, +kobject_init_and_add (&qp_grp->kobj, &usnic_ib_qpn_type,kobject_get (us_ibdev->qpn_kobj),"%d" , qp_grp->grp_id); -if (err) { -kobject_put (us_ibdev->qpn_kobj); -return ; - } +/* We don't care about failure here, the release will be performed in +* usnic_ib_sysfs_qpn_remove() anyway. +*/ }void usnic_ib_sysfs_qpn_remove (struct usnic_ib_qp_grp *qp_grp)
Quoted 22 lines
Fixes e3cf00d0a87f ("IB/usnic: Add Cisco VIC low-level hardware driver")Signed-off-by Miaoqian Lin <[email protected]>--- drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 1 + 1 file changed, 1 insertion(+)drivers/infiniband/hw/usnic/usnic_ib_sysfs.c +1
-0@@ -280,6 +280,7 @@ void usnic_ib_sysfs_qpn_add(struct usnic_ib_qp_grp *qp_grp)kobject_get (us_ibdev->qpn_kobj), "%d", qp_grp->grp_id);if (err) { +kobject_put (&qp_grp->kobj);kobject_put (us_ibdev->qpn_kobj);return ; }Signature · 1 line
2.17.1