aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/livepatch/transition.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c
index 2de09e0c4e5c..adc0cc64aa4b 100644
--- a/kernel/livepatch/transition.c
+++ b/kernel/livepatch/transition.c
@@ -120,31 +120,11 @@ done:
120 */ 120 */
121void klp_cancel_transition(void) 121void klp_cancel_transition(void)
122{ 122{
123 struct klp_patch *patch = klp_transition_patch;
124 struct klp_object *obj;
125 struct klp_func *func;
126 bool immediate_func = false;
127
128 if (WARN_ON_ONCE(klp_target_state != KLP_PATCHED)) 123 if (WARN_ON_ONCE(klp_target_state != KLP_PATCHED))
129 return; 124 return;
130 125
131 klp_target_state = KLP_UNPATCHED; 126 klp_target_state = KLP_UNPATCHED;
132 klp_complete_transition(); 127 klp_complete_transition();
133
134 /*
135 * In the enable error path, even immediate patches can be safely
136 * removed because the transition hasn't been started yet.
137 *
138 * klp_complete_transition() doesn't have a module_put() for immediate
139 * patches, so do it here.
140 */
141 klp_for_each_object(patch, obj)
142 klp_for_each_func(obj, func)
143 if (func->immediate)
144 immediate_func = true;
145
146 if (patch->immediate || immediate_func)
147 module_put(patch->mod);
148} 128}
149 129
150/* 130/*