From 832bb5141bb84a889f68acb112655dd6b311ba40 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 5 Dec 2021 15:09:55 +0100 Subject: [PATCH] Revert "Revert "mm/page_alloc: add __alloc_size attributes for better bounds checking"" This reverts commit 814f0e007f7fe682a74b4ec8fc0820bcbdd532c4. It was originally reverted due to test failures in cuttlefish. Those failures were incorrectly traced to this commit, so this commit is safe to bring back. Signed-off-by: Greg Kroah-Hartman Change-Id: I56911bda03758aee3ce3d32c5fcb8fe094727189 --- include/linux/gfp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 599f367a8c3d..50010434a8f8 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -613,9 +613,9 @@ static inline struct folio *folio_alloc(gfp_t gfp, unsigned int order) extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order); extern unsigned long get_zeroed_page(gfp_t gfp_mask); -void *alloc_pages_exact(size_t size, gfp_t gfp_mask); +void *alloc_pages_exact(size_t size, gfp_t gfp_mask) __alloc_size(1); void free_pages_exact(void *virt, size_t size); -void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask); +__meminit void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __alloc_size(1); #define __get_free_page(gfp_mask) \ __get_free_pages((gfp_mask), 0)