|
@@ -1410,16 +1410,10 @@ static inline int check_kprobe_rereg(struct kprobe *p)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int check_kprobe_address_safe(struct kprobe *p,
|
|
|
- struct module **probed_mod)
|
|
|
+int __weak arch_check_ftrace_location(struct kprobe *p)
|
|
|
{
|
|
|
- int ret = 0;
|
|
|
unsigned long ftrace_addr;
|
|
|
|
|
|
- /*
|
|
|
- * If the address is located on a ftrace nop, set the
|
|
|
- * breakpoint to the following instruction.
|
|
|
- */
|
|
|
ftrace_addr = ftrace_location((unsigned long)p->addr);
|
|
|
if (ftrace_addr) {
|
|
|
#ifdef CONFIG_KPROBES_ON_FTRACE
|
|
@@ -1431,7 +1425,17 @@ static int check_kprobe_address_safe(struct kprobe *p,
|
|
|
return -EINVAL;
|
|
|
#endif
|
|
|
}
|
|
|
+ return 0;
|
|
|
+}
|
|
|
|
|
|
+static int check_kprobe_address_safe(struct kprobe *p,
|
|
|
+ struct module **probed_mod)
|
|
|
+{
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ ret = arch_check_ftrace_location(p);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
jump_label_lock();
|
|
|
preempt_disable();
|
|
|
|