linux-kernel - [tip:perf/kprobes] arm/kprobes: Fix kretprobe test to check correct counter

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-4650209b166789182657c8eb0612cecd5b54d591@git.kernel.org>
Date:   Tue, 7 Nov 2017 03:15:14 -0800
From:   tip-bot for Masami Hiramatsu <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     tglx@...utronix.de, linux@...linux.org.uk, wangnan0@...wei.com,
        arnd@...db.de, linux-kernel@...r.kernel.org, sfr@...b.auug.org.au,
        mingo@...nel.org, broonie@...nel.org,
        torvalds@...ux-foundation.org, hpa@...or.com, tixy@...aro.org,
        mhiramat@...nel.org, peterz@...radead.org
Subject: [tip:perf/kprobes] arm/kprobes: Fix kretprobe test to check correct
 counter

Commit-ID:  4650209b166789182657c8eb0612cecd5b54d591
Gitweb:     https://git.kernel.org/tip/4650209b166789182657c8eb0612cecd5b54d591
Author:     Masami Hiramatsu <mhiramat@...nel.org>
AuthorDate: Sat, 4 Nov 2017 13:30:52 +0900
Committer:  Ingo Molnar <mingo@...nel.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 <mhiramat@...nel.org>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Jon Medhurst <tixy@...aro.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Mark Brown <broonie@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Russell King <linux@...linux.org.uk>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Wang Nan <wangnan0@...wei.com>
Cc: linux-arm-kernel@...ts.infradead.org
Link: http://lkml.kernel.org/r/150976985182.2012.15495311380682779381.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@...nel.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;
 	}