diff options
author | Miroslav Benes <mbenes@suse.cz> | 2019-07-19 14:28:39 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-07 18:59:28 +0200 |
commit | a7ef43bf90640761584ef7f618e99cd277167b91 (patch) | |
tree | 4cdbfbc9bb375dfe55bade92d8d399939250e109 /kernel | |
parent | 677540cb39e0ef8a845c5662458f6440b0e7050d (diff) | |
download | linux-stable-a7ef43bf90640761584ef7f618e99cd277167b91.tar.gz linux-stable-a7ef43bf90640761584ef7f618e99cd277167b91.tar.bz2 linux-stable-a7ef43bf90640761584ef7f618e99cd277167b91.zip |
livepatch: Nullify obj->mod in klp_module_coming()'s error path
[ Upstream commit 4ff96fb52c6964ad42e0a878be8f86a2e8052ddd ]
klp_module_coming() is called for every module appearing in the system.
It sets obj->mod to a patched module for klp_object obj. Unfortunately
it leaves it set even if an error happens later in the function and the
patched module is not allowed to be loaded.
klp_is_object_loaded() uses obj->mod variable and could currently give a
wrong return value. The bug is probably harmless as of now.
Signed-off-by: Miroslav Benes <mbenes@suse.cz>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/livepatch/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index c4ce08f43bd6..ab4a4606d19b 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -1175,6 +1175,7 @@ err: pr_warn("patch '%s' failed for module '%s', refusing to load module '%s'\n", patch->mod->name, obj->mod->name, obj->mod->name); mod->klp_alive = false; + obj->mod = NULL; klp_cleanup_module_patches_limited(mod, patch); mutex_unlock(&klp_mutex); |