Skip to content

Commit 2957308

Browse files
Chengming Zhoupmladek
authored andcommitted
livepatch: Don't block removal of patches that are safe to unload
module_put() is not called for a patch with "forced" flag. It should block the removal of the livepatch module when the code might still be in use after forced transition. klp_force_transition() currently sets "forced" flag for all patches on the list. In fact, any patch can be safely unloaded when it passed through the consistency model in KLP_UNPATCHED transition. In other words, the "forced" flag must be set only for livepatches that are being removed. In particular, set the "forced" flag: + only for klp_transition_patch when the transition to KLP_UNPATCHED state was forced. + all replaced patches when the transition to KLP_PATCHED state was forced and the patch was replacing the existing patches. Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> Acked-by: Joe Lawrence <joe.lawrence@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.com> Tested-by: Petr Mladek <pmladek@suse.com> [mbenes@suse.cz: wording improvements] Signed-off-by: Petr Mladek <pmladek@suse.com> Link: https://lore.kernel.org/r/20220312152220.88127-1-zhouchengming@bytedance.com
1 parent 77dbd72 commit 2957308

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

kernel/livepatch/transition.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,13 @@ void klp_force_transition(void)
641641
for_each_possible_cpu(cpu)
642642
klp_update_patch_state(idle_task(cpu));
643643

644-
klp_for_each_patch(patch)
645-
patch->forced = true;
644+
/* Set forced flag for patches being removed. */
645+
if (klp_target_state == KLP_UNPATCHED)
646+
klp_transition_patch->forced = true;
647+
else if (klp_transition_patch->replace) {
648+
klp_for_each_patch(patch) {
649+
if (patch != klp_transition_patch)
650+
patch->forced = true;
651+
}
652+
}
646653
}

0 commit comments

Comments
 (0)