linux-kernel - [PATCH v5 1/3] mm: don't account memmap on failure

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240809191020.1142142-2-pasha.tatashin@soleen.com>
Date: Fri,  9 Aug 2024 19:10:18 +0000
From: Pasha Tatashin <pasha.tatashin@...een.com>
To: akpm@...ux-foundation.org,
	linux-kernel@...r.kernel.org,
	linux-mm@...ck.org,
	linux-cxl@...r.kernel.org,
	cerasuolodomenico@...il.com,
	hannes@...xchg.org,
	j.granados@...sung.com,
	lizhijian@...itsu.com,
	muchun.song@...ux.dev,
	nphamcs@...il.com,
	pasha.tatashin@...een.com,
	rientjes@...gle.com,
	rppt@...nel.org,
	souravpanda@...gle.com,
	vbabka@...e.cz,
	willy@...radead.org,
	dan.j.williams@...el.com,
	yi.zhang@...hat.com,
	alison.schofield@...el.com,
	david@...hat.com,
	yosryahmed@...gle.com
Subject: [PATCH v5 1/3] mm: don't account memmap on failure

When we fail to allocate the mmemmap in alloc_vmemmap_page_list(), do
not account any already-allocated pages: we're going to free all them
before we return from the function.

Fixes: 15995a352474 ("mm: report per-page metadata information")
Signed-off-by: Pasha Tatashin <pasha.tatashin@...een.com>
Reviewed-by: Fan Ni <fan.ni@...sung.com>
Reviewed-by: Yosry Ahmed <yosryahmed@...gle.com>
Acked-by: David Hildenbrand <david@...hat.com>
---
 mm/hugetlb_vmemmap.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c
index 829112b0a914..4f51e0596197 100644
--- a/mm/hugetlb_vmemmap.c
+++ b/mm/hugetlb_vmemmap.c
@@ -392,13 +392,10 @@ static int alloc_vmemmap_page_list(unsigned long start, unsigned long end,
 
 	for (i = 0; i < nr_pages; i++) {
 		page = alloc_pages_node(nid, gfp_mask, 0);
-		if (!page) {
-			mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, i);
+		if (!page)
 			goto out;
-		}
 		list_add(&page->lru, list);
 	}
-
 	mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, nr_pages);
 
 	return 0;
-- 
2.46.0.76.ge559c4bf1a-goog