From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>,
Jessica Yu <jeyu@redhat.com>
Cc: live-patching@vger.kernel.org, linux-kernel@vger.kernel.org,
Joe Lawrence <joe.lawrence@redhat.com>
Subject: [PATCH] livepatch: fix merge bug in klp_cleanup_module_patches_limited()
Date: Tue, 31 Oct 2017 14:53:31 -0500 [thread overview]
Message-ID: <3defa020936cfd22709acaa2808a698891bba7ab.1509479478.git.jpoimboe@redhat.com> (raw)
When the patch for "livepatch: add (un)patch callbacks" was posted to
the mailing list at:
https://lkml.kernel.org/r/1507921723-1996-2-git-send-email-joe.lawrence@redhat.com
... it was based on top of the following commit:
ef8daf8eeb5b ("livepatch: unpatch all klp_objects if klp_module_coming fails").
But when it was applied to git on the livepatching
for-4.15/shadow-variables branch, that branch was missing the above
commit. The patch was rebased accordingly:
93862e385ded ("livepatch: add (un)patch callbacks")
Then the two above commits were merged into livepatching/for-next:
6a18fdf2d8d3 ("Merge branch 'for-4.15/callbacks' into for-next"),
The result of the merge commit was that the klp_post_unpatch_callback()
call in the klp_cleanup_module_patches_limited() function disappeared.
The original patch on the mailing list had that call, so put it back.
Fixes: 6a18fdf2d8d3 ("Merge branch 'for-4.15/callbacks' into for-next")
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
kernel/livepatch/core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 30e392858281..de9e45dca70f 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -875,6 +875,8 @@ static void klp_cleanup_module_patches_limited(struct module *mod,
pr_notice("reverting patch '%s' on unloading module '%s'\n",
patch->mod->name, obj->mod->name);
klp_unpatch_object(obj);
+
+ klp_post_unpatch_callback(obj);
}
klp_free_object_loaded(obj);
--
2.13.6
next reply other threads:[~2017-10-31 19:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-31 19:53 Josh Poimboeuf [this message]
2017-10-31 20:12 ` Jiri Kosina
2017-10-31 20:24 ` Josh Poimboeuf
2017-11-01 14:28 ` Jiri Kosina
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=3defa020936cfd22709acaa2808a698891bba7ab.1509479478.git.jpoimboe@redhat.com \
--to=jpoimboe@redhat.com \
--cc=jeyu@redhat.com \
--cc=jikos@kernel.org \
--cc=joe.lawrence@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=mbenes@suse.cz \
/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
all inboxes | Powered by JetHome®