Commit b1f61b5b authored Sep 23, 2019 by Alexandre Ghiti Committed by Linus Torvalds Sep 24, 2019

mips: properly account for stack randomization and stack guard gap

This commit takes care of stack randomization and stack guard gap when
computing mmap base address and checks if the task asked for
randomization.  This fixes the problem uncovered and not fixed for arm
here: https://lkml.kernel.org/r/20170622200033.25714-1-riel@redhat.com

Link: http://lkml.kernel.org/r/20190730055113.23635-10-alex@ghiti.fr


Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Paul Burton <paul.burton@mips.com>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: James Hogan <jhogan@kernel.org>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent dba79c3d

arch/mips/mm/mmap.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ EXPORT_SYMBOL(shm_align_mask);
		/* gap between mmap and stack */
		#define MIN_GAP (12810241024UL)
		#define MAX_GAP ((TASK_SIZE)/6*5)
		#define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12))

		static int mmap_is_legacy(struct rlimit *rlim_stack)
		{
		@@ -38,6 +39,15 @@ static int mmap_is_legacy(struct rlimit *rlim_stack)
		static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack)
		{
		unsigned long gap = rlim_stack->rlim_cur;
		unsigned long pad = stack_guard_gap;

		/* Account for stack randomization if necessary */
		if (current->flags & PF_RANDOMIZE)
		pad += (STACK_RND_MASK << PAGE_SHIFT);

		/* Values close to RLIM_INFINITY can overflow. */
		if (gap + pad > gap)
		gap += pad;

		if (gap < MIN_GAP)
		gap = MIN_GAP;

Admin message