diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2022-09-29 11:30:55 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2022-09-29 11:30:55 +0200 |
| commit | 445d41d7a7c15793933f47c0c23fae3a1d09a8c1 (patch) | |
| tree | 2621791892a2cc5b2df5e762af3843ae47453254 /include/linux/compiler_attributes.h | |
| parent | af961f8059a42d1b9941dd8aa83420b25fd17e91 (diff) | |
| parent | 05a940656e1eb2026d9ee31019d5b47e9545124d (diff) | |
| download | linux-445d41d7a7c15793933f47c0c23fae3a1d09a8c1.tar.gz linux-445d41d7a7c15793933f47c0c23fae3a1d09a8c1.tar.bz2 linux-445d41d7a7c15793933f47c0c23fae3a1d09a8c1.zip | |
Merge branch 'slab/for-6.1/kmalloc_size_roundup' into slab/for-next
The first two patches from a series by Kees Cook [1] that introduce
kmalloc_size_roundup(). This will allow merging of per-subsystem patches using
the new function and ultimately stop (ab)using ksize() in a way that causes
ongoing trouble for debugging functionality and static checkers.
[1] https://lore.kernel.org/all/20220923202822.2667581-1-keescook@chromium.org/
--
Resolved a conflict of modifying mm/slab.c __ksize() comment with a commit that
unifies __ksize() implementation into mm/slab_common.c
Diffstat (limited to 'include/linux/compiler_attributes.h')
| -rw-r--r-- | include/linux/compiler_attributes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/compiler_attributes.h b/include/linux/compiler_attributes.h index 445e80517cab..96a4ed11b4be 100644 --- a/include/linux/compiler_attributes.h +++ b/include/linux/compiler_attributes.h @@ -35,7 +35,8 @@ /* * Note: do not use this directly. Instead, use __alloc_size() since it is conditionally - * available and includes other attributes. + * available and includes other attributes. For GCC < 9.1, __alloc_size__ gets undefined + * in compiler-gcc.h, due to misbehaviors. * * gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-alloc_005fsize-function-attribute * clang: https://clang.llvm.org/docs/AttributeReference.html#alloc-size |