Commit 10de795a authored Aug 06, 2020 by Muchun Song Committed by Steven Rostedt (VMware) Aug 06, 2020

kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE

Fix compiler warning(as show below) for !CONFIG_KPROBES_ON_FTRACE.

kernel/kprobes.c: In function 'kill_kprobe':
kernel/kprobes.c:1116:33: warning: statement with no effect
[-Wunused-value]
 1116 | #define disarm_kprobe_ftrace(p) (-ENODEV)
      |                                 ^
kernel/kprobes.c:2154:3: note: in expansion of macro
'disarm_kprobe_ftrace'
 2154 |   disarm_kprobe_ftrace(p);

Link: https://lore.kernel.org/r/20200805142136.0331f7ea@canb.auug.org.au
Link: https://lkml.kernel.org/r/20200805172046.19066-1-songmuchun@bytedance.com



Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 0cb2f137 ("kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler")
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent afcab636

kernel/kprobes.c

+14 −3

Original line number	Diff line number	Diff line
		@@ -1079,9 +1079,20 @@ static int disarm_kprobe_ftrace(struct kprobe *p)
		ipmodify ? &kprobe_ipmodify_enabled : &kprobe_ftrace_enabled);
		}
		#else /* !CONFIG_KPROBES_ON_FTRACE */
		#define prepare_kprobe(p) arch_prepare_kprobe(p)
		#define arm_kprobe_ftrace(p) (-ENODEV)
		#define disarm_kprobe_ftrace(p) (-ENODEV)
		static inline int prepare_kprobe(struct kprobe *p)
		{
		return arch_prepare_kprobe(p);
		}

		static inline int arm_kprobe_ftrace(struct kprobe *p)
		{
		return -ENODEV;
		}

		static inline int disarm_kprobe_ftrace(struct kprobe *p)
		{
		return -ENODEV;
		}
		#endif

		/* Arm a kprobe with text_mutex */

Admin message