Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f0ced70 authored by Miroslav Benes's avatar Miroslav Benes Committed by Greg Kroah-Hartman
Browse files

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: default avatarMiroslav Benes <mbenes@suse.cz>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 78a11386

kernel/livepatch/core.c

+1 −0
Original line number Diff line number Diff line
@@ -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",

		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);