From: Will Deacon <will.deacon@arm.com>
To: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Kostya Serebryany <kcc@google.com>,
Evgeniy Stepanov <eugenis@google.com>,
Daniel Micay <danielmicay@gmail.com>,
Dmitry Vyukov <dvyukov@google.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Pratyush Anand <panand@redhat.com>,
Dong Bo <dongbo4@huawei.com>,
Dmitry Safonov <dsafonov@virtuozzo.com>,
Rik van Riel <riel@redhat.com>,
Andy Lutomirski <luto@amacapital.net>,
Grzegorz Andrejczuk <grzegorz.andrejczuk@intel.com>,
linux-arm-kernel@lists.infradead.org,
Reid Kleckner <rnk@google.com>,
Peter Collingbourne <pcc@google.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mm: Revert x86_64 and arm64 ELF_ET_DYN_BASE base
Date: Tue, 8 Aug 2017 10:34:50 +0100 [thread overview]
Message-ID: <20170808093450.GA13355@arm.com> (raw)
In-Reply-To: <20170807201542.GA21271@beast>
On Mon, Aug 07, 2017 at 01:15:42PM -0700, Kees Cook wrote:
> Moving the x86_64 and arm64 PIE base from 0x555555554000 to 0x000100000000
> broke AddressSanitizer. This is a partial revert of:
>
> commit eab09532d400 ("binfmt_elf: use ELF_ET_DYN_BASE only for PIE")
> commit 02445990a96e ("arm64: move ELF_ET_DYN_BASE to 4GB / 4MB")
>
> The AddressSanitizer tool has hard-coded expectations about where
> executable mappings are loaded. The motivation for changing the PIE
> base in the above commits was to avoid the Stack-Clash CVEs that
> allowed executable mappings to get too close to heap and stack. This
> was mainly a problem on 32-bit, but the 64-bit bases were moved too,
> in an effort to proactively protect those systems (proofs of concept
> do exist that show 64-bit collisions, but other recent changes to fix
> stack accounting and setuid behaviors will minimize the impact).
>
> The new 32-bit PIE base is fine for ASan (since it matches the ET_EXEC
> base), so only the 64-bit PIE base needs to be reverted to let x86 and
> arm64 ASan binaries run again. Future changes to the 64-bit PIE base on
> these architectures can be made optional once a more dynamic method for
> dealing with AddressSanitizer is found. (e.g. always loading PIE into
> the mmap region for marked binaries.)
>
> Reported-by: Kostya Serebryany <kcc@google.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> arch/arm64/include/asm/elf.h | 4 ++--
> arch/x86/include/asm/elf.h | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
> index acae781f7359..3288c2b36731 100644
> --- a/arch/arm64/include/asm/elf.h
> +++ b/arch/arm64/include/asm/elf.h
> @@ -114,10 +114,10 @@
>
> /*
> * This is the base location for PIE (ET_DYN with INTERP) loads. On
> - * 64-bit, this is raised to 4GB to leave the entire 32-bit address
> + * 64-bit, this is above 4GB to leave the entire 32-bit address
> * space open for things that want to use the area for 32-bit pointers.
> */
> -#define ELF_ET_DYN_BASE 0x100000000UL
> +#define ELF_ET_DYN_BASE (2 * TASK_SIZE_64 / 3)
>
> #ifndef __ASSEMBLY__
Acked-by: Will Deacon <will.deacon@arm.com>
I assume this is going via akpm like the original commit?
Will
next prev parent reply other threads:[~2017-08-08 9:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-07 20:15 [PATCH] mm: Revert x86_64 and arm64 ELF_ET_DYN_BASE base Kees Cook
2017-08-08 9:34 ` Will Deacon [this message]
2017-08-09 2:00 ` Kees Cook
2017-08-15 19:02 ` Kees Cook
2024-02-17 6:50 ` Kees Cook
2024-02-20 7:47 ` Dmitry Vyukov
2024-02-24 1:01 ` Kees Cook
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=20170808093450.GA13355@arm.com \
--to=will.deacon@arm.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=danielmicay@gmail.com \
--cc=dongbo4@huawei.com \
--cc=dsafonov@virtuozzo.com \
--cc=dvyukov@google.com \
--cc=eugenis@google.com \
--cc=grzegorz.andrejczuk@intel.com \
--cc=hpa@zytor.com \
--cc=kcc@google.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=panand@redhat.com \
--cc=pcc@google.com \
--cc=riel@redhat.com \
--cc=rnk@google.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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