diff options
| -rw-r--r-- | include/linux/bug.h | 5 | ||||
| -rw-r--r-- | kernel/kprobes.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/bug.h b/include/linux/bug.h index da4231c905c8..f48597417791 100644 --- a/include/linux/bug.h +++ b/include/linux/bug.h @@ -45,6 +45,11 @@ int is_valid_bugaddr(unsigned long addr); #else /* !CONFIG_GENERIC_BUG */ +static inline void *find_bug(unsigned long bugaddr) +{ + return NULL; +} + static inline enum bug_trap_type report_bug(unsigned long bug_addr, struct pt_regs *regs) { diff --git a/kernel/kprobes.c b/kernel/kprobes.c index c43bc2bc5b2c..f7a4602a76f9 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1501,7 +1501,8 @@ static int check_kprobe_address_safe(struct kprobe *p, /* Ensure it is not in reserved area nor out of text */ if (!kernel_text_address((unsigned long) p->addr) || within_kprobe_blacklist((unsigned long) p->addr) || - jump_label_text_reserved(p->addr, p->addr)) { + jump_label_text_reserved(p->addr, p->addr) || + find_bug((unsigned long)p->addr)) { ret = -EINVAL; goto out; } |