arm/kprobes: Fix kretprobe test to check correct counter
authorMasami Hiramatsu <mhiramat@kernel.org>
Sat, 4 Nov 2017 04:30:52 +0000 (13:30 +0900)
committerIngo Molnar <mingo@kernel.org>
Tue, 7 Nov 2017 10:25:14 +0000 (11:25 +0100)
test_kretprobe() uses jprobe_func_called at the
last test, but it must check kretprobe_handler_called.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jon Medhurst <tixy@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/150976985182.2012.15495311380682779381.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/arm/probes/kprobes/test-core.c

index 1c98a87..9c3ceba 100644 (file)
@@ -451,7 +451,7 @@ static int test_kretprobe(long (*func)(long, long))
        }
        if (!call_test_func(func, false))
                return -EINVAL;
-       if (jprobe_func_called == test_func_instance) {
+       if (kretprobe_handler_called == test_func_instance) {
                pr_err("FAIL: kretprobe called after unregistering\n");
                return -EINVAL;
        }