aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/kprobes.c
diff options
context:
space:
mode:
authorAnanth N Mavinakayanahalli <ananth@in.ibm.com>2007-05-08 03:28:27 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:08 -0400
commit0f95b7fc839bc3272b1bf2325d8748a649bd3534 (patch)
treec5cbf5eabc5b58867d7a8949c412163e37182542 /arch/x86_64/kernel/kprobes.c
parent8f0c45cdf87dc9141e87b0ad2fc6fff216a95f79 (diff)
Kprobes: print details of kretprobe on assertion failure
In certain cases like when the real return address can't be found or when the number of tracked calls to a kretprobed function is less than the number of returns, we may not be able to find the correct return address after processing a kretprobe. Currently we just do a BUG_ON, but no information is provided about the actual failing kretprobe. Print out details of the kretprobe before calling BUG(). Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: Prasanna S Panchamukhi <prasanna@in.ibm.com> Cc: Jim Keniston <jkenisto@us.ibm.com> Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> Cc: Maneesh Soni <maneesh@in.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel/kprobes.c')
-rw-r--r--arch/x86_64/kernel/kprobes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c
index 90e7008cd899..5841ba5f479b 100644
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86_64/kernel/kprobes.c
@@ -447,7 +447,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
447 break; 447 break;
448 } 448 }
449 449
450 BUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address)); 450 kretprobe_assert(ri, orig_ret_address, trampoline_address);
451 regs->rip = orig_ret_address; 451 regs->rip = orig_ret_address;
452 452
453 reset_current_kprobe(); 453 reset_current_kprobe();