lkml.org 
[lkml]   [2020]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/3] arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page
    Date
    Use PAGE_KERNEL_ROX directly instead of allocating RWX and setting the
    page read-only just after the allocation.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/arm64/kernel/probes/kprobes.c | 12 +++---------
    1 file changed, 3 insertions(+), 9 deletions(-)

    diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
    index d1c95dcf1d7833..cbe49cd117cfec 100644
    --- a/arch/arm64/kernel/probes/kprobes.c
    +++ b/arch/arm64/kernel/probes/kprobes.c
    @@ -120,15 +120,9 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)

    void *alloc_insn_page(void)
    {
    - void *page;
    -
    - page = vmalloc_exec(PAGE_SIZE);
    - if (page) {
    - set_memory_ro((unsigned long)page, 1);
    - set_vm_flush_reset_perms(page);
    - }
    -
    - return page;
    + return __vmalloc_node_range(PAGE_SIZE, 1, VMALLOC_START, VMALLOC_END,
    + GFP_KERNEL, PAGE_KERNEL_ROX, VM_FLUSH_RESET_PERMS,
    + NUMA_NO_NODE, __func__);
    }

    /* arm kprobe: install breakpoint in text */
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-06-18 08:44    [W:3.615 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site