From: Petr Mladek <pmladek@suse.com>
To: "Tobin C. Harding" <tobin@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>,
Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Joe Lawrence <joe.lawrence@redhat.com>,
live-patching@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] livepatch: Fix kobject memleak
Date: Tue, 30 Apr 2019 16:56:13 +0200 [thread overview]
Message-ID: <20190430145613.7tokgyqjsuxlyh2g@pathway.suse.cz> (raw)
In-Reply-To: <20190430001534.26246-2-tobin@kernel.org>
On Tue 2019-04-30 10:15:33, Tobin C. Harding wrote:
> Currently error return from kobject_init_and_add() is not followed by a
> call to kobject_put(). This means there is a memory leak.
I see, the ref count is always initialized to 1 via:
+ kobject_init_and_add()
+ kobject_init()
+ kobject_init_internal()
+ kref_init()
> Signed-off-by: Tobin C. Harding <tobin@kernel.org>
> ---
> kernel/livepatch/core.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
> index eb0ee10a1981..98a7bec41faa 100644
> --- a/kernel/livepatch/core.c
> +++ b/kernel/livepatch/core.c
> @@ -727,7 +727,9 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func)
> ret = kobject_init_and_add(&func->kobj, &klp_ktype_func,
> &obj->kobj, "%s,%lu", func->old_name,
> func->old_sympos ? func->old_sympos : 1);
> - if (!ret)
> + if (ret)
> + kobject_put(&func->kobj);
> + else
> func->kobj_added = true;
We could actually get rid of the custom kobj_added. Intead, we could
check for kobj->state_initialized in the various klp_free* functions.
Best Regards,
Petr
next prev parent reply other threads:[~2019-04-30 14:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 0:15 [PATCH 0/2] livepatch: Fix usage of kobject_init_and_add() Tobin C. Harding
2019-04-30 0:15 ` [PATCH 1/2] livepatch: Fix kobject memleak Tobin C. Harding
2019-04-30 8:42 ` Greg Kroah-Hartman
2019-04-30 10:44 ` Miroslav Benes
2019-04-30 10:46 ` Greg Kroah-Hartman
2019-04-30 22:39 ` Tobin C. Harding
2019-04-30 14:56 ` Petr Mladek [this message]
2019-04-30 15:10 ` Greg Kroah-Hartman
2019-04-30 0:15 ` [PATCH 2/2] livepatch: Use correct kobject cleanup function Tobin C. Harding
2019-04-30 8:43 ` Greg Kroah-Hartman
2019-04-30 11:00 ` Miroslav Benes
2019-04-30 21:38 ` Tobin C. Harding
2019-04-30 15:08 ` Petr Mladek
2019-04-30 21:37 ` Tobin C. Harding
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=20190430145613.7tokgyqjsuxlyh2g@pathway.suse.cz \
--to=pmladek@suse.com \
--cc=gregkh@linuxfoundation.org \
--cc=jikos@kernel.org \
--cc=joe.lawrence@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=tobin@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).