[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20151203121712.GE11337@arm.com>
Date: Thu, 3 Dec 2015 12:17:12 +0000
From: Will Deacon <will.deacon@....com>
To: Daniel Cashman <dcashman@...roid.com>
Cc: linux-kernel@...r.kernel.org, linux@....linux.org.uk,
akpm@...ux-foundation.org, keescook@...omium.org, mingo@...nel.org,
linux-arm-kernel@...ts.infradead.org, corbet@....net,
dzickus@...hat.com, ebiederm@...ssion.com, xypron.glpk@....de,
jpoimboe@...hat.com, kirill.shutemov@...ux.intel.com,
n-horiguchi@...jp.nec.com, aarcange@...hat.com, mgorman@...e.de,
tglx@...utronix.de, rientjes@...gle.com, linux-mm@...ck.org,
linux-doc@...r.kernel.org, salyzyn@...roid.com, jeffv@...gle.com,
nnk@...gle.com, catalin.marinas@....com, hpa@...or.com,
x86@...nel.org, hecmargi@....es, bp@...e.de, dcashman@...gle.com,
arnd@...db.de
Subject: Re: [PATCH v5 3/4] arm64: mm: support ARCH_MMAP_RND_BITS.
Hi Daniel,
On Tue, Dec 01, 2015 at 12:10:57PM -0800, Daniel Cashman wrote:
> From: dcashman <dcashman@...gle.com>
>
> arm64: arch_mmap_rnd() uses STACK_RND_MASK to generate the
> random offset for the mmap base address. This value represents a
> compromise between increased ASLR effectiveness and avoiding
> address-space fragmentation. Replace it with a Kconfig option, which
> is sensibly bounded, so that platform developers may choose where to
> place this compromise. Keep default values as new minimums.
>
> Signed-off-by: Daniel Cashman <dcashman@...roid.com>
> ---
> arch/arm64/Kconfig | 31 +++++++++++++++++++++++++++++++
> arch/arm64/mm/mmap.c | 8 ++++++--
> 2 files changed, 37 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 871f217..fb57649 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -51,6 +51,8 @@ config ARM64
> select HAVE_ARCH_JUMP_LABEL
> select HAVE_ARCH_KASAN if SPARSEMEM_VMEMMAP && !(ARM64_16K_PAGES && ARM64_VA_BITS_48)
> select HAVE_ARCH_KGDB
> + select HAVE_ARCH_MMAP_RND_BITS if MMU
> + select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT
You can drop the 'if MMU' bits, since we don't support !MMU on arm64.
> select HAVE_ARCH_SECCOMP_FILTER
> select HAVE_ARCH_TRACEHOOK
> select HAVE_BPF_JIT
> @@ -104,6 +106,35 @@ config ARCH_PHYS_ADDR_T_64BIT
> config MMU
> def_bool y
>
> +config ARCH_MMAP_RND_BITS_MIN
> + default 15 if ARM64_64K_PAGES
> + default 17 if ARM64_16K_PAGES
> + default 19
Is this correct? We currently have a mask of 0x3ffff, so that's 18 bits.
> +config ARCH_MMAP_RND_BITS_MAX
> + default 19 if ARM64_VA_BITS=36
> + default 20 if ARM64_64K_PAGES && ARM64_VA_BITS=39
> + default 22 if ARM64_16K_PAGES && ARM64_VA_BITS=39
> + default 24 if ARM64_VA_BITS=39
> + default 23 if ARM64_64K_PAGES && ARM64_VA_BITS=42
> + default 25 if ARM64_16K_PAGES && ARM64_VA_BITS=42
> + default 27 if ARM64_VA_BITS=42
> + default 30 if ARM64_VA_BITS=47
> + default 29 if ARM64_64K_PAGES && ARM64_VA_BITS=48
> + default 31 if ARM64_16K_PAGES && ARM64_VA_BITS=48
> + default 33 if ARM64_VA_BITS=48
> + default 15 if ARM64_64K_PAGES
> + default 17 if ARM64_16K_PAGES
> + default 19
Could you add a comment above this with the formula
(VA_BITS - PAGE_SHIFT - 3), please, so that we can update this easily in
the future if we need to?
Will
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists