From: Miroslav Benes <mbenes@suse.cz>
To: "Tobin C. Harding" <tobin@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>,
Jiri Kosina <jikos@kernel.org>, Petr Mladek <pmladek@suse.com>,
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 12:44:55 +0200 (CEST) [thread overview]
Message-ID: <alpine.LSU.2.21.1904301235450.8507@pobox.suse.cz> (raw)
In-Reply-To: <20190430084254.GB11737@kroah.com>
On Tue, 30 Apr 2019, Greg Kroah-Hartman wrote:
> On Tue, Apr 30, 2019 at 10:15:33AM +1000, 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.
> >
> > Add call to kobject_put() in error path of kobject_init_and_add().
> >
> > Signed-off-by: Tobin C. Harding <tobin@kernel.org>
>
> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Well, it does not even compile...
On Tue, 30 Apr 2019, 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.
>
> Add call to kobject_put() in error path of kobject_init_and_add().
>
> 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;
>
> return ret;
> @@ -803,8 +805,10 @@ static int klp_init_object(struct klp_patch *patch, struct klp_object *obj)
> name = klp_is_module(obj) ? obj->name : "vmlinux";
> ret = kobject_init_and_add(&obj->kobj, &klp_ktype_object,
> &patch->kobj, "%s", name);
> - if (ret)
> + if (ret) {
> + kobject_put(&func->kobj);
kobject_put(&obj->kobj); I suppose.
> return ret;
> + }
> obj->kobj_added = true;
>
> klp_for_each_func(obj, func) {
> @@ -862,8 +866,10 @@ static int klp_init_patch(struct klp_patch *patch)
>
> ret = kobject_init_and_add(&patch->kobj, &klp_ktype_patch,
> klp_root_kobj, "%s", patch->mod->name);
> - if (ret)
> + if (ret) {
> + kobject_put(&func->kobj);
kobject_put(&patch->kobj);
Thanks,
Miroslav
next prev parent reply other threads:[~2019-04-30 10:44 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 [this message]
2019-04-30 10:46 ` Greg Kroah-Hartman
2019-04-30 22:39 ` Tobin C. Harding
2019-04-30 14:56 ` Petr Mladek
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=alpine.LSU.2.21.1904301235450.8507@pobox.suse.cz \
--to=mbenes@suse.cz \
--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=pmladek@suse.com \
--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).