[PATCH 3.16 042/133] net: don't decrement kobj reference count on init failure

[Ben Hutchings]

3.16.51-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: stephen hemminger <step...@networkplumber.org>

commit d0d6683716791b2a2761a1bb025c613eb73da6c3 upstream.

If kobject_init_and_add failed, then the failure path would
decrement the reference count of the queue kobject whose reference
count was already zero.

Fixes: 114cf5802165 ("bql: Byte queue limits")
Signed-off-by: Stephen Hemminger <sthem...@microsoft.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 net/core/net-sysfs.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -786,21 +786,20 @@ static int rx_queue_add_kobject(struct n
        error = kobject_init_and_add(kobj, &rx_queue_ktype, NULL,
            "rx-%u", index);
        if (error)
-               goto exit;
+               return error;
 
        if (net->sysfs_rx_queue_group) {
                error = sysfs_create_group(kobj, net->sysfs_rx_queue_group);
-               if (error)
-                       goto exit;
+               if (error) {
+                       kobject_put(kobj);
+                       return error;
+               }
        }
 
        kobject_uevent(kobj, KOBJ_ADD);
        dev_hold(queue->dev);
 
        return error;
-exit:
-       kobject_put(kobj);
-       return error;
 }
 #endif /* CONFIG_SYSFS */
 
@@ -1145,21 +1144,20 @@ static int netdev_queue_add_kobject(stru
        error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL,
            "tx-%u", index);
        if (error)
-               goto exit;
+               return error;
 
 #ifdef CONFIG_BQL
        error = sysfs_create_group(kobj, &dql_group);
-       if (error)
-               goto exit;
+       if (error) {
+               kobject_put(kobj);
+               return error;
+       }
 #endif
 
        kobject_uevent(kobj, KOBJ_ADD);
        dev_hold(queue->dev);
 
        return 0;
-exit:
-       kobject_put(kobj);
-       return error;
 }
 #endif /* CONFIG_SYSFS */