The patch titled
Subject: mips: adjust brk randomization offset to fit generic version
has been added to the -mm tree. Its filename is
mips-adjust-brk-randomization-offset-to-fit-generic-version.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mips-adjust-brk-randomization-offset-to-fit-generic-version.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mips-adjust-brk-randomization-offset-to-fit-generic-version.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: adjust brk randomization offset to fit generic version
This commit simply bumps up to 32MB and 1GB the random offset of brk,
compared to 8MB and 256MB, for 32bit and 64bit respectively.
Link: http://lkml.kernel.org/r/20190730055113.23635-12-alex@xxxxxxxx
Suggested-by: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Alexandre Ghiti <alex@xxxxxxxx>
Acked-by: Paul Burton <paul.burton@xxxxxxxx>
Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx>
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 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/arch/mips/mm/mmap.c~mips-adjust-brk-randomization-offset-to-fit-generic-version
+++ a/arch/mips/mm/mmap.c
@@ -16,6 +16,7 @@
#include <linux/random.h>
#include <linux/sched/signal.h>
#include <linux/sched/mm.h>
+#include <linux/sizes.h>
unsigned long shm_align_mask = PAGE_SIZE - 1; /* Sane caches */
EXPORT_SYMBOL(shm_align_mask);
@@ -189,11 +190,11 @@ static inline unsigned long brk_rnd(void
unsigned long rnd = get_random_long();
rnd = rnd << PAGE_SHIFT;
- /* 8MB for 32bit, 256MB for 64bit */
+ /* 32MB for 32bit, 1GB for 64bit */
if (TASK_IS_32BIT_ADDR)
- rnd = rnd & 0x7ffffful;
+ rnd = rnd & (SZ_32M - 1);
else
- rnd = rnd & 0xffffffful;
+ rnd = rnd & (SZ_1G - 1);
return rnd;
}
_
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
