hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/kernel/livepatch/patch.c
....@@ -1,22 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * patch.c - livepatch patching functions
34 *
45 * Copyright (C) 2014 Seth Jennings <sjenning@redhat.com>
56 * Copyright (C) 2014 SUSE
67 * Copyright (C) 2015 Josh Poimboeuf <jpoimboe@redhat.com>
7
- *
8
- * This program is free software; you can redistribute it and/or
9
- * modify it under the terms of the GNU General Public License
10
- * as published by the Free Software Foundation; either version 2
11
- * of the License, or (at your option) any later version.
12
- *
13
- * This program is distributed in the hope that it will be useful,
14
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16
- * GNU General Public License for more details.
17
- *
18
- * You should have received a copy of the GNU General Public License
19
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
208 */
219
2210 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
....@@ -34,7 +22,7 @@
3422
3523 static LIST_HEAD(klp_ops);
3624
37
-struct klp_ops *klp_find_ops(unsigned long old_addr)
25
+struct klp_ops *klp_find_ops(void *old_func)
3826 {
3927 struct klp_ops *ops;
4028 struct klp_func *func;
....@@ -42,7 +30,7 @@
4230 list_for_each_entry(ops, &klp_ops, node) {
4331 func = list_first_entry(&ops->func_stack, struct klp_func,
4432 stack_node);
45
- if (func->old_addr == old_addr)
33
+ if (func->old_func == old_func)
4634 return ops;
4735 }
4836
....@@ -61,7 +49,7 @@
6149 ops = container_of(fops, struct klp_ops, fops);
6250
6351 /*
64
- * A variant of synchronize_sched() is used to allow patching functions
52
+ * A variant of synchronize_rcu() is used to allow patching functions
6553 * where RCU is not watching, see klp_synchronize_transition().
6654 */
6755 preempt_disable_notrace();
....@@ -72,7 +60,7 @@
7260 /*
7361 * func should never be NULL because preemption should be disabled here
7462 * and unregister_ftrace_function() does the equivalent of a
75
- * synchronize_sched() before the func_stack removal.
63
+ * synchronize_rcu() before the func_stack removal.
7664 */
7765 if (WARN_ON_ONCE(!func))
7866 goto unlock;
....@@ -118,7 +106,15 @@
118106 }
119107 }
120108
109
+ /*
110
+ * NOPs are used to replace existing patches with original code.
111
+ * Do nothing! Setting pc would cause an infinite loop.
112
+ */
113
+ if (func->nop)
114
+ goto unlock;
115
+
121116 klp_arch_set_pc(regs, (unsigned long)func->new_func);
117
+
122118 unlock:
123119 preempt_enable_notrace();
124120 }
....@@ -142,17 +138,18 @@
142138
143139 if (WARN_ON(!func->patched))
144140 return;
145
- if (WARN_ON(!func->old_addr))
141
+ if (WARN_ON(!func->old_func))
146142 return;
147143
148
- ops = klp_find_ops(func->old_addr);
144
+ ops = klp_find_ops(func->old_func);
149145 if (WARN_ON(!ops))
150146 return;
151147
152148 if (list_is_singular(&ops->func_stack)) {
153149 unsigned long ftrace_loc;
154150
155
- ftrace_loc = klp_get_ftrace_location(func->old_addr);
151
+ ftrace_loc =
152
+ klp_get_ftrace_location((unsigned long)func->old_func);
156153 if (WARN_ON(!ftrace_loc))
157154 return;
158155
....@@ -174,17 +171,18 @@
174171 struct klp_ops *ops;
175172 int ret;
176173
177
- if (WARN_ON(!func->old_addr))
174
+ if (WARN_ON(!func->old_func))
178175 return -EINVAL;
179176
180177 if (WARN_ON(func->patched))
181178 return -EINVAL;
182179
183
- ops = klp_find_ops(func->old_addr);
180
+ ops = klp_find_ops(func->old_func);
184181 if (!ops) {
185182 unsigned long ftrace_loc;
186183
187
- ftrace_loc = klp_get_ftrace_location(func->old_addr);
184
+ ftrace_loc =
185
+ klp_get_ftrace_location((unsigned long)func->old_func);
188186 if (!ftrace_loc) {
189187 pr_err("failed to find location for function '%s'\n",
190188 func->old_name);
....@@ -198,7 +196,8 @@
198196 ops->fops.func = klp_ftrace_handler;
199197 ops->fops.flags = FTRACE_OPS_FL_SAVE_REGS |
200198 FTRACE_OPS_FL_DYNAMIC |
201
- FTRACE_OPS_FL_IPMODIFY;
199
+ FTRACE_OPS_FL_IPMODIFY |
200
+ FTRACE_OPS_FL_PERMANENT;
202201
203202 list_add(&ops->node, &klp_ops);
204203
....@@ -236,15 +235,26 @@
236235 return ret;
237236 }
238237
239
-void klp_unpatch_object(struct klp_object *obj)
238
+static void __klp_unpatch_object(struct klp_object *obj, bool nops_only)
240239 {
241240 struct klp_func *func;
242241
243
- klp_for_each_func(obj, func)
242
+ klp_for_each_func(obj, func) {
243
+ if (nops_only && !func->nop)
244
+ continue;
245
+
244246 if (func->patched)
245247 klp_unpatch_func(func);
248
+ }
246249
247
- obj->patched = false;
250
+ if (obj->dynamic || !nops_only)
251
+ obj->patched = false;
252
+}
253
+
254
+
255
+void klp_unpatch_object(struct klp_object *obj)
256
+{
257
+ __klp_unpatch_object(obj, false);
248258 }
249259
250260 int klp_patch_object(struct klp_object *obj)
....@@ -267,11 +277,21 @@
267277 return 0;
268278 }
269279
270
-void klp_unpatch_objects(struct klp_patch *patch)
280
+static void __klp_unpatch_objects(struct klp_patch *patch, bool nops_only)
271281 {
272282 struct klp_object *obj;
273283
274284 klp_for_each_object(patch, obj)
275285 if (obj->patched)
276
- klp_unpatch_object(obj);
286
+ __klp_unpatch_object(obj, nops_only);
287
+}
288
+
289
+void klp_unpatch_objects(struct klp_patch *patch)
290
+{
291
+ __klp_unpatch_objects(patch, false);
292
+}
293
+
294
+void klp_unpatch_objects_dynamic(struct klp_patch *patch)
295
+{
296
+ __klp_unpatch_objects(patch, true);
277297 }