From: Anthony Yznaga <anthony.yznaga@oracle.com>
Date: Wed, 30 Aug 2023 00:43:24 +0000 (-0700)
Subject: mm: fix unaccount of memory on vma_link() failure
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dd34d9fe3b427dea47f81443d022dbaec4339f7e;p=linux.git

mm: fix unaccount of memory on vma_link() failure

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>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index b56a7f0c9f856..1ec6c875a7f95 100644
--- 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;
 	}