The patch titled
Subject: mips-extract-logic-for-mmap_rnd-v4
has been removed from the -mm tree. Its filename was
mips-extract-logic-for-mmap_rnd-v4.patch
This patch was dropped because it was folded into mips-extract-logic-for-mmap_rnd.patch
------------------------------------------------------
From: Kees Cook <keescook@xxxxxxxxxxxx>
Subject: mips-extract-logic-for-mmap_rnd-v4
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/mips/mm/mmap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/mips/mm/mmap.c~mips-extract-logic-for-mmap_rnd-v4 arch/mips/mm/mmap.c
--- a/arch/mips/mm/mmap.c~mips-extract-logic-for-mmap_rnd-v4
+++ a/arch/mips/mm/mmap.c
@@ -149,9 +149,9 @@ static unsigned long mmap_rnd(void)
rnd = (unsigned long)get_random_int();
rnd <<= PAGE_SHIFT;
if (TASK_IS_32BIT_ADDR)
- random_factor &= 0xfffffful;
+ rnd &= 0xfffffful;
else
- random_factor &= 0xffffffful;
+ rnd &= 0xffffffful;
return rnd;
}
_
Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are
origin.patch
binfmt_elf-fix-bug-in-loading-of-pie-binaries.patch
arm-factor-out-mmap-aslr-into-mmap_rnd.patch
x86-standardize-mmap_rnd-usage.patch
arm64-standardize-mmap_rnd-usage.patch
mips-extract-logic-for-mmap_rnd.patch
powerpc-standardize-mmap_rnd-usage.patch
powerpc-standardize-mmap_rnd-usage-v4.patch
s390-standardize-mmap_rnd-usage.patch
mm-expose-arch_mmap_rnd-when-available.patch
s390-redefine-randomize_et_dyn-for-elf_et_dyn_base.patch
mm-split-et_dyn-aslr-from-mmap-aslr.patch
mm-fold-arch_randomize_brk-into-arch_has_elf_randomize.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
