linux-kernel - [PATCH] livepatch: fix merge bug in klp_cleanup_module_patches

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <3defa020936cfd22709acaa2808a698891bba7ab.1509479478.git.jpoimboe@redhat.com>
Date:   Tue, 31 Oct 2017 14:53:31 -0500
From:   Josh Poimboeuf <jpoimboe@...hat.com>
To:     Jiri Kosina <jikos@...nel.org>, Miroslav Benes <mbenes@...e.cz>,
        Jessica Yu <jeyu@...hat.com>
Cc:     live-patching@...r.kernel.org, linux-kernel@...r.kernel.org,
        Joe Lawrence <joe.lawrence@...hat.com>
Subject: [PATCH] livepatch: fix merge bug in klp_cleanup_module_patches_limited()

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@...hat.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