On Tue, 2 Apr 2013 11:54:03 +0200 Cyril Hrubis <chru...@suse.cz> wrote:
> This patch fixes corner case for MAP_FIXED when requested mapping length
> is larger than rlimit for virtual memory. In such case any overlapping
> mappings are unmapped before we check for the limit and return ENOMEM.
>
> The check is moved before the loop that unmaps overlapping parts of
> existing mappings. When we are about to hit the limit (currently mapped
> pages + len > limit) we scan for overlapping pages and check again
> accounting for them.
>
> This fixes situation when userspace program expects that the previous
> mappings are preserved after the mmap() syscall has returned with error.
> (POSIX clearly states that successfull mapping shall replace any
> previous mappings.)
>
> This corner case was found and can be tested with LTP testcase:
>
> testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
>
> In this case the mmap, which is clearly over current limit, unmaps
> dynamic libraries and the testcase segfaults right after returning into
> userspace.
>
> I've also looked at the second instance of the unmapping loop in the
> do_brk(). The do_brk() is called from brk() syscall and from vm_brk().
> The brk() syscall checks for overlapping mappings and bails out when
> there are any (so it can't be triggered from the brk syscall). The
> vm_brk() is called only from binmft handlers so it shouldn't be
> triggered unless binmft handler created overlapping mappings.
>
> ...
>
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -33,6 +33,7 @@
> #include <linux/uprobes.h>
> #include <linux/rbtree_augmented.h>
> #include <linux/sched/sysctl.h>
> +#include <linux/kernel.h>
>
> #include <asm/uaccess.h>
> #include <asm/cacheflush.h>
> @@ -543,6 +544,34 @@ static int find_vma_links(struct mm_struct *mm, unsigned
> long addr,
> return 0;
> }
>
> +static unsigned long count_vma_pages_range(struct mm_struct *mm,
> + unsigned long addr, unsigned long end)
> +{
> + unsigned long nr_pages = 0;
> + struct vm_area_struct *vma;
> +
> + /* Find first overlaping mapping */
> + vma = find_vma_intersection(mm, addr, end);
> + if (!vma)
> + return 0;
> +
> + nr_pages = (min(end, vma->vm_end) -
> + max(addr, vma->vm_start)) >> PAGE_SHIFT;
urgh, these things always make my head spin. Is it guaranteed that
end, vm_end, addr and vm_start are all multiples of PAGE_SIZE? If not,
we have a problem don't we?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
