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 3/3] net-sysfs: Fix error path for kobject_init_and_add()
Date: Tue, 30 Apr 2019 10:28:17 +1000 [thread overview]
Message-ID: <20190430002817.10785-4-tobin@kernel.org> (raw)
In-Reply-To: <20190430002817.10785-1-tobin@kernel.org>
Currently error return from kobject_init_and_add() is not followed by a
call to kobject_put(). This means there is a memory leak.
Add call to kobject_put() in error path of kobject_init_and_add().
Signed-off-by: Tobin C. Harding <tobin@kernel.org>
---
net/core/net-sysfs.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 8f8b7b6c2945..9d4e3f47b789 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -925,8 +925,10 @@ static int rx_queue_add_kobject(struct net_device *dev, int index)
kobj->kset = dev->queues_kset;
error = kobject_init_and_add(kobj, &rx_queue_ktype, NULL,
"rx-%u", index);
- if (error)
+ if (error) {
+ kobject_put(kobj);
return error;
+ }
dev_hold(queue->dev);
@@ -1462,8 +1464,10 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index)
kobj->kset = dev->queues_kset;
error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL,
"tx-%u", index);
- if (error)
+ if (error) {
+ kobject_put(kobj);
return error;
+ }
dev_hold(queue->dev);
--
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 ` [PATCH 2/3] bridge: Use correct cleanup function Tobin C. Harding
2019-04-30 8:44 ` Greg Kroah-Hartman
2019-04-30 0:28 ` Tobin C. Harding [this message]
2019-04-30 8:45 ` [PATCH 3/3] net-sysfs: Fix error path for kobject_init_and_add() 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-4-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.