Commit dfb5394f authored by Kaike Wan's avatar Kaike Wan Committed by Jason Gunthorpe
Browse files

IB/hfi1: Call kobject_put() when kobject_init_and_add() fails 

When kobject_init_and_add() returns an error in the function
hfi1_create_port_files(), the function kobject_put() is not called for the
corresponding kobject, which potentially leads to memory leak.

This patch fixes the issue by calling kobject_put() even if
kobject_init_and_add() fails.

Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200326163813.21129.44280.stgit@awfm-01.aw.intel.com


Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarKaike Wan <kaike.wan@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 5c15abc4

drivers/infiniband/hw/hfi1/sysfs.c

+8 −5
Original line number Diff line number Diff line
@@ -674,7 +674,11 @@ int hfi1_create_port_files(struct ib_device *ibdev, u8 port_num, 
		dd_dev_err(dd,

			   "Skipping sc2vl sysfs info, (err %d) port %u\n",

			   ret, port_num);

		goto bail;

		/*

		 * Based on the documentation for kobject_init_and_add(), the

		 * caller should call kobject_put even if this call fails.

		 */

		goto bail_sc2vl;

	}

	kobject_uevent(&ppd->sc2vl_kobj, KOBJ_ADD);
@@ -684,7 +688,7 @@ int hfi1_create_port_files(struct ib_device *ibdev, u8 port_num, 
		dd_dev_err(dd,

			   "Skipping sl2sc sysfs info, (err %d) port %u\n",

			   ret, port_num);

		goto bail_sc2vl;

		goto bail_sl2sc;

	}

	kobject_uevent(&ppd->sl2sc_kobj, KOBJ_ADD);
@@ -694,7 +698,7 @@ int hfi1_create_port_files(struct ib_device *ibdev, u8 port_num, 
		dd_dev_err(dd,

			   "Skipping vl2mtu sysfs info, (err %d) port %u\n",

			   ret, port_num);

		goto bail_sl2sc;

		goto bail_vl2mtu;

	}

	kobject_uevent(&ppd->vl2mtu_kobj, KOBJ_ADD);
@@ -704,7 +708,7 @@ int hfi1_create_port_files(struct ib_device *ibdev, u8 port_num, 
		dd_dev_err(dd,

			   "Skipping Congestion Control sysfs info, (err %d) port %u\n",

			   ret, port_num);

		goto bail_vl2mtu;

		goto bail_cc;

	}



	kobject_uevent(&ppd->pport_cc_kobj, KOBJ_ADD);
@@ -742,7 +746,6 @@ bail_sl2sc: 
	kobject_put(&ppd->sl2sc_kobj);

bail_sc2vl:

	kobject_put(&ppd->sc2vl_kobj);

bail:

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE