From: "Tobin C. Harding" <tobin@kernel.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: "Tobin C. Harding" <tobin@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Tyler Hicks <tyhicks@canonical.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Ido Schimmel <idosch@mellanox.com>,
Alexander Duyck <alexander.h.duyck@intel.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Wang Hai <wanghai26@huawei.com>,
YueHaibing <yuehaibing@huawei.com>,
Amritha Nambiar <amritha.nambiar@intel.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] bridge: Use correct cleanup function
Date: Tue, 30 Apr 2019 10:28:16 +1000 [thread overview]
Message-ID: <20190430002817.10785-3-tobin@kernel.org> (raw)
In-Reply-To: <20190430002817.10785-1-tobin@kernel.org>
The correct cleanup function if a call to kobject_init_and_add() has
returned _successfully_ is kobject_del(). kobject_put() is used if the
call to kobject_init_and_add() fails. kobject_del() calls kobject_put().
Use correct cleanup function in error path.
Signed-off-by: Tobin C. Harding <tobin@kernel.org>
---
net/bridge/br_if.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index e5c8c9941c51..d3a1554ccff4 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -701,7 +701,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,
err3:
sysfs_remove_link(br->ifobj, p->dev->name);
err2:
- kobject_put(&p->kobj);
+ kobject_del(&p->kobj);
p = NULL; /* kobject_put frees */
err1:
dev_set_allmulti(dev, -1);
--
2.21.0
next prev parent reply other threads:[~2019-04-30 0:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 0:28 [PATCH 0/3] Fix error path for kobject_init_and_add() Tobin C. Harding
2019-04-30 0:28 ` [PATCH 1/3] bridge: " Tobin C. Harding
2019-04-30 1:23 ` Tobin C. Harding
2019-04-30 8:44 ` Greg Kroah-Hartman
2019-04-30 15:14 ` Tyler Hicks
2019-04-30 15:23 ` Tyler Hicks
2019-04-30 22:38 ` Tobin C. Harding
2019-04-30 0:28 ` Tobin C. Harding [this message]
2019-04-30 8:44 ` [PATCH 2/3] bridge: Use correct cleanup function Greg Kroah-Hartman
2019-04-30 0:28 ` [PATCH 3/3] net-sysfs: Fix error path for kobject_init_and_add() Tobin C. Harding
2019-04-30 8:45 ` Greg Kroah-Hartman
2019-04-30 15:37 ` Tyler Hicks
2019-04-30 16:11 ` Andy Shevchenko
2019-05-08 14:52 ` wanghai (M)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190430002817.10785-3-tobin@kernel.org \
--to=tobin@kernel.org \
--cc=alexander.h.duyck@intel.com \
--cc=amritha.nambiar@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=davem@davemloft.net \
--cc=dmitry.torokhov@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=idosch@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tyhicks@canonical.com \
--cc=wanghai26@huawei.com \
--cc=yuehaibing@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.