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: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 1f77072fa1fe9256f8e5fff15450321c362686d2..68fa798c007dd97bddf631f42ef72cc098fc175c 100644 (file)
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -429,15 +429,19 @@ static void ib_port_release(struct kobject *kobj)
        struct attribute *a;
        int i;
 
-       for (i = 0; (a = p->gid_group.attrs[i]); ++i)
-               kfree(a);
+       if (p->gid_group.attrs) {
+               for (i = 0; (a = p->gid_group.attrs[i]); ++i)
+                       kfree(a);
 
-       kfree(p->gid_group.attrs);
+               kfree(p->gid_group.attrs);
+       }
 
-       for (i = 0; (a = p->pkey_group.attrs[i]); ++i)
-               kfree(a);
+       if (p->pkey_group.attrs) {
+               for (i = 0; (a = p->pkey_group.attrs[i]); ++i)
+                       kfree(a);
 
-       kfree(p->pkey_group.attrs);
+               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 @@ err_free_pkey:
                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 @@ err_free_gid:
                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;
 }