Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a8bdb26 authored by Kaike Wan's avatar Kaike Wan Committed by Greg Kroah-Hartman
Browse files

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

[ Upstream commit a35cd6447effd5c239b564c80fa109d05ff3d114 ]

When kobject_init_and_add() returns an error in the function
qib_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. In addition, the ppd->diagc_kobj is released
along with other kobjects when the sysfs is unregistered.

Fixes: f931551b ("IB/qib: Add new qib driver for QLogic PCIe InfiniBand adapters")
Link: https://lore.kernel.org/r/20200512031328.189865.48627.stgit@awfm-01.aw.intel.com


Cc: <stable@vger.kernel.org>
Suggested-by: default avatarLin Yi <teroincn@gmail.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>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a70ac9df

drivers/infiniband/hw/qib/qib_sysfs.c

+5 −4
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ int qib_create_port_files(struct ib_device *ibdev, u8 port_num, 
		qib_dev_err(dd,

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

			ret, port_num);

		goto bail;

		goto bail_link;

	}

	kobject_uevent(&ppd->pport_kobj, KOBJ_ADD);
@@ -766,7 +766,7 @@ int qib_create_port_files(struct ib_device *ibdev, u8 port_num, 
		qib_dev_err(dd,

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

			ret, port_num);

		goto bail_link;

		goto bail_sl;

	}

	kobject_uevent(&ppd->sl2vl_kobj, KOBJ_ADD);
@@ -776,7 +776,7 @@ int qib_create_port_files(struct ib_device *ibdev, u8 port_num, 
		qib_dev_err(dd,

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

			ret, port_num);

		goto bail_sl;

		goto bail_diagc;

	}

	kobject_uevent(&ppd->diagc_kobj, KOBJ_ADD);
@@ -789,7 +789,7 @@ int qib_create_port_files(struct ib_device *ibdev, u8 port_num, 
		qib_dev_err(dd,

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

		 ret, port_num);

		goto bail_diagc;

		goto bail_cc;

	}



	kobject_uevent(&ppd->pport_cc_kobj, KOBJ_ADD);
@@ -871,6 +871,7 @@ void qib_verbs_unregister_sysfs(struct qib_devdata *dd) 
				&cc_table_bin_attr);

			kobject_put(&ppd->pport_cc_kobj);

		}

		kobject_put(&ppd->diagc_kobj);

		kobject_put(&ppd->sl2vl_kobj);

		kobject_put(&ppd->pport_kobj);

	}