Subject: [PATCH 29/35] trace/kprobes: Add back warning about offset in return probes

From: Arnaldo Carvalho de Melo <[email-masked]>
Date: Mon, 6 Mar 2017 16:38:19 -0300

From: "Steven Rostedt (VMware)" <[email-masked]>

Let's not remove the warning about offsets and return probes when the
offset is invalid.

Signed-off-by: Steven Rostedt <[email-masked]>
Acked-by: Masami Hiramatsu <[email-masked]>
Acked-by: Naveen N. Rao <[email-masked]>
Cc: Ananth N Mavinakayanahalli <[email-masked]>
Cc: Michael Ellerman <[email-masked]>
Cc: [email-masked]
Link: http://lkml.kernel.org/r/[email-masked]
Signed-off-by: Arnaldo Carvalho de Melo <[email-masked]>
---
 kernel/trace/trace_kprobe.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 18775ef182f8..2b7d0dd938ba 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -695,6 +695,11 @@ static int create_trace_kprobe(int argc, char **argv)
 			pr_info("Failed to parse symbol.\n");
 			return ret;
 		}
+		if (offset && is_return &&
+		    !arch_function_offset_within_entry(offset)) {
+			pr_info("Given offset is not valid for return probe.\n");
+			return -EINVAL;
+		}
 	}
 	argc -= 2; argv += 2;
 
-- 
2.9.3