Commit 9f7582d1 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching

Pull livepatching fix from Jiri Kosina:
 "Error handling fix in livepatching module notifier, from Miroslav
  Benes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
  livepatch: Nullify obj->mod in klp_module_coming()'s error path
parents 1ad0bc78 4ff96fb5
...@@ -1175,6 +1175,7 @@ int klp_module_coming(struct module *mod) ...@@ -1175,6 +1175,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment