1 files changed, 16 insertions, 8 deletions

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 5e573bb18660..a5793c8f1590 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -889,9 +889,9 @@ static struct attribute *alloc_hsa_lifespan(char *name, u8 port_num)
 static void setup_hw_stats(struct ib_device *device, struct ib_port *port,
                            u8 port_num)
 {
-        struct attribute_group *hsag = NULL;
+        struct attribute_group *hsag;
         struct rdma_hw_stats *stats;
-        int i = 0, ret;
+        int i, ret;
 
         stats = device->alloc_hw_stats(device, port_num);
 
@@ -899,19 +899,22 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port,
                 return;
 
         if (!stats->names || stats->num_counters <= 0)
-                goto err;
+                goto err_free_stats;
 
+        /*
+         * Two extra attribue elements here, one for the lifespan entry and
+         * one to NULL terminate the list for the sysfs core code
+         */
         hsag = kzalloc(sizeof(*hsag) +
-                       // 1 extra for the lifespan config entry
-                       sizeof(void *) * (stats->num_counters + 1),
+                       sizeof(void *) * (stats->num_counters + 2),
                        GFP_KERNEL);
         if (!hsag)
-                return;
+                goto err_free_stats;
 
         ret = device->get_hw_stats(device, stats, port_num,
                                    stats->num_counters);
         if (ret != stats->num_counters)
-                goto err;
+                goto err_free_hsag;
 
         stats->timestamp = jiffies;
 
@@ -922,10 +925,13 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port,
                 hsag->attrs[i] = alloc_hsa(i, port_num, stats->names[i]);
                 if (!hsag->attrs[i])
                         goto err;
+                sysfs_attr_init(hsag->attrs[i]);
         }
 
         /* treat an error here as non-fatal */
         hsag->attrs[i] = alloc_hsa_lifespan("lifespan", port_num);
+        if (hsag->attrs[i])
+                sysfs_attr_init(hsag->attrs[i]);
 
         if (port) {
                 struct kobject *kobj = &port->kobj;
@@ -946,10 +952,12 @@ static void setup_hw_stats(struct ib_device *device, struct ib_port *port,
         return;
 
 err:
-        kfree(stats);
         for (; i >= 0; i--)
                 kfree(hsag->attrs[i]);
+err_free_hsag:
         kfree(hsag);
+err_free_stats:
+        kfree(stats);
         return;
 }