arm64/mm: Remove hack in mmap randomize layout
Since commit8a0a9bd4db
('random: make get_random_int() more random'), get_random_int() returns a random value for each call, so comment and hack introduced in mmap_rnd() as part of commit1d18c47c73
('arm64: MMU fault handling and page table management') are incorrects. Commit1d18c47c73
seems to use the same hack introduced by commita5adc91a4b
('powerpc: Ensure random space between stack and mmaps'), latter copied in commit5a0efea09f
('sparc64: Sharpen address space randomization calculations.'). But both architectures were cleaned up as part of commitfa8cbaaf5a
('powerpc+sparc64/mm: Remove hack in mmap randomize layout') as hack is no more needed since commit8a0a9bd4db
. So the present patch removes the comment and the hack around get_random_int() on AArch64's mmap_rnd(). Cc: David S. Miller <davem@davemloft.net> Cc: Anton Blanchard <anton@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Will Deacon <will.deacon@arm.com> Acked-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Yann Droneaud <ydroneaud@opteya.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Родитель
7d57511d2d
Коммит
d6c763afab
|
@ -47,22 +47,14 @@ static int mmap_is_legacy(void)
|
|||
return sysctl_legacy_va_layout;
|
||||
}
|
||||
|
||||
/*
|
||||
* Since get_random_int() returns the same value within a 1 jiffy window, we
|
||||
* will almost always get the same randomisation for the stack and mmap
|
||||
* region. This will mean the relative distance between stack and mmap will be
|
||||
* the same.
|
||||
*
|
||||
* To avoid this we can shift the randomness by 1 bit.
|
||||
*/
|
||||
static unsigned long mmap_rnd(void)
|
||||
{
|
||||
unsigned long rnd = 0;
|
||||
|
||||
if (current->flags & PF_RANDOMIZE)
|
||||
rnd = (long)get_random_int() & (STACK_RND_MASK >> 1);
|
||||
rnd = (long)get_random_int() & STACK_RND_MASK;
|
||||
|
||||
return rnd << (PAGE_SHIFT + 1);
|
||||
return rnd << PAGE_SHIFT;
|
||||
}
|
||||
|
||||
static unsigned long mmap_base(void)
|
||||
|
|
Загрузка…
Ссылка в новой задаче