Skip to content

Commit

Permalink
livepatch: Improve error handling in klp_disable_func()
Browse files Browse the repository at this point in the history
In case of func->state or func->old_addr not having expected values,
we'd rather bail out immediately from klp_disable_func().

This can't really happen with the current codebase, but fix this
anyway in the sake of robustness.

[jkosina@suse.com: reworded the changelog a bit]
Signed-off-by: Minfei Huang <mnfhuang@gmail.com>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
  • Loading branch information
Minfei Huang authored and Jiri Kosina committed Jul 14, 2015
1 parent 0faef83 commit 225f58f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions kernel/livepatch/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 225f58f

Please sign in to comment.