* [PATCH] mm: fix new crash in unmapped_area_topdown()
@ 2017-06-20 9:10 Hugh Dickins
2017-06-21 9:35 ` Michal Hocko
0 siblings, 1 reply; 2+ messages in thread
From: Hugh Dickins @ 2017-06-20 9:10 UTC (permalink / raw)
To: Linus Torvalds
Cc: Dave Jones, Oleg Nesterov, Michal Hocko, linux-kernel, linux-mm
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 <davej@codemonkey.org.uk>
Debugged-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Hugh Dickins <hughd@google.com>
---
mm/mmap.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- 4.12-rc6/mm/mmap.c 2017-06-19 09:06:10.035407505 -0700
+++ linux/mm/mmap.c 2017-06-19 21:09:28.616707311 -0700
@@ -1817,7 +1817,8 @@ unsigned long unmapped_area(struct vm_un
/* 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 */
@@ -1920,7 +1921,8 @@ unsigned long unmapped_area_topdown(stru
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 */
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] mm: fix new crash in unmapped_area_topdown()
2017-06-20 9:10 [PATCH] mm: fix new crash in unmapped_area_topdown() Hugh Dickins
@ 2017-06-21 9:35 ` Michal Hocko
0 siblings, 0 replies; 2+ messages in thread
From: Michal Hocko @ 2017-06-21 9:35 UTC (permalink / raw)
To: Hugh Dickins
Cc: Linus Torvalds, Dave Jones, Oleg Nesterov, linux-kernel, linux-mm
On Tue 20-06-17 02:10:44, Hugh Dickins wrote:
> 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().
I finally found some more time to look at this and the fix looks good to
me. I have checked and it seems to be complete. I was even wondering
wheter we should warn when MAP_FIXED is too close to a stack area. Maybe
somebody does that intentionally, though (I can certainly imagine
PROT_NONE mapping under the stack to protect from {over,under}flows).
> Cc: stable@vger.kernel.org
> Fixes: 1be7107fbe18 ("mm: larger stack guard gap, between vmas")
> Reported-by: Dave Jones <davej@codemonkey.org.uk>
> Debugged-by: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: Hugh Dickins <hughd@google.com>
Anyway feel free to add
Acked-by: Michal Hocko <mhocko@suse.com>
> ---
>
> mm/mmap.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> --- 4.12-rc6/mm/mmap.c 2017-06-19 09:06:10.035407505 -0700
> +++ linux/mm/mmap.c 2017-06-19 21:09:28.616707311 -0700
> @@ -1817,7 +1817,8 @@ unsigned long unmapped_area(struct vm_un
> /* 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 */
> @@ -1920,7 +1921,8 @@ unsigned long unmapped_area_topdown(stru
> 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 */
--
Michal Hocko
SUSE Labs
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-21 9:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-20 9:10 [PATCH] mm: fix new crash in unmapped_area_topdown() Hugh Dickins
2017-06-21 9:35 ` Michal Hocko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).