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

Commit cad6d02a authored by Haggai Eran's avatar Haggai Eran Committed by Roland Dreier
Browse files

IB/core: Fix port kobject deletion during error flow 



When encountering an error during the add_port function, adding a port
to sysfs, the port kobject is freed without being deleted from sysfs.

Instead of freeing it directly, the patch uses kobject_put to release
the kobject and delete it.

Signed-off-by: default avatarHaggai Eran <haggaie@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 373c0ea1

drivers/infiniband/core/sysfs.c

+17 −9
Original line number Diff line number Diff line
@@ -429,15 +429,19 @@ static void ib_port_release(struct kobject *kobj) 
	struct attribute *a;

	int i;



	if (p->gid_group.attrs) {

		for (i = 0; (a = p->gid_group.attrs[i]); ++i)

			kfree(a);



		kfree(p->gid_group.attrs);

	}



	if (p->pkey_group.attrs) {

		for (i = 0; (a = p->pkey_group.attrs[i]); ++i)

			kfree(a);



		kfree(p->pkey_group.attrs);

	}



	kfree(p);

}
@@ -536,8 +540,10 @@ static int add_port(struct ib_device *device, int port_num, 
	ret = kobject_init_and_add(&p->kobj, &port_type,

				   device->ports_parent,

				   "%d", port_num);

	if (ret)

		goto err_put;

	if (ret) {

		kfree(p);

		return ret;

	}



	ret = sysfs_create_group(&p->kobj, &pma_group);

	if (ret)
@@ -585,6 +591,7 @@ static int add_port(struct ib_device *device, int port_num, 
		kfree(p->pkey_group.attrs[i]);



	kfree(p->pkey_group.attrs);

	p->pkey_group.attrs = NULL;



err_remove_gid:

	sysfs_remove_group(&p->kobj, &p->gid_group);
@@ -594,12 +601,13 @@ static int add_port(struct ib_device *device, int port_num, 
		kfree(p->gid_group.attrs[i]);



	kfree(p->gid_group.attrs);

	p->gid_group.attrs = NULL;



err_remove_pma:

	sysfs_remove_group(&p->kobj, &pma_group);



err_put:

	kfree(p);

	kobject_put(&p->kobj);

	return ret;

}