diff options
author | Miroslav Benes <mbenes@suse.cz> | 2019-07-19 08:28:39 -0400 |
---|---|---|
committer | Petr Mladek <pmladek@suse.com> | 2019-08-19 07:03:37 -0400 |
commit | 4ff96fb52c6964ad42e0a878be8f86a2e8052ddd (patch) | |
tree | 1edd4428f19b91a2456bf96d5865052a632aff63 | |
parent | db0457338ece7482378d88e50ad298191c3e6947 (diff) |
livepatch: Nullify obj->mod in klp_module_coming()'s error path
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>
-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: | |||
1175 | pr_warn("patch '%s' failed for module '%s', refusing to load module '%s'\n", | 1175 | pr_warn("patch '%s' failed for module '%s', refusing to load module '%s'\n", |
1176 | patch->mod->name, obj->mod->name, obj->mod->name); | 1176 | patch->mod->name, obj->mod->name, obj->mod->name); |
1177 | mod->klp_alive = false; | 1177 | mod->klp_alive = false; |
1178 | obj->mod = NULL; | ||
1178 | klp_cleanup_module_patches_limited(mod, patch); | 1179 | klp_cleanup_module_patches_limited(mod, patch); |
1179 | mutex_unlock(&klp_mutex); | 1180 | mutex_unlock(&klp_mutex); |
1180 | 1181 | ||