Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

livepatch: Nullify obj->mod in klp_module_coming()'s error path

Browse source 
[ 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>
This commit is contained in:
Miroslav Benes 2019-07-19 14:28:39 +02:00 committed by Greg Kroah-Hartman
parent 78a1138672
commit 0f0ced702d
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kernel/livepatch/core.c
View file

@ -1027,6 +1027,7 @@ int klp_module_coming(struct module *mod)
pr_warn("patch '%s' failed for module '%s', refusing to load module '%s'\n", pr_warn("patch '%s' failed for module '%s', refusing to load module '%s'\n",
patch->mod->name, obj->mod->name, obj->mod->name); patch->mod->name, obj->mod->name, obj->mod->name);
mod->klp_alive = false; mod->klp_alive = false;
obj->mod = NULL;
klp_cleanup_module_patches_limited(mod, patch); klp_cleanup_module_patches_limited(mod, patch);
mutex_unlock(&klp_mutex); mutex_unlock(&klp_mutex);