[037/262] mm/vmalloc: add __alloc_size attributes for better bounds checking

Commit Message

Andrew Morton Nov. 5, 2021, 8:36 p.m. UTC

From: Kees Cook <[e-mail]>
Subject: mm/vmalloc: add __alloc_size attributes for better bounds checking

As already done in GrapheneOS, add the __alloc_size attribute for
appropriate vmalloc allocator interfaces, to provide additional hinting
for better bounds checking, assisting CONFIG_FORTIFY_SOURCE and other
compiler optimizations.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Kees Cook <[e-mail]>
Co-developed-by: Daniel Micay <[e-mail]>
Signed-off-by: Daniel Micay <[e-mail]>
Cc: Andy Whitcroft <[e-mail]>
Cc: Christoph Lameter <[e-mail]>
Cc: David Rientjes <[e-mail]>
Cc: Dennis Zhou <[e-mail]>
Cc: Dwaipayan Ray <[e-mail]>
Cc: Joe Perches <[e-mail]>
Cc: Joonsoo Kim <[e-mail]>
Cc: Lukas Bulwahn <[e-mail]>
Cc: Miguel Ojeda <[e-mail]>
Cc: Nathan Chancellor <[e-mail]>
Cc: Nick Desaulniers <[e-mail]>
Cc: Pekka Enberg <[e-mail]>
Cc: Tejun Heo <[e-mail]>
Cc: Vlastimil Babka <[e-mail]>
Cc: Alexandre Bounine <[e-mail]>
Cc: Gustavo A. R. Silva <[e-mail]>
Cc: Ira Weiny <[e-mail]>
Cc: Jing Xiangfeng <[e-mail]>
Cc: John Hubbard <[e-mail]>
Cc: kernel test robot <[e-mail]>
Cc: Matt Porter <[e-mail]>
Cc: Randy Dunlap <[e-mail]>
Cc: Souptick Joarder <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 include/linux/vmalloc.h |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Patch

--- a/include/linux/vmalloc.h~mm-vmalloc-add-__alloc_size-attributes-for-better-bounds-checking
+++ a/include/linux/vmalloc.h
@@ -136,21 +136,21 @@  static inline void vmalloc_init(void)
 static inline unsigned long vmalloc_nr_pages(void) { return 0; }
 #endif
 
-extern void *vmalloc(unsigned long size);
-extern void *vzalloc(unsigned long size);
-extern void *vmalloc_user(unsigned long size);
-extern void *vmalloc_node(unsigned long size, int node);
-extern void *vzalloc_node(unsigned long size, int node);
-extern void *vmalloc_32(unsigned long size);
-extern void *vmalloc_32_user(unsigned long size);
-extern void *__vmalloc(unsigned long size, gfp_t gfp_mask);
+extern void *vmalloc(unsigned long size) __alloc_size(1);
+extern void *vzalloc(unsigned long size) __alloc_size(1);
+extern void *vmalloc_user(unsigned long size) __alloc_size(1);
+extern void *vmalloc_node(unsigned long size, int node) __alloc_size(1);
+extern void *vzalloc_node(unsigned long size, int node) __alloc_size(1);
+extern void *vmalloc_32(unsigned long size) __alloc_size(1);
+extern void *vmalloc_32_user(unsigned long size) __alloc_size(1);
+extern void *__vmalloc(unsigned long size, gfp_t gfp_mask) __alloc_size(1);
 extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
 			unsigned long start, unsigned long end, gfp_t gfp_mask,
 			pgprot_t prot, unsigned long vm_flags, int node,
-			const void *caller);
+			const void *caller) __alloc_size(1);
 void *__vmalloc_node(unsigned long size, unsigned long align, gfp_t gfp_mask,
-		int node, const void *caller);
-void *vmalloc_no_huge(unsigned long size);
+		int node, const void *caller) __alloc_size(1);
+void *vmalloc_no_huge(unsigned long size) __alloc_size(1);
 
 extern void vfree(const void *addr);
 extern void vfree_atomic(const void *addr);