]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
RDMA/core: Fix several reference count leaks.
authorQiushi Wu <wu000273@umn.edu>
Thu, 28 May 2020 03:02:30 +0000 (22:02 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:50:17 +0000 (17:50 +0200)
[ Upstream commit 0b8e125e213204508e1b3c4bdfe69713280b7abd ]

kobject_init_and_add() takes reference even when it fails.  If this
function returns an error, kobject_put() must be called to properly clean
up the memory associated with the object. Previous
commit b8eb718348b8 ("net-sysfs: Fix reference count leak in
rx|netdev_queue_add_kobject") fixed a similar problem.

Link: https://lore.kernel.org/r/20200528030231.9082-1-wu000273@umn.edu
Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/core/sysfs.c

index 7a50cedcef1f60b9b24a2e610dd01c87b59a6c1c..091cca9d88ed74f7c90a44ff4febd8b0ea3c4cd3 100644 (file)
@@ -1060,8 +1060,7 @@ static int add_port(struct ib_core_device *coredev, int port_num)
                                   coredev->ports_kobj,
                                   "%d", port_num);
        if (ret) {
-               kfree(p);
-               return ret;
+               goto err_put;
        }
 
        p->gid_attr_group = kzalloc(sizeof(*p->gid_attr_group), GFP_KERNEL);
@@ -1074,8 +1073,7 @@ static int add_port(struct ib_core_device *coredev, int port_num)
        ret = kobject_init_and_add(&p->gid_attr_group->kobj, &gid_attr_type,
                                   &p->kobj, "gid_attrs");
        if (ret) {
-               kfree(p->gid_attr_group);
-               goto err_put;
+               goto err_put_gid_attrs;
        }
 
        if (device->ops.process_mad && is_full_dev) {
@@ -1406,8 +1404,10 @@ int ib_port_register_module_stat(struct ib_device *device, u8 port_num,
 
                ret = kobject_init_and_add(kobj, ktype, &port->kobj, "%s",
                                           name);
-               if (ret)
+               if (ret) {
+                       kobject_put(kobj);
                        return ret;
+               }
        }
 
        return 0;