Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soc: qcom: apr: Add __counted_by for struct apr_rx_buf and use struct_size()

Prepare for the coming implementation by GCC and Clang of the __counted_by
attribute. Flexible array members annotated with __counted_by can have
their accesses bounds-checked at run-time via CONFIG_UBSAN_BOUNDS (for
array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
functions).

While there, use struct_size() helper, instead of the open-coded
version, to calculate the size for the allocation of the whole
flexible structure, including of course, the flexible-array member.

This code was found with the help of Coccinelle, and audited and
fixed manually.

Signed-off-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Reviewed-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/ZSRw6RNi3Crhd32H@work
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

authored by

Gustavo A. R. Silva and committed by
Bjorn Andersson
ba21d636 f86955f2

+2 -2
+2 -2
drivers/soc/qcom/apr.c
··· 41 41 struct apr_rx_buf { 42 42 struct list_head node; 43 43 int len; 44 - uint8_t buf[]; 44 + uint8_t buf[] __counted_by(len); 45 45 }; 46 46 47 47 /** ··· 171 171 return -EINVAL; 172 172 } 173 173 174 - abuf = kzalloc(sizeof(*abuf) + len, GFP_ATOMIC); 174 + abuf = kzalloc(struct_size(abuf, buf, len), GFP_ATOMIC); 175 175 if (!abuf) 176 176 return -ENOMEM; 177 177