diff options
| author | Linus Torvalds | 2015-09-02 03:44:28 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2015-09-02 03:44:28 +0200 |
| commit | 45c680b9949ecdb829a331100ae49926bf82899c (patch) | |
| tree | 21b8267a41fa49423657726b56f314fa8c6b6506 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| parent | livepatch: Improve error handling in klp_disable_func() (diff) | |
| download | kernel-qcow2-linux-45c680b9949ecdb829a331100ae49926bf82899c.tar.gz kernel-qcow2-linux-45c680b9949ecdb829a331100ae49926bf82899c.tar.xz kernel-qcow2-linux-45c680b9949ecdb829a331100ae49926bf82899c.zip | |
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.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index c40ebcca0495..6e5344112419 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)) |