[PATCH] bridge:Fix incorrect variable assignment on error path in br_sysfs_addbr

[PATCH] bridge:Fix incorrect variable assignment on error path in br_sysfs_addbr

[Nicholas Krause]

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: Nicholas Krause <xerofoify@gmail.com>
---
 net/bridge/br_sysfs_br.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 6b80914..6833d25 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -872,6 +872,7 @@ int br_sysfs_addbr(struct net_device *dev)
 	if (!br->ifobj) {
 		pr_info("%s: can't add kobject (directory) %s/%s\n",
 			__func__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);
+		err = -EINVAL;
 		goto out3;
 	}
 	return 0;
-- 
2.5.0

[PATCH] bridge:Fix incorrect variable assignment on error path in br_sysfs_addbr

[Bastien Philbert]

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>
---
 net/bridge/br_sysfs_br.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 6b80914..f4d40ed 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -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;
-- 
2.5.0

Re: [PATCH] bridge:Fix incorrect variable assignment on error path in br_sysfs_addbr

[David Miller]

From: Bastien Philbert <bastienphilbert@gmail.com>
Date: Sun,  3 Apr 2016 19:04:26 -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>

Applied, but please put a space after the subsystem prefix and the
colon character in your subject lines in the future.

Doesn't that really look odd to you, the way you did it? "net:Fix"?

Doesn't it look more natural, and consistent with what all other
patch submitters do, if it's "net: Fix"?

Thanks.

Re: [PATCH] bridge:Fix incorrect variable assignment on error path in br_sysfs_addbr

[Bastien Philbert]

On 2016-04-04 04:14 PM, David Miller wrote:
> From: Bastien Philbert <bastienphilbert@gmail.com>
> Date: Sun,  3 Apr 2016 19:04:26 -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>
> 
> Applied, but please put a space after the subsystem prefix and the
> colon character in your subject lines in the future.
> 
> Doesn't that really look odd to you, the way you did it? "net:Fix"?
> 
> Doesn't it look more natural, and consistent with what all other
> patch submitters do, if it's "net: Fix"?
> 
> Thanks.
> 
Done, sorry about that :(. Will remember for future patches.
Bastien

[PATCH] bridge:Fix incorrect variable assignment on error path in br_sysfs_addbr

[Nicholas Krause]

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: Nicholas Krause <xerofoify@gmail.com>
---
 net/bridge/br_sysfs_br.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 6b80914..6833d25 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -872,6 +872,7 @@ int br_sysfs_addbr(struct net_device *dev)
 	if (!br->ifobj) {
 		pr_info("%s: can't add kobject (directory) %s/%s\n",
 			__func__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);
+		err = -EINVAL;
 		goto out3;
 	}
 	return 0;
-- 
2.5.0