Skip to content

Commit 225f58f

Browse files
Minfei HuangJiri Kosina
authored andcommitted
livepatch: Improve error handling in klp_disable_func()
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. [[email protected]: reworded the changelog a bit] Signed-off-by: Minfei Huang <[email protected]> Acked-by: Josh Poimboeuf <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 0faef83 commit 225f58f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

kernel/livepatch/core.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,10 @@ static void klp_disable_func(struct klp_func *func)
348348
{
349349
struct klp_ops *ops;
350350

351-
WARN_ON(func->state != KLP_ENABLED);
352-
WARN_ON(!func->old_addr);
351+
if (WARN_ON(func->state != KLP_ENABLED))
352+
return;
353+
if (WARN_ON(!func->old_addr))
354+
return;
353355

354356
ops = klp_find_ops(func->old_addr);
355357
if (WARN_ON(!ops))

0 commit comments

Comments
 (0)