From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: "Christopher M. Riedl" <cmr@informatik.wtf>,
linuxppc-dev@lists.ozlabs.org,
kernel-hardening@lists.openwall.com
Subject: Re: [PATCH 2/5] powerpc/lib: Initialize a temporary mm for code patching
Date: Wed, 3 Jun 2020 09:01:08 +0200 [thread overview]
Message-ID: <4ffced42-ee3a-841f-2d3f-34daec11b05b@csgroup.eu> (raw)
In-Reply-To: <20200603051912.23296-3-cmr@informatik.wtf>
Le 03/06/2020 à 07:19, Christopher M. Riedl a écrit :
> When code patching a STRICT_KERNEL_RWX kernel the page containing the
> address to be patched is temporarily mapped with permissive memory
> protections. Currently, a per-cpu vmalloc patch area is used for this
> purpose. While the patch area is per-cpu, the temporary page mapping is
> inserted into the kernel page tables for the duration of the patching.
> The mapping is exposed to CPUs other than the patching CPU - this is
> undesirable from a hardening perspective.
>
> Use the `poking_init` init hook to prepare a temporary mm and patching
> address. Initialize the temporary mm by copying the init mm. Choose a
> randomized patching address inside the temporary mm userspace address
> portion. The next patch uses the temporary mm and patching address for
> code patching.
>
> Based on x86 implementation:
>
> commit 4fc19708b165
> ("x86/alternatives: Initialize temporary mm for patching")
>
> Signed-off-by: Christopher M. Riedl <cmr@informatik.wtf>
> ---
> arch/powerpc/lib/code-patching.c | 33 ++++++++++++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
>
> diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
> index 5ecf0d635a8d..599114f63b44 100644
> --- a/arch/powerpc/lib/code-patching.c
> +++ b/arch/powerpc/lib/code-patching.c
> @@ -11,6 +11,8 @@
> #include <linux/cpuhotplug.h>
> #include <linux/slab.h>
> #include <linux/uaccess.h>
> +#include <linux/sched/task.h>
> +#include <linux/random.h>
>
> #include <asm/pgtable.h>
> #include <asm/tlbflush.h>
> @@ -45,6 +47,37 @@ int raw_patch_instruction(struct ppc_inst *addr, struct ppc_inst instr)
> }
>
> #ifdef CONFIG_STRICT_KERNEL_RWX
> +
> +static struct mm_struct *patching_mm __ro_after_init;
> +static unsigned long patching_addr __ro_after_init;
> +
> +void __init poking_init(void)
> +{
> + spinlock_t *ptl; /* for protecting pte table */
> + pte_t *ptep;
> +
> + /*
> + * Some parts of the kernel (static keys for example) depend on
> + * successful code patching. Code patching under STRICT_KERNEL_RWX
> + * requires this setup - otherwise we cannot patch at all. We use
> + * BUG_ON() here and later since an early failure is preferred to
> + * buggy behavior and/or strange crashes later.
> + */
> + patching_mm = copy_init_mm();
> + BUG_ON(!patching_mm);
> +
> + /*
> + * In hash we cannot go above DEFAULT_MAP_WINDOW easily.
> + * XXX: Do we want additional bits of entropy for radix?
> + */
> + patching_addr = (get_random_long() & PAGE_MASK) %
> + (DEFAULT_MAP_WINDOW - PAGE_SIZE);
> +
> + ptep = get_locked_pte(patching_mm, patching_addr, &ptl);
> + BUG_ON(!ptep);
> + pte_unmap_unlock(ptep, ptl);
Is this needed ? What's the point in getting the pte to unmap it
immediatly without doing anything with it ?
Christophe
> +}
> +
> static DEFINE_PER_CPU(struct vm_struct *, text_poke_area);
>
> static int text_area_cpu_up(unsigned int cpu)
>
next prev parent reply other threads:[~2020-06-03 10:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 5:19 [PATCH 0/5] Use per-CPU temporary mappings for patching Christopher M. Riedl
2020-06-03 5:19 ` [PATCH 1/5] powerpc/mm: Introduce temporary mm Christopher M. Riedl
2020-06-03 6:58 ` Christophe Leroy
2020-06-11 3:34 ` Christopher M. Riedl
2020-06-03 5:19 ` [PATCH 2/5] powerpc/lib: Initialize a temporary mm for code patching Christopher M. Riedl
2020-06-03 7:01 ` Christophe Leroy [this message]
2020-06-11 3:29 ` Christopher M. Riedl
2020-06-03 5:19 ` [PATCH 3/5] powerpc/lib: Use " Christopher M. Riedl
2020-06-03 7:12 ` Christophe Leroy
2020-06-11 3:31 ` Christopher M. Riedl
2020-06-03 5:19 ` [PATCH 4/5] powerpc/lib: Add LKDTM accessor for patching addr Christopher M. Riedl
2020-06-03 7:14 ` Christophe Leroy
2020-06-09 4:40 ` Christopher M. Riedl
2020-06-03 5:19 ` [PATCH 5/5] powerpc: Add LKDTM test to hijack a patch mapping Christopher M. Riedl
2020-06-03 7:20 ` Christophe Leroy
2020-06-09 4:48 ` Christopher M. Riedl
2020-06-15 6:37 ` Christophe Leroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ffced42-ee3a-841f-2d3f-34daec11b05b@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=cmr@informatik.wtf \
--cc=kernel-hardening@lists.openwall.com \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).