diff options
| author | Miroslav Benes <mbenes@suse.cz> | 2019-07-19 15:28:39 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-07 19:55:09 +0300 |
| commit | 95364cf783c1ac0470ea4f8671a40bfe3da8820d (patch) | |
| tree | ce3508e3026c1758698b22d8b231f69d8c0028ed | |
| parent | 2d91f917472987e7bfa7362131679942af3dd904 (diff) | |
| download | linux-95364cf783c1ac0470ea4f8671a40bfe3da8820d.tar.xz | |
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>
| -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 88754e9790f9..f8dc77b18962 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -941,6 +941,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); |