| Message ID | alpine.LFD.2.00.1104072249260.28032@xanadu.home |
|---|---|
| State | New |
| Headers | show |
On 04/07/2011 07:51 PM, Nicolas Pitre wrote: > Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> > --- Is this a stable candidate? > arch/arm/mm/mmap.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c > index afe209e..74be05f 100644 > --- a/arch/arm/mm/mmap.c > +++ b/arch/arm/mm/mmap.c > @@ -7,6 +7,7 @@ > #include <linux/shm.h> > #include <linux/sched.h> > #include <linux/io.h> > +#include <linux/personality.h> > #include <linux/random.h> > #include <asm/cputype.h> > #include <asm/system.h> > @@ -82,7 +83,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, > mm->cached_hole_size = 0; > } > /* 8 bits of randomness in 20 address space bits */ > - if (current->flags & PF_RANDOMIZE) > + if ((current->flags & PF_RANDOMIZE) && > + !(current->personality & ADDR_NO_RANDOMIZE)) > addr += (get_random_int() % (1 << 8)) << PAGE_SHIFT; > > full_search:
On Thu, 14 Apr 2011, Stephen Boyd wrote: > On 04/07/2011 07:51 PM, Nicolas Pitre wrote: > > Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> > > --- > > Is this a stable candidate? Maybe, but OTOH this is not critical. You also need to have CONFIG_COMPAT_BRK=n before this makes any difference, and that option is enabled by default. Nicolas
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index afe209e..74be05f 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c @@ -7,6 +7,7 @@ #include <linux/shm.h> #include <linux/sched.h> #include <linux/io.h> +#include <linux/personality.h> #include <linux/random.h> #include <asm/cputype.h> #include <asm/system.h> @@ -82,7 +83,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, mm->cached_hole_size = 0; } /* 8 bits of randomness in 20 address space bits */ - if (current->flags & PF_RANDOMIZE) + if ((current->flags & PF_RANDOMIZE) && + !(current->personality & ADDR_NO_RANDOMIZE)) addr += (get_random_int() % (1 << 8)) << PAGE_SHIFT; full_search:
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> --- arch/arm/mm/mmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)