All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Tobin C. Harding" <tobin@kernel.org>
To: Josh Poimboeuf <jpoimboe@redhat.com>,
	Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>,
	Petr Mladek <pmladek@suse.com>
Cc: "Tobin C. Harding" <tobin@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Joe Lawrence <joe.lawrence@redhat.com>,
	live-patching@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] livepatch: Use correct kobject cleanup function
Date: Tue, 30 Apr 2019 10:15:34 +1000	[thread overview]
Message-ID: <20190430001534.26246-3-tobin@kernel.org> (raw)
In-Reply-To: <20190430001534.26246-1-tobin@kernel.org>

The correct cleanup function after a call to kobject_init_and_add() has
succeeded is kobject_del() _not_ kobject_put().  kobject_del() calls
kobject_put().

Use correct cleanup function when removing a kobject.

Signed-off-by: Tobin C. Harding <tobin@kernel.org>
---
 kernel/livepatch/core.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 98a7bec41faa..4cce6bb6e073 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -589,9 +589,8 @@ static void __klp_free_funcs(struct klp_object *obj, bool nops_only)
 
 		list_del(&func->node);
 
-		/* Might be called from klp_init_patch() error path. */
 		if (func->kobj_added) {
-			kobject_put(&func->kobj);
+			kobject_del(&func->kobj);
 		} else if (func->nop) {
 			klp_free_func_nop(func);
 		}
@@ -625,9 +624,8 @@ static void __klp_free_objects(struct klp_patch *patch, bool nops_only)
 
 		list_del(&obj->node);
 
-		/* Might be called from klp_init_patch() error path. */
 		if (obj->kobj_added) {
-			kobject_put(&obj->kobj);
+			kobject_del(&obj->kobj);
 		} else if (obj->dynamic) {
 			klp_free_object_dynamic(obj);
 		}
@@ -676,7 +674,7 @@ static void klp_free_patch_finish(struct klp_patch *patch)
 	 * cannot get enabled again.
 	 */
 	if (patch->kobj_added) {
-		kobject_put(&patch->kobj);
+		kobject_del(&patch->kobj);
 		wait_for_completion(&patch->finish);
 	}
 
-- 
2.21.0


  parent reply	other threads:[~2019-04-30  0:16 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
2019-04-30 15:10     ` Greg Kroah-Hartman
2019-04-30  0:15 ` Tobin C. Harding [this message]
2019-04-30  8:43   ` [PATCH 2/2] livepatch: Use correct kobject cleanup function 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=20190430001534.26246-3-tobin@kernel.org \
    --to=tobin@kernel.org \
    --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=pmladek@suse.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.