summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLiam Howlett <liam.howlett@oracle.com>2023-01-09 20:57:21 +0000
committerAndrew Morton <akpm@linux-foundation.org>2023-01-11 16:14:22 -0800
commit80be727ec87225797771a39f3e6801baf291faaf (patch)
tree5fb994fd0ba31bb5843399410ff7964c7af08aaa /mm
parent7f31cced5724e6d414fe750aa1cd7e7b578ec22f (diff)
downloadlinux-rpi-80be727ec87225797771a39f3e6801baf291faaf.tar.gz
linux-rpi-80be727ec87225797771a39f3e6801baf291faaf.tar.bz2
linux-rpi-80be727ec87225797771a39f3e6801baf291faaf.zip
nommu: fix do_munmap() error path
When removing a VMA from the tree fails due to no memory, do not free the VMA since a reference still exists. Link: https://lkml.kernel.org/r/20230109205708.956103-1-Liam.Howlett@oracle.com Fixes: 8220543df148 ("nommu: remove uses of VMA linked list") Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Yu Zhao <yuzhao@google.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/nommu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/nommu.c b/mm/nommu.c
index c8252f01d5db..844af5be7640 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1509,7 +1509,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len, struct list
erase_whole_vma:
if (delete_vma_from_mm(vma))
ret = -ENOMEM;
- delete_vma(mm, vma);
+ else
+ delete_vma(mm, vma);
return ret;
}