diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2019-04-10 16:27:25 -0400 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2019-04-12 07:44:24 -0400 |
commit | e0478542cfd4d993e38d5f92a3f3ecd238805e96 (patch) | |
tree | dc6c1561c32ab07b82b01351f53857b3e32f14de /include/linux/overflow.h | |
parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) |
overflow.h: Add comment documenting __ab_c_size()
__ab_c_size() is a somewhat opaque name. Document its purpose, and while
at it, rename the parameters to actually match the abc naming.
[ bp: glued a complete patch from chunks on LKML. ]
Reported-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Matthew Wilcox <willy@infradead.org>
Link: https://lkml.kernel.org/r/20190405045711.30339-1-bp@alien8.de
Diffstat (limited to 'include/linux/overflow.h')
-rw-r--r-- | include/linux/overflow.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/overflow.h b/include/linux/overflow.h index 40b48e2133cb..6534a727cadb 100644 --- a/include/linux/overflow.h +++ b/include/linux/overflow.h | |||
@@ -278,11 +278,15 @@ static inline __must_check size_t array3_size(size_t a, size_t b, size_t c) | |||
278 | return bytes; | 278 | return bytes; |
279 | } | 279 | } |
280 | 280 | ||
281 | static inline __must_check size_t __ab_c_size(size_t n, size_t size, size_t c) | 281 | /* |
282 | * Compute a*b+c, returning SIZE_MAX on overflow. Internal helper for | ||
283 | * struct_size() below. | ||
284 | */ | ||
285 | static inline __must_check size_t __ab_c_size(size_t a, size_t b, size_t c) | ||
282 | { | 286 | { |
283 | size_t bytes; | 287 | size_t bytes; |
284 | 288 | ||
285 | if (check_mul_overflow(n, size, &bytes)) | 289 | if (check_mul_overflow(a, b, &bytes)) |
286 | return SIZE_MAX; | 290 | return SIZE_MAX; |
287 | if (check_add_overflow(bytes, c, &bytes)) | 291 | if (check_add_overflow(bytes, c, &bytes)) |
288 | return SIZE_MAX; | 292 | return SIZE_MAX; |