![Rik van Riel](/assets/img/avatar_default.png)
When RLIMIT_STACK is, for example, 256MB, the current code results in a gap between the top of the task and mmap_base of 256MB, failing to take into account the amount by which the stack address was randomized. In other words, the stack gets less than RLIMIT_STACK space. Ensure that the gap between the stack and mmap_base always takes stack randomization and the stack guard gap into account. Obtained from Daniel Micay's linux-hardened tree. Link: http://lkml.kernel.org/r/20170622200033.25714-2-riel@redhat.com Signed-off-by: Daniel Micay <danielmicay@gmail.com> Signed-off-by: Rik van Riel <riel@redhat.com> Reported-by: Florian Weimer <fweimer@redhat.com> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: Will Deacon <will.deacon@arm.com> Cc: Daniel Micay <danielmicay@gmail.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Hugh Dickins <hughd@google.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
178 lines
4.6 KiB
C
178 lines
4.6 KiB
C
/*
|
|
* Flexible mmap layout support
|
|
*
|
|
* Based on code by Ingo Molnar and Andi Kleen, copyrighted
|
|
* as follows:
|
|
*
|
|
* Copyright 2003-2009 Red Hat Inc.
|
|
* All Rights Reserved.
|
|
* Copyright 2005 Andi Kleen, SUSE Labs.
|
|
* Copyright 2007 Jiri Kosina, SUSE Labs.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/personality.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/random.h>
|
|
#include <linux/limits.h>
|
|
#include <linux/sched/signal.h>
|
|
#include <linux/sched/mm.h>
|
|
#include <linux/compat.h>
|
|
#include <asm/elf.h>
|
|
|
|
struct va_alignment __read_mostly va_align = {
|
|
.flags = -1,
|
|
};
|
|
|
|
unsigned long tasksize_32bit(void)
|
|
{
|
|
return IA32_PAGE_OFFSET;
|
|
}
|
|
|
|
unsigned long tasksize_64bit(void)
|
|
{
|
|
return TASK_SIZE_MAX;
|
|
}
|
|
|
|
static unsigned long stack_maxrandom_size(unsigned long task_size)
|
|
{
|
|
unsigned long max = 0;
|
|
if ((current->flags & PF_RANDOMIZE) &&
|
|
!(current->personality & ADDR_NO_RANDOMIZE)) {
|
|
max = (-1UL) & __STACK_RND_MASK(task_size == tasksize_32bit());
|
|
max <<= PAGE_SHIFT;
|
|
}
|
|
|
|
return max;
|
|
}
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
# define mmap32_rnd_bits mmap_rnd_compat_bits
|
|
# define mmap64_rnd_bits mmap_rnd_bits
|
|
#else
|
|
# define mmap32_rnd_bits mmap_rnd_bits
|
|
# define mmap64_rnd_bits mmap_rnd_bits
|
|
#endif
|
|
|
|
#define SIZE_128M (128 * 1024 * 1024UL)
|
|
|
|
static int mmap_is_legacy(void)
|
|
{
|
|
if (current->personality & ADDR_COMPAT_LAYOUT)
|
|
return 1;
|
|
|
|
return sysctl_legacy_va_layout;
|
|
}
|
|
|
|
static unsigned long arch_rnd(unsigned int rndbits)
|
|
{
|
|
return (get_random_long() & ((1UL << rndbits) - 1)) << PAGE_SHIFT;
|
|
}
|
|
|
|
unsigned long arch_mmap_rnd(void)
|
|
{
|
|
if (!(current->flags & PF_RANDOMIZE))
|
|
return 0;
|
|
return arch_rnd(mmap_is_ia32() ? mmap32_rnd_bits : mmap64_rnd_bits);
|
|
}
|
|
|
|
static unsigned long mmap_base(unsigned long rnd, unsigned long task_size)
|
|
{
|
|
unsigned long gap = rlimit(RLIMIT_STACK);
|
|
unsigned long pad = stack_maxrandom_size(task_size) + stack_guard_gap;
|
|
unsigned long gap_min, gap_max;
|
|
|
|
/* Values close to RLIM_INFINITY can overflow. */
|
|
if (gap + pad > gap)
|
|
gap += pad;
|
|
|
|
/*
|
|
* Top of mmap area (just below the process stack).
|
|
* Leave an at least ~128 MB hole with possible stack randomization.
|
|
*/
|
|
gap_min = SIZE_128M;
|
|
gap_max = (task_size / 6) * 5;
|
|
|
|
if (gap < gap_min)
|
|
gap = gap_min;
|
|
else if (gap > gap_max)
|
|
gap = gap_max;
|
|
|
|
return PAGE_ALIGN(task_size - gap - rnd);
|
|
}
|
|
|
|
static unsigned long mmap_legacy_base(unsigned long rnd,
|
|
unsigned long task_size)
|
|
{
|
|
return __TASK_UNMAPPED_BASE(task_size) + rnd;
|
|
}
|
|
|
|
/*
|
|
* This function, called very early during the creation of a new
|
|
* process VM image, sets up which VM layout function to use:
|
|
*/
|
|
static void arch_pick_mmap_base(unsigned long *base, unsigned long *legacy_base,
|
|
unsigned long random_factor, unsigned long task_size)
|
|
{
|
|
*legacy_base = mmap_legacy_base(random_factor, task_size);
|
|
if (mmap_is_legacy())
|
|
*base = *legacy_base;
|
|
else
|
|
*base = mmap_base(random_factor, task_size);
|
|
}
|
|
|
|
void arch_pick_mmap_layout(struct mm_struct *mm)
|
|
{
|
|
if (mmap_is_legacy())
|
|
mm->get_unmapped_area = arch_get_unmapped_area;
|
|
else
|
|
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
|
|
|
|
arch_pick_mmap_base(&mm->mmap_base, &mm->mmap_legacy_base,
|
|
arch_rnd(mmap64_rnd_bits), tasksize_64bit());
|
|
|
|
#ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES
|
|
/*
|
|
* The mmap syscall mapping base decision depends solely on the
|
|
* syscall type (64-bit or compat). This applies for 64bit
|
|
* applications and 32bit applications. The 64bit syscall uses
|
|
* mmap_base, the compat syscall uses mmap_compat_base.
|
|
*/
|
|
arch_pick_mmap_base(&mm->mmap_compat_base, &mm->mmap_compat_legacy_base,
|
|
arch_rnd(mmap32_rnd_bits), tasksize_32bit());
|
|
#endif
|
|
}
|
|
|
|
unsigned long get_mmap_base(int is_legacy)
|
|
{
|
|
struct mm_struct *mm = current->mm;
|
|
|
|
#ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES
|
|
if (in_compat_syscall()) {
|
|
return is_legacy ? mm->mmap_compat_legacy_base
|
|
: mm->mmap_compat_base;
|
|
}
|
|
#endif
|
|
return is_legacy ? mm->mmap_legacy_base : mm->mmap_base;
|
|
}
|
|
|
|
const char *arch_vma_name(struct vm_area_struct *vma)
|
|
{
|
|
if (vma->vm_flags & VM_MPX)
|
|
return "[mpx]";
|
|
return NULL;
|
|
}
|