lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 188/232] kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE
    Date
    From: Muchun Song <songmuchun@bytedance.com>

    [ Upstream commit 10de795a5addd1962406796a6e13ba6cc0fc6bee ]

    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: 0cb2f1372baa ("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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/kprobes.c | 17 ++++++++++++++---
    1 file changed, 14 insertions(+), 3 deletions(-)

    diff --git a/kernel/kprobes.c b/kernel/kprobes.c
    index f54d4a29fc26e..72af5d37e9ff1 100644
    --- a/kernel/kprobes.c
    +++ b/kernel/kprobes.c
    @@ -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 */
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 15:32    [W:2.251 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site