lkml.org 
[lkml]   [2019]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/4] arm64: kprobes: Move exception_text check in blacklist
    Date
    Move exception/irqentry text address check in blacklist,
    since those are symbol based rejection.

    If we prohibit probing on the symbols in exception_text,
    those should be blacklisted.

    Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
    ---
    arch/arm64/kernel/probes/kprobes.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
    index 1dae500d0a81..b9e9758b6534 100644
    --- a/arch/arm64/kernel/probes/kprobes.c
    +++ b/arch/arm64/kernel/probes/kprobes.c
    @@ -98,9 +98,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
    /* copy instruction */
    p->opcode = le32_to_cpu(*p->addr);

    - if (in_exception_text(probe_addr))
    - return -EINVAL;
    -
    if (search_exception_tables(probe_addr))
    return -EINVAL;

    @@ -475,7 +472,8 @@ bool arch_within_kprobe_blacklist(unsigned long addr)
    (addr >= (unsigned long)__entry_text_start &&
    addr < (unsigned long)__entry_text_end) ||
    (addr >= (unsigned long)__idmap_text_start &&
    - addr < (unsigned long)__idmap_text_end))
    + addr < (unsigned long)__idmap_text_end) ||
    + in_exception_text(addr))
    return true;

    if (!is_kernel_in_hyp_mode()) {
    \
     
     \ /
      Last update: 2019-01-15 07:26    [W:4.574 / U:0.492 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site