hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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()
This commit is contained in:
Linus Torvalds 2015-09-01 18:44:28 -07:00
parent 851328feb8 225f58fbcc
commit 45c680b994
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/livepatch/core.c
View File

@ -348,8 +348,10 @@ static void klp_disable_func(struct klp_func *func)
{ {
struct klp_ops *ops; struct klp_ops *ops;
WARN_ON(func->state != KLP_ENABLED); if (WARN_ON(func->state != KLP_ENABLED))
WARN_ON(!func->old_addr); return;
if (WARN_ON(!func->old_addr))
return;
ops = klp_find_ops(func->old_addr); ops = klp_find_ops(func->old_addr);
if (WARN_ON(!ops)) if (WARN_ON(!ops))