The patch titled Subject: mips: use STACK_TOP when computing mmap base address has been added to the -mm tree. Its filename is mips-use-stack_top-when-computing-mmap-base-address.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mips-use-stack_top-when-computing-mmap-base-address.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mips-use-stack_top-when-computing-mmap-base-address.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Alexandre Ghiti <alex@xxxxxxxx> Subject: mips: use STACK_TOP when computing mmap base address mmap base address must be computed wrt stack top address, using TASK_SIZE is wrong since STACK_TOP and TASK_SIZE are not equivalent. Link: http://lkml.kernel.org/r/20190730055113.23635-11-alex@xxxxxxxx Signed-off-by: Alexandre Ghiti <alex@xxxxxxxx> Acked-by: Kees Cook <keescook@xxxxxxxxxxxx> Acked-by: Paul Burton <paul.burton@xxxxxxxx> Reviewed-by: Luis Chamberlain <mcgrof@xxxxxxxxxx> Cc: Albert Ou <aou@xxxxxxxxxxxxxxxxx> Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: James Hogan <jhogan@xxxxxxxxxx> Cc: Palmer Dabbelt <palmer@xxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/mips/mm/mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/mips/mm/mmap.c~mips-use-stack_top-when-computing-mmap-base-address +++ a/arch/mips/mm/mmap.c @@ -22,7 +22,7 @@ EXPORT_SYMBOL(shm_align_mask); /* gap between mmap and stack */ #define MIN_GAP (128*1024*1024UL) -#define MAX_GAP ((TASK_SIZE)/6*5) +#define MAX_GAP ((STACK_TOP)/6*5) #define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12)) static int mmap_is_legacy(struct rlimit *rlim_stack) @@ -54,7 +54,7 @@ static unsigned long mmap_base(unsigned else if (gap > MAX_GAP) gap = MAX_GAP; - return PAGE_ALIGN(TASK_SIZE - gap - rnd); + return PAGE_ALIGN(STACK_TOP - gap - rnd); } #define COLOUR_ALIGN(addr, pgoff) \ _ Patches currently in -mm which might be from alex@xxxxxxxx are mm-fs-move-randomize_stack_top-from-fs-to-mm.patch arm64-make-use-of-is_compat_task-instead-of-hardcoding-this-test.patch arm64-consider-stack-randomization-for-mmap-base-only-when-necessary.patch arm64-mm-move-generic-mmap-layout-functions-to-mm.patch arm64-mm-make-randomization-selected-by-generic-topdown-mmap-layout.patch arm-properly-account-for-stack-randomization-and-stack-guard-gap.patch arm-use-stack_top-when-computing-mmap-base-address.patch arm-use-generic-mmap-top-down-layout-and-brk-randomization.patch mips-properly-account-for-stack-randomization-and-stack-guard-gap.patch mips-use-stack_top-when-computing-mmap-base-address.patch mips-adjust-brk-randomization-offset-to-fit-generic-version.patch mips-replace-arch-specific-way-to-determine-32bit-task-with-generic-version.patch mips-use-generic-mmap-top-down-layout-and-brk-randomization.patch riscv-make-mmap-allocation-top-down-by-default.patch