Commit-ID:  4650209b166789182657c8eb0612cecd5b54d591
Gitweb:     https://git.kernel.org/tip/4650209b166789182657c8eb0612cecd5b54d591
Author:     Masami Hiramatsu <mhira...@kernel.org>
AuthorDate: Sat, 4 Nov 2017 13:30:52 +0900
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Tue, 7 Nov 2017 11:25:14 +0100

arm/kprobes: Fix kretprobe test to check correct counter

test_kretprobe() uses jprobe_func_called at the
last test, but it must check kretprobe_handler_called.

Signed-off-by: Masami Hiramatsu <mhira...@kernel.org>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: Jon Medhurst <t...@linaro.org>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Mark Brown <broo...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Russell King <li...@armlinux.org.uk>
Cc: Stephen Rothwell <s...@canb.auug.org.au>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Wang Nan <wangn...@huawei.com>
Cc: linux-arm-ker...@lists.infradead.org
Link: 
http://lkml.kernel.org/r/150976985182.2012.15495311380682779381.stgit@devbox
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 arch/arm/probes/kprobes/test-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/probes/kprobes/test-core.c 
b/arch/arm/probes/kprobes/test-core.c
index 1c98a87..9c3ceba 100644
--- a/arch/arm/probes/kprobes/test-core.c
+++ b/arch/arm/probes/kprobes/test-core.c
@@ -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;
        }

Reply via email to