* [PATCH] kprobes: fix compiler warning for !CONFIG_KPROBES_ON_FTRACE
@ 2020-08-05 17:20 Muchun Song
2020-08-06 1:30 ` Masami Hiramatsu
2020-08-06 5:41 ` John Fastabend
0 siblings, 2 replies; 3+ messages in thread
From: Muchun Song @ 2020-08-05 17:20 UTC (permalink / raw)
To: rostedt, naveen.n.rao, anil.s.keshavamurthy, davem, mhiramat, ast,
daniel, kafai, songliubraving, yhs, andriin, john.fastabend,
kpsingh, sfr, mingo, akpm
Cc: linux-kernel, netdev, bpf, Muchun Song
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
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 0cb2f1372baa ("kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler")
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
kernel/kprobes.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 503add629599..d36e2b017588 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1114,9 +1114,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 */
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] kprobes: fix compiler warning for !CONFIG_KPROBES_ON_FTRACE
2020-08-05 17:20 [PATCH] kprobes: fix compiler warning for !CONFIG_KPROBES_ON_FTRACE Muchun Song
@ 2020-08-06 1:30 ` Masami Hiramatsu
2020-08-06 5:41 ` John Fastabend
1 sibling, 0 replies; 3+ messages in thread
From: Masami Hiramatsu @ 2020-08-06 1:30 UTC (permalink / raw)
To: Muchun Song
Cc: rostedt, naveen.n.rao, anil.s.keshavamurthy, davem, ast, daniel,
kafai, songliubraving, yhs, andriin, john.fastabend, kpsingh, sfr,
mingo, akpm, linux-kernel, netdev, bpf
On Thu, 6 Aug 2020 01:20:46 +0800
Muchun Song <songmuchun@bytedance.com> wrote:
> 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
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Fixes: 0cb2f1372baa ("kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler")
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Looks good to me.
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Thank you!
> ---
> kernel/kprobes.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> index 503add629599..d36e2b017588 100644
> --- a/kernel/kprobes.c
> +++ b/kernel/kprobes.c
> @@ -1114,9 +1114,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 */
> --
> 2.11.0
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH] kprobes: fix compiler warning for !CONFIG_KPROBES_ON_FTRACE
2020-08-05 17:20 [PATCH] kprobes: fix compiler warning for !CONFIG_KPROBES_ON_FTRACE Muchun Song
2020-08-06 1:30 ` Masami Hiramatsu
@ 2020-08-06 5:41 ` John Fastabend
1 sibling, 0 replies; 3+ messages in thread
From: John Fastabend @ 2020-08-06 5:41 UTC (permalink / raw)
To: Muchun Song, rostedt, naveen.n.rao, anil.s.keshavamurthy, davem,
mhiramat, ast, daniel, kafai, songliubraving, yhs, andriin,
john.fastabend, kpsingh, sfr, mingo, akpm
Cc: linux-kernel, netdev, bpf, Muchun Song
Muchun Song wrote:
> 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
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Fixes: 0cb2f1372baa ("kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler")
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>
> ---
Acked-by: John Fastabend <john.fastabend@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-06 11:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-05 17:20 [PATCH] kprobes: fix compiler warning for !CONFIG_KPROBES_ON_FTRACE Muchun Song
2020-08-06 1:30 ` Masami Hiramatsu
2020-08-06 5:41 ` John Fastabend
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox