The patch titled
Subject: mm/mmap.c: remove incorrect MAP_FIXED flag comparison from mmap_region
has been removed from the -mm tree. Its filename was
mm-mmapc-remove-incorrect-map_fixed-flag-comparison-from-mmap_region.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Piotr Kwapulinski <kwapulinski.piotr@xxxxxxxxx>
Subject: mm/mmap.c: remove incorrect MAP_FIXED flag comparison from mmap_region
The following flag comparison in mmap_region makes no sense:
if (!(vm_flags & MAP_FIXED))
return -ENOMEM;
The condition is always false and thus the above "return -ENOMEM" is never
executed. The vm_flags must not be compared with MAP_FIXED flag. The
vm_flags may only be compared with VM_* flags. MAP_FIXED has the same
value as VM_MAYREAD.
Hitting the rlimit is a slow path and find_vma_intersection should realize
that there is no overlapping VMA for !MAP_FIXED case pretty quickly.
Signed-off-by: Piotr Kwapulinski <kwapulinski.piotr@xxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Chris Metcalf <cmetcalf@xxxxxxxxxx>
Reviewed-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mmap.c | 3 ---
1 file changed, 3 deletions(-)
diff -puN mm/mmap.c~mm-mmapc-remove-incorrect-map_fixed-flag-comparison-from-mmap_region mm/mmap.c
--- a/mm/mmap.c~mm-mmapc-remove-incorrect-map_fixed-flag-comparison-from-mmap_region
+++ a/mm/mmap.c
@@ -1551,9 +1551,6 @@ unsigned long mmap_region(struct file *f
* MAP_FIXED may remove pages of mappings that intersects with
* requested mapping. Account for the pages it would unmap.
*/
- if (!(vm_flags & MAP_FIXED))
- return -ENOMEM;
-
nr_pages = count_vma_pages_range(mm, addr, addr + len);
if (!may_expand_vm(mm, (len >> PAGE_SHIFT) - nr_pages))
_
Patches currently in -mm which might be from kwapulinski.piotr@xxxxxxxxx are
--
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
