Security: round mmap hint address above mmap_min_addr

[linux-2.6-omap-h63xx.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 35622c59092546b9fd91d1aa31eceb3504bae41d..b989cb928a7cf29ec5ad66ff519f80633bfe8129 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -829,6 +829,9 @@ unsigned long do_mmap_pgoff(struct file *file,
        void *result;
        int ret;
 
+       if (!(flags & MAP_FIXED))
+               addr = round_hint_to_min(addr);
+
        /* decide whether we should attempt the mapping, and if so what sort of
         * mapping */
        ret = validate_mmap_request(file, addr, len, prot, flags, pgoff,