From: Hugh Dickins Date: Tue, 20 Jun 2017 09:10:44 +0000 (-0700) Subject: mm: fix new crash in unmapped_area_topdown() X-Git-Tag: archive/raspbian/4.9.51-1+rpi1~8^2^2~65 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dde85eb84a9b5625a166dc865f6944402aa4120f;p=linux-4.9.git mm: fix new crash in unmapped_area_topdown() Trinity gets kernel BUG at mm/mmap.c:1963! in about 3 minutes of mmap testing. That's the VM_BUG_ON(gap_end < gap_start) at the end of unmapped_area_topdown(). Linus points out how MAP_FIXED (which does not have to respect our stack guard gap intentions) could result in gap_end below gap_start there. Fix that, and the similar case in its alternative, unmapped_area(). Cc: stable@vger.kernel.org Fixes: 1be7107fbe18 ("mm: larger stack guard gap, between vmas") Reported-by: Dave Jones Debugged-by: Linus Torvalds Signed-off-by: Hugh Dickins Acked-by: Michal Hocko Signed-off-by: Linus Torvalds Gbp-Pq: Topic bugfix/all Gbp-Pq: Name mm-fix-new-crash-in-unmapped_area_topdown.patch --- diff --git a/mm/mmap.c b/mm/mmap.c index d17c30b3080c..ccbf085caab8 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1813,7 +1813,8 @@ check_current: /* Check if current node has a suitable gap */ if (gap_start > high_limit) return -ENOMEM; - if (gap_end >= low_limit && gap_end - gap_start >= length) + if (gap_end >= low_limit && + gap_end > gap_start && gap_end - gap_start >= length) goto found; /* Visit right subtree if it looks promising */ @@ -1916,7 +1917,8 @@ check_current: gap_end = vm_start_gap(vma); if (gap_end < low_limit) return -ENOMEM; - if (gap_start <= high_limit && gap_end - gap_start >= length) + if (gap_start <= high_limit && + gap_end > gap_start && gap_end - gap_start >= length) goto found; /* Visit left subtree if it looks promising */