lkml.org 
[lkml]   [2019]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 4/6] ARM: Define the virtual space of KASan's shadow region
    Date
    From: Abbott Liu <liuwenliang@huawei.com>

    Define KASAN_SHADOW_OFFSET,KASAN_SHADOW_START and KASAN_SHADOW_END for arm
    kernel address sanitizer.

    +----+ 0xffffffff
    | |
    | |
    | |
    +----+ CONFIG_PAGE_OFFSET
    | | | | |-> module virtual address space area.
    | |/
    +----+ MODULE_VADDR = KASAN_SHADOW_END
    | | | | |-> the shadow area of kernel virtual address.
    | |/
    +----+ TASK_SIZE(start of kernel space) = KASAN_SHADOW_START the
    | |\ shadow address of MODULE_VADDR
    | | ---------------------+
    | | |
    + + KASAN_SHADOW_OFFSET |-> the user space area. Kernel address
    | | | sanitizer do not use this space.
    | | ---------------------+
    | |/
    ------ 0

    1)KASAN_SHADOW_OFFSET:
    This value is used to map an address to the corresponding shadow
    address by the following formula:
    shadow_addr = (address >> 3) + KASAN_SHADOW_OFFSET;

    2)KASAN_SHADOW_START
    This value is the MODULE_VADDR's shadow address. It is the start
    of kernel virtual space.

    3)KASAN_SHADOW_END
    This value is the 0x100000000's shadow address. It is the end of
    kernel addresssanitizer's shadow area. It is also the start of the
    module area.

    When enable kasan, the definition of TASK_SIZE is not an an 8-bit
    rotated constant, so we need to modify the TASK_SIZE access code
    in the *.s file.

    Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
    Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Signed-off-by: Abbott Liu <liuwenliang@huawei.com>
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    ---
    arch/arm/include/asm/kasan_def.h | 64 ++++++++++++++++++++++++++++++++
    arch/arm/include/asm/memory.h | 5 +++
    arch/arm/kernel/entry-armv.S | 5 ++-
    arch/arm/kernel/entry-common.S | 9 +++--
    arch/arm/mm/mmu.c | 7 +++-
    5 files changed, 84 insertions(+), 6 deletions(-)
    create mode 100644 arch/arm/include/asm/kasan_def.h

    diff --git a/arch/arm/include/asm/kasan_def.h b/arch/arm/include/asm/kasan_def.h
    new file mode 100644
    index 000000000000..7b7f42435146
    --- /dev/null
    +++ b/arch/arm/include/asm/kasan_def.h
    @@ -0,0 +1,64 @@
    +/*
    + * arch/arm/include/asm/kasan_def.h
    + *
    + * Copyright (c) 2018 Huawei Technologies Co., Ltd.
    + *
    + * Author: Abbott Liu <liuwenliang@huawei.com>
    + *
    + * This program is free software; you can redistribute it and/or modify
    + * it under the terms of the GNU General Public License version 2 as
    + * published by the Free Software Foundation.
    + */
    +
    +#ifndef __ASM_KASAN_DEF_H
    +#define __ASM_KASAN_DEF_H
    +
    +#ifdef CONFIG_KASAN
    +
    +/*
    + * +----+ 0xffffffff
    + * | |
    + * | |
    + * | |
    + * +----+ CONFIG_PAGE_OFFSET
    + * | |\
    + * | | |-> module virtual address space area.
    + * | |/
    + * +----+ MODULE_VADDR = KASAN_SHADOW_END
    + * | |\
    + * | | |-> the shadow area of kernel virtual address.
    + * | |/
    + * +----+ TASK_SIZE(start of kernel space) = KASAN_SHADOW_START the
    + * | |\ shadow address of MODULE_VADDR
    + * | | ---------------------+
    + * | | |
    + * + + KASAN_SHADOW_OFFSET |-> the user space area. Kernel address
    + * | | | sanitizer do not use this space.
    + * | | ---------------------+
    + * | |/
    + * ------ 0
    + *
    + *1)KASAN_SHADOW_OFFSET:
    + * This value is used to map an address to the corresponding shadow
    + * address by the following formula:
    + * shadow_addr = (address >> 3) + KASAN_SHADOW_OFFSET;
    + *
    + * 2)KASAN_SHADOW_START
    + * This value is the MODULE_VADDR's shadow address. It is the start
    + * of kernel virtual space.
    + *
    + * 3) KASAN_SHADOW_END
    + * This value is the 0x100000000's shadow address. It is the end of
    + * kernel addresssanitizer's shadow area. It is also the start of the
    + * module area.
    + *
    + */
    +
    +#define KASAN_SHADOW_OFFSET (KASAN_SHADOW_END - (1<<29))
    +
    +#define KASAN_SHADOW_START ((KASAN_SHADOW_END >> 3) + KASAN_SHADOW_OFFSET)
    +
    +#define KASAN_SHADOW_END (UL(CONFIG_PAGE_OFFSET) - UL(SZ_16M))
    +
    +#endif
    +#endif
    diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
    index ed8fd0d19a3e..6e099a5458db 100644
    --- a/arch/arm/include/asm/memory.h
    +++ b/arch/arm/include/asm/memory.h
    @@ -21,6 +21,7 @@
    #ifdef CONFIG_NEED_MACH_MEMORY_H
    #include <mach/memory.h>
    #endif
    +#include <asm/kasan_def.h>

    /* PAGE_OFFSET - the virtual address of the start of the kernel image */
    #define PAGE_OFFSET UL(CONFIG_PAGE_OFFSET)
    @@ -31,7 +32,11 @@
    * TASK_SIZE - the maximum size of a user space task.
    * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area
    */
    +#ifndef CONFIG_KASAN
    #define TASK_SIZE (UL(CONFIG_PAGE_OFFSET) - UL(SZ_16M))
    +#else
    +#define TASK_SIZE (KASAN_SHADOW_START)
    +#endif
    #define TASK_UNMAPPED_BASE ALIGN(TASK_SIZE / 3, SZ_16M)

    /*
    diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
    index ce4aea57130a..c3ca3b96f22a 100644
    --- a/arch/arm/kernel/entry-armv.S
    +++ b/arch/arm/kernel/entry-armv.S
    @@ -183,7 +183,7 @@ ENDPROC(__und_invalid)

    get_thread_info tsk
    ldr r0, [tsk, #TI_ADDR_LIMIT]
    - mov r1, #TASK_SIZE
    + ldr r1, =TASK_SIZE
    str r1, [tsk, #TI_ADDR_LIMIT]
    str r0, [sp, #SVC_ADDR_LIMIT]

    @@ -437,7 +437,8 @@ ENDPROC(__fiq_abt)
    @ if it was interrupted in a critical region. Here we
    @ perform a quick test inline since it should be false
    @ 99.9999% of the time. The rest is done out of line.
    - cmp r4, #TASK_SIZE
    + ldr r0, =TASK_SIZE
    + cmp r4, r0
    blhs kuser_cmpxchg64_fixup
    #endif
    #endif
    diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
    index f7649adef505..0dfa3153d633 100644
    --- a/arch/arm/kernel/entry-common.S
    +++ b/arch/arm/kernel/entry-common.S
    @@ -53,7 +53,8 @@ __ret_fast_syscall:
    UNWIND(.cantunwind )
    disable_irq_notrace @ disable interrupts
    ldr r2, [tsk, #TI_ADDR_LIMIT]
    - cmp r2, #TASK_SIZE
    + ldr r1, =TASK_SIZE
    + cmp r2, r1
    blne addr_limit_check_failed
    ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
    tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
    @@ -90,7 +91,8 @@ __ret_fast_syscall:
    #endif
    disable_irq_notrace @ disable interrupts
    ldr r2, [tsk, #TI_ADDR_LIMIT]
    - cmp r2, #TASK_SIZE
    + ldr r1, =TASK_SIZE
    + cmp r2, r1
    blne addr_limit_check_failed
    ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
    tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
    @@ -131,7 +133,8 @@ ret_slow_syscall:
    disable_irq_notrace @ disable interrupts
    ENTRY(ret_to_user_from_irq)
    ldr r2, [tsk, #TI_ADDR_LIMIT]
    - cmp r2, #TASK_SIZE
    + ldr r1, =TASK_SIZE
    + cmp r2, r1
    blne addr_limit_check_failed
    ldr r1, [tsk, #TI_FLAGS]
    tst r1, #_TIF_WORK_MASK
    diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
    index f3ce34113f89..3ae33c2dc1ad 100644
    --- a/arch/arm/mm/mmu.c
    +++ b/arch/arm/mm/mmu.c
    @@ -1256,9 +1256,14 @@ static inline void prepare_page_table(void)
    /*
    * Clear out all the mappings below the kernel image.
    */
    - for (addr = 0; addr < MODULES_VADDR; addr += PMD_SIZE)
    + for (addr = 0; addr < TASK_SIZE; addr += PMD_SIZE)
    pmd_clear(pmd_off_k(addr));

    +#ifdef CONFIG_KASAN
    + /*TASK_SIZE ~ MODULES_VADDR is the KASAN's shadow area -- skip over it*/
    + addr = MODULES_VADDR;
    +#endif
    +
    #ifdef CONFIG_XIP_KERNEL
    /* The XIP kernel is mapped in the module area -- skip over it */
    addr = ((unsigned long)_exiprom + PMD_SIZE - 1) & PMD_MASK;
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-06-18 00:12    [W:2.905 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site