mm: fix unaccount of memory on vma_link() failure
authorAnthony Yznaga <anthony.yznaga@oracle.com>
Wed, 30 Aug 2023 00:43:24 +0000 (17:43 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Wed, 4 Oct 2023 17:32:19 +0000 (10:32 -0700)
Fix insert_vm_struct() so that only accounted memory is unaccounted if
vma_link() fails.

Link: https://lkml.kernel.org/r/20230830004324.16101-1-anthony.yznaga@oracle.com
Fixes: d4af56c5c7c6 ("mm: start tracking VMAs with maple tree")
Signed-off-by: Anthony Yznaga <anthony.yznaga@oracle.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/mmap.c

index b56a7f0c9f856509a7a17eac92c71f2ce30b659c..1ec6c875a7f95745aa1e94c55d2fa6966ab10a0f 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3278,7 +3278,8 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
        }
 
        if (vma_link(mm, vma)) {
-               vm_unacct_memory(charged);
+               if (vma->vm_flags & VM_ACCOUNT)
+                       vm_unacct_memory(charged);
                return -ENOMEM;
        }