linux-kernel - [tip:perf/core] kprobes: Disable the jprobes test code

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-2c7d662e2647aa55fa56dc449b3878ac24e17adf@git.kernel.org>
Date:   Fri, 20 Oct 2017 05:26:33 -0700
From:   tip-bot for Masami Hiramatsu <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     keescook@...omium.org, peterz@...radead.org,
        linux-kernel@...r.kernel.org, vyasevich@...il.com,
        mhiramat@...nel.org, hpa@...or.com, rostedt@...dmis.org,
        ast@...nel.org, davem@...emloft.net, ananth@...ux.vnet.ibm.com,
        paulmck@...ux.vnet.ibm.com, mingo@...nel.org,
        stephen@...workplumber.org, ian.mcdonald@...di.co.nz,
        anil.s.keshavamurthy@...el.com, torvalds@...ux-foundation.org,
        tglx@...utronix.de
Subject: [tip:perf/core] kprobes: Disable the jprobes test code

Commit-ID:  2c7d662e2647aa55fa56dc449b3878ac24e17adf
Gitweb:     https://git.kernel.org/tip/2c7d662e2647aa55fa56dc449b3878ac24e17adf
Author:     Masami Hiramatsu <mhiramat@...nel.org>
AuthorDate: Fri, 6 Oct 2017 08:15:17 +0900
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Fri, 20 Oct 2017 11:02:54 +0200

kprobes: Disable the jprobes test code

Disable jprobes test code because jprobes are deprecated.
This code will be completely removed when the jprobe code
is removed.

Signed-off-by: Masami Hiramatsu <mhiramat@...nel.org>
Cc: Alexei Starovoitov <ast@...nel.org>
Cc: Ananth N Mavinakayanahalli <ananth@...ux.vnet.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@...el.com>
Cc: David S . Miller <davem@...emloft.net>
Cc: Ian McDonald <ian.mcdonald@...di.co.nz>
Cc: Kees Cook <keescook@...omium.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Paul E . McKenney <paulmck@...ux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephen Hemminger <stephen@...workplumber.org>
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Vlad Yasevich <vyasevich@...il.com>
Link: http://lkml.kernel.org/r/150724531730.5014.6377596890962355763.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 kernel/test_kprobes.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kernel/test_kprobes.c b/kernel/test_kprobes.c
index 47106a1..dd53e35 100644
--- a/kernel/test_kprobes.c
+++ b/kernel/test_kprobes.c
@@ -22,7 +22,7 @@
 
 #define div_factor 3
 
-static u32 rand1, preh_val, posth_val, jph_val;
+static u32 rand1, preh_val, posth_val;
 static int errors, handler_errors, num_tests;
 static u32 (*target)(u32 value);
 static u32 (*target2)(u32 value);
@@ -162,6 +162,9 @@ static int test_kprobes(void)
 
 }
 
+#if 0
+static u32 jph_val;
+
 static u32 j_kprobe_target(u32 value)
 {
 	if (preemptible()) {
@@ -239,6 +242,10 @@ static int test_jprobes(void)
 
 	return 0;
 }
+#else
+#define test_jprobe() (0)
+#define test_jprobes() (0)
+#endif
 #ifdef CONFIG_KRETPROBES
 static u32 krph_val;