| Message ID | 20181219213338.26619-5-igor.stoppa@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hardening: statically allocated protected memory | expand |
On 19/12/2018 23:33, Igor Stoppa wrote: > + if (WARN_ONCE(op >= WR_OPS_NUMBER, "Invalid WR operation.") || > + WARN_ONCE(!is_wr_after_init(dst, len), "Invalid WR range.")) > + return (void *)dst; > + > + offset = dst - (unsigned long)&__start_wr_after_init; I forgot to remove the offset. If the whole kernel memory is remapped, it is shifted by wr_poking_base. I'll fix it in the next iteration. > + wr_poking_addr = wr_poking_base + offset; wr_poking_addr = wr_poking_base + dst; -- igor
Hello Igor, > +/* > + * The following two variables are statically allocated by the linker > + * script at the the boundaries of the memory region (rounded up to > + * multiples of PAGE_SIZE) reserved for __wr_after_init. > + */ > +extern long __start_wr_after_init; > +extern long __end_wr_after_init; > + > +static inline bool is_wr_after_init(unsigned long ptr, __kernel_size_t size) > +{ > + unsigned long start = (unsigned long)&__start_wr_after_init; > + unsigned long end = (unsigned long)&__end_wr_after_init; > + unsigned long low = ptr; > + unsigned long high = ptr + size; > + > + return likely(start <= low && low <= high && high <= end); > +} > + > +void *__wr_op(unsigned long dst, unsigned long src, __kernel_size_t len, > + enum wr_op_type op) > +{ > + temporary_mm_state_t prev; > + unsigned long offset; > + unsigned long wr_poking_addr; > + > + /* Confirm that the writable mapping exists. */ > + if (WARN_ONCE(!wr_ready, "No writable mapping available")) > + return (void *)dst; > + > + if (WARN_ONCE(op >= WR_OPS_NUMBER, "Invalid WR operation.") || > + WARN_ONCE(!is_wr_after_init(dst, len), "Invalid WR range.")) > + return (void *)dst; > + > + offset = dst - (unsigned long)&__start_wr_after_init; > + wr_poking_addr = wr_poking_base + offset; > + local_irq_disable(); > + prev = use_temporary_mm(wr_poking_mm); > + > + if (op == WR_MEMCPY) > + copy_to_user((void __user *)wr_poking_addr, (void *)src, len); > + else if (op == WR_MEMSET) > + memset_user((void __user *)wr_poking_addr, (u8)src, len); > + > + unuse_temporary_mm(prev); > + local_irq_enable(); > + return (void *)dst; > +} There's a lot of casting back and forth between unsigned long and void * (also in the previous patch). Is there a reason for that? My impression is that there would be less casts if variables holding addresses were declared as void * in the first place. In that case, it wouldn't hurt to have an additional argument in __rw_op() to carry the byte value for the WR_MEMSET operation. > + > +#define TB (1UL << 40) > + > +struct mm_struct *copy_init_mm(void); > +void __init wr_poking_init(void) > +{ > + unsigned long start = (unsigned long)&__start_wr_after_init; > + unsigned long end = (unsigned long)&__end_wr_after_init; > + unsigned long i; > + unsigned long wr_range; > + > + wr_poking_mm = copy_init_mm(); > + if (WARN_ONCE(!wr_poking_mm, "No alternate mapping available.")) > + return; > + > + wr_range = round_up(end - start, PAGE_SIZE); > + > + /* Randomize the poking address base*/ > + wr_poking_base = TASK_UNMAPPED_BASE + > + (kaslr_get_random_long("Write Rare Poking") & PAGE_MASK) % > + (TASK_SIZE - (TASK_UNMAPPED_BASE + wr_range)); > + > + /* > + * Place 64TB of kernel address space within 128TB of user address > + * space, at a random page aligned offset. > + */ > + wr_poking_base = (((unsigned long)kaslr_get_random_long("WR Poke")) & > + PAGE_MASK) % (64 * _BITUL(40)); You're setting wr_poking_base twice in a row? Is this an artifact from rebase? -- Thiago Jung Bauermann IBM Linux Technology Center
Hi, On 20/12/2018 19:20, Thiago Jung Bauermann wrote: > > Hello Igor, > >> +/* >> + * The following two variables are statically allocated by the linker >> + * script at the the boundaries of the memory region (rounded up to >> + * multiples of PAGE_SIZE) reserved for __wr_after_init. >> + */ >> +extern long __start_wr_after_init; >> +extern long __end_wr_after_init; >> + >> +static inline bool is_wr_after_init(unsigned long ptr, __kernel_size_t size) >> +{ >> + unsigned long start = (unsigned long)&__start_wr_after_init; >> + unsigned long end = (unsigned long)&__end_wr_after_init; >> + unsigned long low = ptr; >> + unsigned long high = ptr + size; >> + >> + return likely(start <= low && low <= high && high <= end); >> +} >> + >> +void *__wr_op(unsigned long dst, unsigned long src, __kernel_size_t len, >> + enum wr_op_type op) >> +{ >> + temporary_mm_state_t prev; >> + unsigned long offset; >> + unsigned long wr_poking_addr; >> + >> + /* Confirm that the writable mapping exists. */ >> + if (WARN_ONCE(!wr_ready, "No writable mapping available")) >> + return (void *)dst; >> + >> + if (WARN_ONCE(op >= WR_OPS_NUMBER, "Invalid WR operation.") || >> + WARN_ONCE(!is_wr_after_init(dst, len), "Invalid WR range.")) >> + return (void *)dst; >> + >> + offset = dst - (unsigned long)&__start_wr_after_init; >> + wr_poking_addr = wr_poking_base + offset; >> + local_irq_disable(); >> + prev = use_temporary_mm(wr_poking_mm); >> + >> + if (op == WR_MEMCPY) >> + copy_to_user((void __user *)wr_poking_addr, (void *)src, len); >> + else if (op == WR_MEMSET) >> + memset_user((void __user *)wr_poking_addr, (u8)src, len); >> + >> + unuse_temporary_mm(prev); >> + local_irq_enable(); >> + return (void *)dst; >> +} > > There's a lot of casting back and forth between unsigned long and void * > (also in the previous patch). Is there a reason for that? The intention is to ensure that algebraic operations between addresses are performed as intended, rather than gcc operating some incorrect optimization, wrongly assuming that two addresses belong to the same object. Said this, I can certainly have a further look at the code and see if I can reduce the amount of casts. I do not like them either. But I'm not sure how much can be dropped: if I start from (void *), then I have to cast them to unsigned long for the math. And the xxx_user() operations require a (void __user *). > My impression > is that there would be less casts if variables holding addresses were > declared as void * in the first place. It might save 1 or 2 casts. I'll do the count. > In that case, it wouldn't hurt to > have an additional argument in __rw_op() to carry the byte value for the > WR_MEMSET operation. Wouldn't it clobber one more register? Or can gcc figure out that it's not used? __wr_op() is not inline. >> + >> +#define TB (1UL << 40) ^^^^^^^^^^^^^^^^^^^^^^^^^^spurious >> + >> +struct mm_struct *copy_init_mm(void); >> +void __init wr_poking_init(void) >> +{ >> + unsigned long start = (unsigned long)&__start_wr_after_init; >> + unsigned long end = (unsigned long)&__end_wr_after_init; >> + unsigned long i; >> + unsigned long wr_range; >> + >> + wr_poking_mm = copy_init_mm(); >> + if (WARN_ONCE(!wr_poking_mm, "No alternate mapping available.")) >> + return; >> + >> + wr_range = round_up(end - start, PAGE_SIZE); >> + >> + /* Randomize the poking address base*/ >> + wr_poking_base = TASK_UNMAPPED_BASE + >> + (kaslr_get_random_long("Write Rare Poking") & PAGE_MASK) % >> + (TASK_SIZE - (TASK_UNMAPPED_BASE + wr_range)); >> + >> + /* >> + * Place 64TB of kernel address space within 128TB of user address >> + * space, at a random page aligned offset. >> + */ >> + wr_poking_base = (((unsigned long)kaslr_get_random_long("WR Poke")) & >> + PAGE_MASK) % (64 * _BITUL(40)); > > You're setting wr_poking_base twice in a row? Is this an artifact from > rebase? Yes, the first is a leftover. Thanks for spotting it. -- igor
On Wed, Dec 19, 2018 at 11:33:30PM +0200, Igor Stoppa wrote: > +void *__wr_op(unsigned long dst, unsigned long src, __kernel_size_t len, > + enum wr_op_type op) > +{ > + temporary_mm_state_t prev; > + unsigned long offset; > + unsigned long wr_poking_addr; > + > + /* Confirm that the writable mapping exists. */ > + if (WARN_ONCE(!wr_ready, "No writable mapping available")) > + return (void *)dst; > + > + if (WARN_ONCE(op >= WR_OPS_NUMBER, "Invalid WR operation.") || > + WARN_ONCE(!is_wr_after_init(dst, len), "Invalid WR range.")) > + return (void *)dst; > + > + offset = dst - (unsigned long)&__start_wr_after_init; > + wr_poking_addr = wr_poking_base + offset; > + local_irq_disable(); > + prev = use_temporary_mm(wr_poking_mm); > + > + if (op == WR_MEMCPY) > + copy_to_user((void __user *)wr_poking_addr, (void *)src, len); > + else if (op == WR_MEMSET) > + memset_user((void __user *)wr_poking_addr, (u8)src, len); > + > + unuse_temporary_mm(prev); > + local_irq_enable(); > + return (void *)dst; > +} I think you're causing yourself more headaches by implementing this "op" function. Here's some generic code: void *wr_memcpy(void *dst, void *src, unsigned int len) { wr_state_t wr_state; void *wr_poking_addr = __wr_addr(dst); local_irq_disable(); wr_enable(&wr_state); __wr_memcpy(wr_poking_addr, src, len); wr_disable(&wr_state); local_irq_enable(); return dst; } Now, x86 can define appropriate macros and functions to use the temporary_mm functionality, and other architectures can do what makes sense to them.
On 20/12/2018 20:49, Matthew Wilcox wrote: > I think you're causing yourself more headaches by implementing this "op" > function. I probably misinterpreted the initial criticism on my first patchset, about duplication. Somehow, I'm still thinking to the endgame of having higher-level functions, like list management. > Here's some generic code: thank you, I have one question, below > void *wr_memcpy(void *dst, void *src, unsigned int len) > { > wr_state_t wr_state; > void *wr_poking_addr = __wr_addr(dst); > > local_irq_disable(); > wr_enable(&wr_state); > __wr_memcpy(wr_poking_addr, src, len); Is __wraddr() invoked inside wm_memcpy() instead of being invoked privately within __wr_memcpy() because the code is generic, or is there some other reason? > wr_disable(&wr_state); > local_irq_enable(); > > return dst; > } > > Now, x86 can define appropriate macros and functions to use the temporary_mm > functionality, and other architectures can do what makes sense to them. > -- igor
On Thu, Dec 20, 2018 at 09:19:15PM +0200, Igor Stoppa wrote: > On 20/12/2018 20:49, Matthew Wilcox wrote: > > I think you're causing yourself more headaches by implementing this "op" > > function. > > I probably misinterpreted the initial criticism on my first patchset, about > duplication. Somehow, I'm still thinking to the endgame of having > higher-level functions, like list management. > > > Here's some generic code: > > thank you, I have one question, below > > > void *wr_memcpy(void *dst, void *src, unsigned int len) > > { > > wr_state_t wr_state; > > void *wr_poking_addr = __wr_addr(dst); > > > > local_irq_disable(); > > wr_enable(&wr_state); > > __wr_memcpy(wr_poking_addr, src, len); > > Is __wraddr() invoked inside wm_memcpy() instead of being invoked privately > within __wr_memcpy() because the code is generic, or is there some other > reason? I was assuming that __wr_addr() might be costly, and we were trying to minimise the number of instructions executed while write-rare was enabled.
On Thu, Dec 20, 2018 at 11:19 AM Igor Stoppa <igor.stoppa@gmail.com> wrote: > > > > On 20/12/2018 20:49, Matthew Wilcox wrote: > > > I think you're causing yourself more headaches by implementing this "op" > > function. > > I probably misinterpreted the initial criticism on my first patchset, > about duplication. Somehow, I'm still thinking to the endgame of having > higher-level functions, like list management. > > > Here's some generic code: > > thank you, I have one question, below > > > void *wr_memcpy(void *dst, void *src, unsigned int len) > > { > > wr_state_t wr_state; > > void *wr_poking_addr = __wr_addr(dst); > > > > local_irq_disable(); > > wr_enable(&wr_state); > > __wr_memcpy(wr_poking_addr, src, len); > > Is __wraddr() invoked inside wm_memcpy() instead of being invoked > privately within __wr_memcpy() because the code is generic, or is there > some other reason? > > > wr_disable(&wr_state); > > local_irq_enable(); > > > > return dst; > > } > > > > Now, x86 can define appropriate macros and functions to use the temporary_mm > > functionality, and other architectures can do what makes sense to them. > > I suspect that most architectures will want to do this exactly like x86, though, but sure, it could be restructured like this. On x86, I *think* that __wr_memcpy() will want to special-case len == 1, 2, 4, and (on 64-bit) 8 byte writes to keep them atomic. i'm guessing this is the same on most or all architectures. > > -- > igor
On 21/12/2018 19:23, Andy Lutomirski wrote: > On Thu, Dec 20, 2018 at 11:19 AM Igor Stoppa <igor.stoppa@gmail.com> wrote: >> >> >> >> On 20/12/2018 20:49, Matthew Wilcox wrote: >> >>> I think you're causing yourself more headaches by implementing this "op" >>> function. >> >> I probably misinterpreted the initial criticism on my first patchset, >> about duplication. Somehow, I'm still thinking to the endgame of having >> higher-level functions, like list management. >> >>> Here's some generic code: >> >> thank you, I have one question, below >> >>> void *wr_memcpy(void *dst, void *src, unsigned int len) >>> { >>> wr_state_t wr_state; >>> void *wr_poking_addr = __wr_addr(dst); >>> >>> local_irq_disable(); >>> wr_enable(&wr_state); >>> __wr_memcpy(wr_poking_addr, src, len); >> >> Is __wraddr() invoked inside wm_memcpy() instead of being invoked >> privately within __wr_memcpy() because the code is generic, or is there >> some other reason? >> >>> wr_disable(&wr_state); >>> local_irq_enable(); >>> >>> return dst; >>> } >>> >>> Now, x86 can define appropriate macros and functions to use the temporary_mm >>> functionality, and other architectures can do what makes sense to them. > I suspect that most architectures will want to do this exactly like > x86, though, but sure, it could be restructured like this. In spirit, I think yes, but already I couldn't find a clean ways to do multi-arch wr_enable(&wr_state), so I made that too become arch_dependent. Maybe after implementing write rare for a few archs, it becomes more clear (to me, any advice is welcome) which parts can be considered common. > On x86, I *think* that __wr_memcpy() will want to special-case len == > 1, 2, 4, and (on 64-bit) 8 byte writes to keep them atomic. i'm > guessing this is the same on most or all architectures. I switched to xxx_user() approach, as you suggested. For x86_64 I'm using copy_user() and i added a memset_user(), based on copy_user(). It's already assembly code optimized for dealing with multiples of 8-byte words or subsets. You can see this in the first patch of the patchset, even this one. I'll send out the v3 patchset in a short while. -- igor
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8689e794a43c..e5e4fc4fa5c2 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -32,6 +32,7 @@ config X86_64 select SWIOTLB select X86_DEV_DMA_OPS select ARCH_HAS_SYSCALL_WRAPPER + select ARCH_HAS_PRMEM # # Arch settings diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 4b101dd6e52f..66652de1e2c7 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -53,3 +53,5 @@ obj-$(CONFIG_PAGE_TABLE_ISOLATION) += pti.o obj-$(CONFIG_AMD_MEM_ENCRYPT) += mem_encrypt.o obj-$(CONFIG_AMD_MEM_ENCRYPT) += mem_encrypt_identity.o obj-$(CONFIG_AMD_MEM_ENCRYPT) += mem_encrypt_boot.o + +obj-$(CONFIG_PRMEM) += prmem.o diff --git a/arch/x86/mm/prmem.c b/arch/x86/mm/prmem.c new file mode 100644 index 000000000000..fc367551e736 --- /dev/null +++ b/arch/x86/mm/prmem.c @@ -0,0 +1,120 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * prmem.c: Memory Protection Library + * + * (C) Copyright 2017-2018 Huawei Technologies Co. Ltd. + * Author: Igor Stoppa <igor.stoppa@huawei.com> + */ + +#include <linux/mm.h> +#include <linux/string.h> +#include <linux/compiler.h> +#include <linux/slab.h> +#include <linux/mmu_context.h> +#include <linux/rcupdate.h> +#include <linux/prmem.h> + +static __ro_after_init bool wr_ready; +static __ro_after_init struct mm_struct *wr_poking_mm; +static __ro_after_init unsigned long wr_poking_base; + +/* + * The following two variables are statically allocated by the linker + * script at the the boundaries of the memory region (rounded up to + * multiples of PAGE_SIZE) reserved for __wr_after_init. + */ +extern long __start_wr_after_init; +extern long __end_wr_after_init; + +static inline bool is_wr_after_init(unsigned long ptr, __kernel_size_t size) +{ + unsigned long start = (unsigned long)&__start_wr_after_init; + unsigned long end = (unsigned long)&__end_wr_after_init; + unsigned long low = ptr; + unsigned long high = ptr + size; + + return likely(start <= low && low <= high && high <= end); +} + +void *__wr_op(unsigned long dst, unsigned long src, __kernel_size_t len, + enum wr_op_type op) +{ + temporary_mm_state_t prev; + unsigned long offset; + unsigned long wr_poking_addr; + + /* Confirm that the writable mapping exists. */ + if (WARN_ONCE(!wr_ready, "No writable mapping available")) + return (void *)dst; + + if (WARN_ONCE(op >= WR_OPS_NUMBER, "Invalid WR operation.") || + WARN_ONCE(!is_wr_after_init(dst, len), "Invalid WR range.")) + return (void *)dst; + + offset = dst - (unsigned long)&__start_wr_after_init; + wr_poking_addr = wr_poking_base + offset; + local_irq_disable(); + prev = use_temporary_mm(wr_poking_mm); + + if (op == WR_MEMCPY) + copy_to_user((void __user *)wr_poking_addr, (void *)src, len); + else if (op == WR_MEMSET) + memset_user((void __user *)wr_poking_addr, (u8)src, len); + + unuse_temporary_mm(prev); + local_irq_enable(); + return (void *)dst; +} + +#define TB (1UL << 40) + +struct mm_struct *copy_init_mm(void); +void __init wr_poking_init(void) +{ + unsigned long start = (unsigned long)&__start_wr_after_init; + unsigned long end = (unsigned long)&__end_wr_after_init; + unsigned long i; + unsigned long wr_range; + + wr_poking_mm = copy_init_mm(); + if (WARN_ONCE(!wr_poking_mm, "No alternate mapping available.")) + return; + + wr_range = round_up(end - start, PAGE_SIZE); + + /* Randomize the poking address base*/ + wr_poking_base = TASK_UNMAPPED_BASE + + (kaslr_get_random_long("Write Rare Poking") & PAGE_MASK) % + (TASK_SIZE - (TASK_UNMAPPED_BASE + wr_range)); + + /* + * Place 64TB of kernel address space within 128TB of user address + * space, at a random page aligned offset. + */ + wr_poking_base = (((unsigned long)kaslr_get_random_long("WR Poke")) & + PAGE_MASK) % (64 * _BITUL(40)); + + /* Create alternate mapping for the entire wr_after_init range. */ + for (i = start; i < end; i += PAGE_SIZE) { + struct page *page; + spinlock_t *ptl; + pte_t pte; + pte_t *ptep; + unsigned long wr_poking_addr; + + page = virt_to_page(i); + if (WARN_ONCE(!page, "WR memory without physical page")) + return; + wr_poking_addr = i - start + wr_poking_base; + + /* The lock is not needed, but avoids open-coding. */ + ptep = get_locked_pte(wr_poking_mm, wr_poking_addr, &ptl); + if (WARN_ONCE(!ptep, "No pte for writable mapping")) + return; + + pte = mk_pte(page, PAGE_KERNEL); + set_pte_at(wr_poking_mm, wr_poking_addr, ptep, pte); + spin_unlock(ptl); + } + wr_ready = true; +}
Architecture-specific implementation of the core write rare operation. The implementation is based on code from Andy Lutomirski and Nadav Amit for patching the text on x86 [here goes reference to commits, once merged] The modification of write protected data is done through an alternate mapping of the same pages, as writable. This mapping is persistent, but active only for a core that is performing a write rare operation. And only for the duration of said operation. Local interrupts are disabled, while the alternate mapping is active. In theory, it could introduce a non-predictable delay, in a preemptible system, however the amount of data to be altered is likely to be far smaller than a page. Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com> CC: Andy Lutomirski <luto@amacapital.net> CC: Nadav Amit <nadav.amit@gmail.com> CC: Matthew Wilcox <willy@infradead.org> CC: Peter Zijlstra <peterz@infradead.org> CC: Kees Cook <keescook@chromium.org> CC: Dave Hansen <dave.hansen@linux.intel.com> CC: Mimi Zohar <zohar@linux.vnet.ibm.com> CC: linux-integrity@vger.kernel.org CC: kernel-hardening@lists.openwall.com CC: linux-mm@kvack.org CC: linux-kernel@vger.kernel.org --- arch/x86/Kconfig | 1 + arch/x86/mm/Makefile | 2 + arch/x86/mm/prmem.c | 120 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 arch/x86/mm/prmem.c