History

mm/kvmalloc: add __alloc_size attributes for better bounds checking

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

Kees Cook committed 5 years ago

Commit 56bcf401 parent c37495d1 file · +8 −8Browse files

Unified · Split

include/linux/slab.h+8−8
@@ -737,21 +737,21 @@ static inline __alloc_size(1) void *kzalloc_node(size_t size, gfp_t flags, int n · 736 unmodified lines
737737 return kmalloc_node(size, flags | __GFP_ZERO, node);
738738 }
739739
740−extern void *kvmalloc_node(size_t size, gfp_t flags, int node);
741−static inline void *kvmalloc(size_t size, gfp_t flags)
740+extern void *kvmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
741+static inline __alloc_size(1) void *kvmalloc(size_t size, gfp_t flags)
742742 {
743743 return kvmalloc_node(size, flags, NUMA_NO_NODE);
744744 }
745−static inline void *kvzalloc_node(size_t size, gfp_t flags, int node)
745+static inline __alloc_size(1) void *kvzalloc_node(size_t size, gfp_t flags, int node)
746746 {
747747 return kvmalloc_node(size, flags | __GFP_ZERO, node);
748748 }
749−static inline void *kvzalloc(size_t size, gfp_t flags)
749+static inline __alloc_size(1) void *kvzalloc(size_t size, gfp_t flags)
750750 {
751751 return kvmalloc(size, flags | __GFP_ZERO);
752752 }
753753
754−static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags)
754+static inline __alloc_size(1, 2) void *kvmalloc_array(size_t n, size_t size, gfp_t flags)
755755 {
756756 size_t bytes;
757757
@@ -761,13 +761,13 @@ static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) · 3 unmodified lines
761761 return kvmalloc(bytes, flags);
762762 }
763763
764−static inline void *kvcalloc(size_t n, size_t size, gfp_t flags)
764+static inline __alloc_size(1, 2) void *kvcalloc(size_t n, size_t size, gfp_t flags)
765765 {
766766 return kvmalloc_array(n, size, flags | __GFP_ZERO);
767767 }
768768
769−extern void *kvrealloc(const void *p, size_t oldsize, size_t newsize,
770− gfp_t flags);
769+extern void *kvrealloc(const void *p, size_t oldsize, size_t newsize, gfp_t flags)
770+ __alloc_size(3);
771771 extern void kvfree(const void *addr);
772772 extern void kvfree_sensitive(const void *addr, size_t len);
773773

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t