diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-28 23:38:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-28 23:38:31 +0200 |
| commit | d111c9f0344a5e2454726553c663d25e24e38555 (patch) | |
| tree | dfc43f93831782d5e1e99f157a6fe37f81f10abe /kernel | |
| parent | Merge tag 'for-linus-5.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | Merge branch 'for-5.18/selftests-fixes' into for-linus (diff) | |
| download | linux-d111c9f0344a5e2454726553c663d25e24e38555.tar.xz linux-d111c9f0344a5e2454726553c663d25e24e38555.zip | |
Merge tag 'livepatching-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching updates from Petr Mladek:
- Forced transitions block only to-be-removed livepatches [Chengming]
- Detect when ftrace handler could not be disabled in self-tests [David]
- Calm down warning from a static analyzer [Tom]
* tag 'livepatching-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
livepatch: Reorder to use before freeing a pointer
livepatch: Don't block removal of patches that are safe to unload
livepatch: Skip livepatch tests if ftrace cannot be configured
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/livepatch/transition.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c index 5683ac0d2566..77ef45a1e0a3 100644 --- a/kernel/livepatch/transition.c +++ b/kernel/livepatch/transition.c @@ -641,6 +641,13 @@ void klp_force_transition(void) for_each_possible_cpu(cpu) klp_update_patch_state(idle_task(cpu)); - klp_for_each_patch(patch) - patch->forced = true; + /* Set forced flag for patches being removed. */ + if (klp_target_state == KLP_UNPATCHED) + klp_transition_patch->forced = true; + else if (klp_transition_patch->replace) { + klp_for_each_patch(patch) { + if (patch != klp_transition_patch) + patch->forced = true; + } + } } |