Skip to content

Commit 0ae0227

Browse files
zq-david-wangakpm00
authored andcommitted
mm/codetag: move tag retrieval back upfront in __free_pages()
Commit 51ff4d7 ("mm: avoid extra mem_alloc_profiling_enabled() checks") introduces a possible use-after-free scenario, when page is non-compound, page[0] could be released by other thread right after put_page_testzero failed in current thread, pgalloc_tag_sub_pages afterwards would manipulate an invalid page for accounting remaining pages: [timeline] [thread1] [thread2] | alloc_page non-compound V | get_page, rf counter inc V | in ___free_pages | put_page_testzero fails V | put_page, page released V | in ___free_pages, | pgalloc_tag_sub_pages | manipulate an invalid page V Restore __free_pages() to its state before, retrieve alloc tag beforehand. Link: https://lkml.kernel.org/r/20250505193034.91682-1-00107082@163.com Fixes: 51ff4d7 ("mm: avoid extra mem_alloc_profiling_enabled() checks") Signed-off-by: David Wang <00107082@163.com> Acked-by: Suren Baghdasaryan <surenb@google.com> Reviewed-by: Vlastimil Babka <vbabka@suse.cz> Cc: Brendan Jackman <jackmanb@google.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Shakeel Butt <shakeel.butt@linux.dev> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Zi Yan <ziy@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 4b7c085 commit 0ae0227

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

include/linux/pgalloc_tag.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,13 @@ static inline struct alloc_tag *__pgalloc_tag_get(struct page *page)
188188
return tag;
189189
}
190190

191+
static inline struct alloc_tag *pgalloc_tag_get(struct page *page)
192+
{
193+
if (mem_alloc_profiling_enabled())
194+
return __pgalloc_tag_get(page);
195+
return NULL;
196+
}
197+
191198
void pgalloc_tag_split(struct folio *folio, int old_order, int new_order);
192199
void pgalloc_tag_swap(struct folio *new, struct folio *old);
193200

@@ -199,6 +206,7 @@ static inline void clear_page_tag_ref(struct page *page) {}
199206
static inline void alloc_tag_sec_init(void) {}
200207
static inline void pgalloc_tag_split(struct folio *folio, int old_order, int new_order) {}
201208
static inline void pgalloc_tag_swap(struct folio *new, struct folio *old) {}
209+
static inline struct alloc_tag *pgalloc_tag_get(struct page *page) { return NULL; }
202210

203211
#endif /* CONFIG_MEM_ALLOC_PROFILING */
204212

mm/page_alloc.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,14 +1151,9 @@ static inline void pgalloc_tag_sub(struct page *page, unsigned int nr)
11511151
__pgalloc_tag_sub(page, nr);
11521152
}
11531153

1154-
static inline void pgalloc_tag_sub_pages(struct page *page, unsigned int nr)
1154+
/* When tag is not NULL, assuming mem_alloc_profiling_enabled */
1155+
static inline void pgalloc_tag_sub_pages(struct alloc_tag *tag, unsigned int nr)
11551156
{
1156-
struct alloc_tag *tag;
1157-
1158-
if (!mem_alloc_profiling_enabled())
1159-
return;
1160-
1161-
tag = __pgalloc_tag_get(page);
11621157
if (tag)
11631158
this_cpu_sub(tag->counters->bytes, PAGE_SIZE * nr);
11641159
}
@@ -1168,7 +1163,7 @@ static inline void pgalloc_tag_sub_pages(struct page *page, unsigned int nr)
11681163
static inline void pgalloc_tag_add(struct page *page, struct task_struct *task,
11691164
unsigned int nr) {}
11701165
static inline void pgalloc_tag_sub(struct page *page, unsigned int nr) {}
1171-
static inline void pgalloc_tag_sub_pages(struct page *page, unsigned int nr) {}
1166+
static inline void pgalloc_tag_sub_pages(struct alloc_tag *tag, unsigned int nr) {}
11721167

11731168
#endif /* CONFIG_MEM_ALLOC_PROFILING */
11741169

@@ -5065,11 +5060,13 @@ static void ___free_pages(struct page *page, unsigned int order,
50655060
{
50665061
/* get PageHead before we drop reference */
50675062
int head = PageHead(page);
5063+
/* get alloc tag in case the page is released by others */
5064+
struct alloc_tag *tag = pgalloc_tag_get(page);
50685065

50695066
if (put_page_testzero(page))
50705067
__free_frozen_pages(page, order, fpi_flags);
50715068
else if (!head) {
5072-
pgalloc_tag_sub_pages(page, (1 << order) - 1);
5069+
pgalloc_tag_sub_pages(tag, (1 << order) - 1);
50735070
while (order-- > 0)
50745071
__free_frozen_pages(page + (1 << order), order,
50755072
fpi_flags);

0 commit comments

Comments
 (0)