aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-09-23 12:21:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-23 12:21:03 -0700
commit9f7582d15f82e86b2041ab22327b7d769e061c1f (patch)
tree2ee3014d2ef611d73af8931959bbade838fd19d5 /kernel
parent1ad0bc78948652edc3067b6b49ba31b1598faa4a (diff)
parent4ff96fb52c6964ad42e0a878be8f86a2e8052ddd (diff)
downloadlinux-9f7582d15f82e86b2041ab22327b7d769e061c1f.tar.gz
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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/livepatch/core.c1
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:
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);