staging: greybus: Add __counted_by for struct apr_rx_buf and use struct_size()
PATCH 1/1 staging: greybus: 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.
--- drivers/staging/greybus/raw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/greybus/raw.c +2 -2
@@ -29,7 +29,7 @@ struct gb_raw {struct raw_data {struct list_head entry;u32 len; -u8 data[]; + u8 data[] __counted_by(len); };static const struct class raw_class = {
@@ -73,7 +73,7 @@ static int receive_data(struct gb_raw *raw, u32 len, u8 *data) goto exit; } - raw_data =kmalloc (sizeof (*raw_data) + len,GFP_KERNEL ); + raw_data =kmalloc (struct_size (raw_data, data, len),GFP_KERNEL );if (!raw_data) { retval = -ENOMEM ; goto exit;
Signature · 1 line
2.34.1
Quoted 6 lines · Gustavo A. R. Silva
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).
Quoted 8 lines
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 <[email protected]>
Looks right, "len" is updated before accessing "data[]".
Signature · 1 line
Kees Cook
Quoted 6 lines · Gustavo A. R. Silva
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).
Quoted 6 lines
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.
Looks good to me, and I like the use of struct_size().
Quoted 28 lines
Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/staging/greybus/raw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/greybus/raw.c +2
-2@@ -29,7 +29,7 @@ struct gb_raw {struct raw_data {struct list_head entry;u32 len; -u8 data[]; + u8 data[] __counted_by(len); };static const struct class raw_class = {@@ -73,7 +73,7 @@ static int receive_data(struct gb_raw *raw, u32 len, u8 *data) goto exit; } - raw_data =kmalloc (sizeof (*raw_data) + len,GFP_KERNEL ); + raw_data =kmalloc (struct_size (raw_data, data, len),GFP_KERNEL );if (!raw_data) { retval = -ENOMEM ; goto exit;