net: wwan: t7xx: Add __counted_by for struct t7xx_fsm_event and use struct_size()
PATCH 1/1 net: wwan: t7xx: Add __counted_by for struct t7xx_fsm_event 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/net/wwan/t7xx/t7xx_state_monitor.c | 3 ++- drivers/net/wwan/t7xx/t7xx_state_monitor.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/wwan/t7xx/t7xx_state_monitor.c +2 -1
@@ -445,7 +445,8 @@ int t7xx_fsm_append_event(struct t7xx_fsm_ctl *ctl, enum t7xx_fsm_event_state evreturn -EINVAL ; } - event =kmalloc (sizeof (*event) + length,in_interrupt () ?GFP_ATOMIC :GFP_KERNEL ); + event =kmalloc (struct_size (event, data, length), +in_interrupt () ?GFP_ATOMIC :GFP_KERNEL );if (!event)return -ENOMEM ;
drivers/net/wwan/t7xx/t7xx_state_monitor.h +1 -1
@@ -102,7 +102,7 @@ struct t7xx_fsm_event {struct list_head entry;enum t7xx_fsm_event_state event_id;unsigned int length; -unsigned char data[]; + unsigned char data[] __counted_by(length); };struct t7xx_fsm_command {
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 to me.
-Kees
Quoted 36 lines
--- drivers/net/wwan/t7xx/t7xx_state_monitor.c | 3 ++- drivers/net/wwan/t7xx/t7xx_state_monitor.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/net/wwan/t7xx/t7xx_state_monitor.c +2
-1@@ -445,7 +445,8 @@ int t7xx_fsm_append_event(struct t7xx_fsm_ctl *ctl, enum t7xx_fsm_event_state evreturn -EINVAL ; } - event =kmalloc (sizeof (*event) + length,in_interrupt () ?GFP_ATOMIC :GFP_KERNEL ); + event =kmalloc (struct_size (event, data, length), +in_interrupt () ?GFP_ATOMIC :GFP_KERNEL );if (!event)return -ENOMEM ;drivers/net/wwan/t7xx/t7xx_state_monitor.h +1
-1@@ -102,7 +102,7 @@ struct t7xx_fsm_event {struct list_head entry;enum t7xx_fsm_event_state event_id;unsigned int length; -unsigned char data[]; + unsigned char data[] __counted_by(length); };struct t7xx_fsm_command {Signature · 1 line
2.34.1
Signature · 1 line
Kees Cook
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 11 lines · On Mon, 9 Oct 2023 15:46:18 -0600 you wrote:
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).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.[...]
Here is the summary with links:
- [next] net: wwan: t7xx: Add __counted_by for struct t7xx_fsm_event and use struct_size()
https://git.kernel.org/netdev/net-next/c/2dd307189220
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html