All of lore.kernel.org
 help / color / mirror / Atom feed
From: Will Deacon <will.deacon@arm.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: YaoJun <yaojun8558363@gmail.com>,
	Kernel Hardening <kernel-hardening@lists.openwall.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] arm64: mm: mark tramp_pg_dir read-only
Date: Tue, 19 Jun 2018 16:20:35 +0100	[thread overview]
Message-ID: <20180619152035.GM13984@arm.com> (raw)
In-Reply-To: <CAKv+Gu8Zc7eQbG-Ww51GXUCEmhe2J03vbq5vVdyaKra-s13KrA@mail.gmail.com>

Hi Ard,

Sorry, I forgot to reply to this.

On Wed, May 30, 2018 at 11:53:20AM +0200, Ard Biesheuvel wrote:
> On 30 May 2018 at 11:14, Will Deacon <will.deacon@arm.com> wrote:
> > On Wed, May 30, 2018 at 12:48:06PM +0800, YaoJun wrote:
> >> To protect against KSMA(Kernel Space Mirroring Attack), make
> >> tramp_pg_dir read-only. The principle of KSMA is to insert a
> >> carefully constructed PGD entry into the translation table.
> >> The type of this entry is block, which maps the kernel text
> >> and its access permissions bits are 01. The user process can
> >> then modify kernel text directly through this mapping. In this
> >> way, an arbitrary write can be converted to multiple arbitrary
> >> writes.
> >>
> >> Signed-off-by: YaoJun <yaojun8558363@gmail.com>
> >> ---
> >>  arch/arm64/mm/mmu.c | 4 ++++
> >>  1 file changed, 4 insertions(+)
> >>
> >> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
> >> index 2dbb2c9f1ec1..ac4b22c7e435 100644
> >> --- a/arch/arm64/mm/mmu.c
> >> +++ b/arch/arm64/mm/mmu.c
> >> @@ -551,6 +551,10 @@ static int __init map_entry_trampoline(void)
> >>       __create_pgd_mapping(tramp_pg_dir, pa_start, TRAMP_VALIAS, PAGE_SIZE,
> >>                            prot, pgd_pgtable_alloc, 0);
> >>
> >> +     update_mapping_prot(__pa_symbol(tramp_pg_dir),
> >> +                             (unsigned long)tramp_pg_dir,
> >> +                             PGD_SIZE, PAGE_KERNEL_RO);
> >
> > Hmm, I like the idea but is there a risk that the page table has been mapped
> > as part of a block entry, which we can't safely split at this point (i.e.
> > we'll run into one of the BUG_ONs in the mapping code)?
> >
> 
> We'd need to create a separate segment for it initially so the mapping
> is already at the right granularity.

Why do you think that's the case? I can't see anything that guarantees this
for the page table itself.

Will

WARNING: multiple messages have this Message-ID (diff)
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: mm: mark tramp_pg_dir read-only
Date: Tue, 19 Jun 2018 16:20:35 +0100	[thread overview]
Message-ID: <20180619152035.GM13984@arm.com> (raw)
In-Reply-To: <CAKv+Gu8Zc7eQbG-Ww51GXUCEmhe2J03vbq5vVdyaKra-s13KrA@mail.gmail.com>

Hi Ard,

Sorry, I forgot to reply to this.

On Wed, May 30, 2018 at 11:53:20AM +0200, Ard Biesheuvel wrote:
> On 30 May 2018 at 11:14, Will Deacon <will.deacon@arm.com> wrote:
> > On Wed, May 30, 2018 at 12:48:06PM +0800, YaoJun wrote:
> >> To protect against KSMA(Kernel Space Mirroring Attack), make
> >> tramp_pg_dir read-only. The principle of KSMA is to insert a
> >> carefully constructed PGD entry into the translation table.
> >> The type of this entry is block, which maps the kernel text
> >> and its access permissions bits are 01. The user process can
> >> then modify kernel text directly through this mapping. In this
> >> way, an arbitrary write can be converted to multiple arbitrary
> >> writes.
> >>
> >> Signed-off-by: YaoJun <yaojun8558363@gmail.com>
> >> ---
> >>  arch/arm64/mm/mmu.c | 4 ++++
> >>  1 file changed, 4 insertions(+)
> >>
> >> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
> >> index 2dbb2c9f1ec1..ac4b22c7e435 100644
> >> --- a/arch/arm64/mm/mmu.c
> >> +++ b/arch/arm64/mm/mmu.c
> >> @@ -551,6 +551,10 @@ static int __init map_entry_trampoline(void)
> >>       __create_pgd_mapping(tramp_pg_dir, pa_start, TRAMP_VALIAS, PAGE_SIZE,
> >>                            prot, pgd_pgtable_alloc, 0);
> >>
> >> +     update_mapping_prot(__pa_symbol(tramp_pg_dir),
> >> +                             (unsigned long)tramp_pg_dir,
> >> +                             PGD_SIZE, PAGE_KERNEL_RO);
> >
> > Hmm, I like the idea but is there a risk that the page table has been mapped
> > as part of a block entry, which we can't safely split at this point (i.e.
> > we'll run into one of the BUG_ONs in the mapping code)?
> >
> 
> We'd need to create a separate segment for it initially so the mapping
> is already at the right granularity.

Why do you think that's the case? I can't see anything that guarantees this
for the page table itself.

Will

  parent reply	other threads:[~2018-06-19 15:20 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-30  4:48 [PATCH] arm64: mm: mark tramp_pg_dir read-only YaoJun
2018-05-30  4:48 ` YaoJun
2018-05-30  9:14 ` Will Deacon
2018-05-30  9:14   ` Will Deacon
2018-05-30  9:53   ` Ard Biesheuvel
2018-05-30  9:53     ` Ard Biesheuvel
2018-05-30 10:20     ` 姚俊
2018-06-19 15:20     ` Will Deacon [this message]
2018-06-19 15:20       ` Will Deacon
2018-06-19 15:23       ` Ard Biesheuvel
2018-06-19 15:23         ` Ard Biesheuvel
2018-06-19 15:28         ` Will Deacon
2018-06-19 15:28           ` Will Deacon
2018-06-19 15:29           ` Ard Biesheuvel
2018-06-19 15:29             ` Ard Biesheuvel
2018-06-19 15:37             ` Will Deacon
2018-06-19 15:37               ` Will Deacon
2018-06-19 15:40               ` Ard Biesheuvel
2018-06-19 15:40                 ` Ard Biesheuvel
2018-06-19 15:50                 ` Will Deacon
2018-06-19 15:50                   ` Will Deacon
2018-06-19 15:51                   ` Ard Biesheuvel
2018-06-19 15:51                     ` Ard Biesheuvel
2018-06-19 15:55                     ` Will Deacon
2018-06-19 15:55                       ` Will Deacon
2018-06-19 16:00                       ` Ard Biesheuvel
2018-06-19 16:00                         ` Ard Biesheuvel

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=20180619152035.GM13984@arm.com \
    --to=will.deacon@arm.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=kernel-hardening@lists.openwall.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=yaojun8558363@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.