1 files changed, 9 insertions, 0 deletions

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 9e47d8c493f3..3e9f513a728d 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -675,9 +675,18 @@ static struct notifier_block kprobe_exceptions_nb = {
         .priority = 0x7fffffff /* we need to be notified first */
 };
 
+unsigned long __weak arch_deref_entry_point(void *entry)
+{
+        return (unsigned long)entry;
+}
 
 int __kprobes register_jprobe(struct jprobe *jp)
 {
+        unsigned long addr = arch_deref_entry_point(jp->entry);
+
+        if (!kernel_text_address(addr))
+                return -EINVAL;
+
         /* Todo: Verify probepoint is a function entry point */
         jp->kp.pre_handler = setjmp_pre_handler;
         jp->kp.break_handler = longjmp_break_handler;