summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-01 18:44:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-01 18:44:28 -0700
commit45c680b9949ecdb829a331100ae49926bf82899c (patch)
tree21b8267a41fa49423657726b56f314fa8c6b6506
parent851328feb8c1d4130d3a0acb004e474168702d6d (diff)
parent225f58fbcc02ace232fc49f05036042f9d58263e (diff)
downloadop-kernel-dev-45c680b9949ecdb829a331100ae49926bf82899c.zip
op-kernel-dev-45c680b9949ecdb829a331100ae49926bf82899c.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching fix from Jiri Kosina: "Livepatching error handling fix" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching: livepatch: Improve error handling in klp_disable_func()
-rw-r--r--kernel/livepatch/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index c40ebcc..6e53441 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -348,8 +348,10 @@ static void klp_disable_func(struct klp_func *func)
{
struct klp_ops *ops;
- WARN_ON(func->state != KLP_ENABLED);
- WARN_ON(!func->old_addr);
+ if (WARN_ON(func->state != KLP_ENABLED))
+ return;
+ if (WARN_ON(!func->old_addr))
+ return;
ops = klp_find_ops(func->old_addr);
if (WARN_ON(!ops))
OpenPOWER on IntegriCloud