bridge: Fix incorrect variable assignment on error path in br_sysfs_addbr
authorBastien Philbert <bastienphilbert@gmail.com>
Sun, 3 Apr 2016 23:04:26 +0000 (19:04 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Apr 2016 20:12:37 +0000 (16:12 -0400)
This fixes the incorrect variable assignment on error path in
br_sysfs_addbr for when the call to kobject_create_and_add
fails to assign the value of -EINVAL to the returned variable of
err rather then incorrectly return zero making callers think this
function has succeededed due to the previous assignment being
assigned zero when assigning it the successful return value of
the call to sysfs_create_group which is zero.

Signed-off-by: Bastien Philbert <bastienphilbert@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_sysfs_br.c

index 6b8091407ca3126b333c76c5104f5a8ca6803e49..f4d40edbe8a97dc5a3d533c028776d17ee4fa77c 100644 (file)
@@ -870,6 +870,7 @@ int br_sysfs_addbr(struct net_device *dev)
 
        br->ifobj = kobject_create_and_add(SYSFS_BRIDGE_PORT_SUBDIR, brobj);
        if (!br->ifobj) {
+               err = -EINVAL;
                pr_info("%s: can't add kobject (directory) %s/%s\n",
                        __func__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);
                goto out3;