The patch titled
find_extend_vma(): fix result of bungled merging
has been added to the -mm tree. Its filename is
find_extend_vma-fix-result-of-bungled-merging.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: find_extend_vma(): fix result of bungled merging
From: Denys Vlasenko <vda.linux@xxxxxxxxxxxxxx>
This test of `prev' got accidentally removed in
cb8f488c33539f096580e202f5438a809195008f ("mmap.c: deinline a few
functions")
Signed-off-by: Denys Vlasenko <vda.linux@xxxxxxxxxxxxxx>
Cc: Jiri Kosina <jkosina@xxxxxxx>
Cc: Helge Deller <deller@xxxxxx>
Cc: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Jeroen Roovers <jer@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/mmap.c~find_extend_vma-fix-result-of-bungled-merging mm/mmap.c
--- a/mm/mmap.c~find_extend_vma-fix-result-of-bungled-merging
+++ a/mm/mmap.c
@@ -1704,7 +1704,7 @@ find_extend_vma(struct mm_struct *mm, un
vma = find_vma_prev(mm, addr, &prev);
if (vma && (vma->vm_start <= addr))
return vma;
- if (expand_stack(prev, addr))
+ if (!prev || expand_stack(prev, addr))
return NULL;
if (prev->vm_flags & VM_LOCKED) {
if (mlock_vma_pages_range(prev, addr, prev->vm_end) < 0)
_
Patches currently in -mm which might be from vda.linux@xxxxxxxxxxxxxx are
find_extend_vma-fix-result-of-bungled-merging.patch
--
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
