lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 071/135] powerpc/kprobes: Fixes for kprobe_lookup_name() on BE
    Date
    From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>

    [ Upstream commit 30176466e36aadba01e1a630cf42397a3438efa4 ]

    Fix two issues with kprobes.h on BE which were exposed with the
    optprobes work:
    - one, having to do with a missing include for linux/module.h for
    MODULE_NAME_LEN -- this didn't show up previously since the only
    users of kprobe_lookup_name were in kprobes.c, which included
    linux/module.h through other headers, and
    - two, with a missing const qualifier for a local variable which ends
    up referring a string literal. Again, this is unique to how
    kprobe_lookup_name is being invoked in optprobes.c

    Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/include/asm/kprobes.h | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h
    index 039b583db0292..f0717eedf781c 100644
    --- a/arch/powerpc/include/asm/kprobes.h
    +++ b/arch/powerpc/include/asm/kprobes.h
    @@ -29,6 +29,7 @@
    #include <linux/types.h>
    #include <linux/ptrace.h>
    #include <linux/percpu.h>
    +#include <linux/module.h>
    #include <asm/probes.h>
    #include <asm/code-patching.h>

    @@ -61,7 +62,7 @@ typedef ppc_opcode_t kprobe_opcode_t;
    #define kprobe_lookup_name(name, addr) \
    { \
    char dot_name[MODULE_NAME_LEN + 1 + KSYM_NAME_LEN]; \
    - char *modsym; \
    + const char *modsym; \
    bool dot_appended = false; \
    if ((modsym = strchr(name, ':')) != NULL) { \
    modsym++; \
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 21:03    [W:4.085 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site