summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQiushi Wu <wu000273@umn.edu>2020-05-27 22:10:29 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-03 08:12:14 +0200
commit5d4310e40f74109a7f538c1888bea48de224e721 (patch)
tree522e0b84026f0673990bcb1ea9f8e92cd6ff29b8
parent1063d4e066a331fe435986bfedf4632ceb6878f9 (diff)
bonding: Fix reference count leak in bond_sysfs_slave_add.
commit a068aab42258e25094bc2c159948d263ed7d7a77 upstream. 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" fixed a similar problem. Fixes: 07699f9a7c8d ("bonding: add sysfs /slave dir for bond slave devices.") Signed-off-by: Qiushi Wu <wu000273@umn.edu> Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/bonding/bond_sysfs_slave.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_sysfs_slave.c b/drivers/net/bonding/bond_sysfs_slave.c
index 641a532b67cb..3f756fa2f603 100644
--- a/drivers/net/bonding/bond_sysfs_slave.c
+++ b/drivers/net/bonding/bond_sysfs_slave.c
@@ -153,8 +153,10 @@ int bond_sysfs_slave_add(struct slave *slave)
err = kobject_init_and_add(&slave->kobj, &slave_ktype,
&(slave->dev->dev.kobj), "bonding_slave");
- if (err)
+ if (err) {
+ kobject_put(&slave->kobj);
return err;
+ }
for (a = slave_attrs; *a; ++a) {
err = sysfs_create_file(&slave->kobj, &((*a)->attr));