Skip to content

Commit 9eb4c32

Browse files
Len Bakerdavem330
authored andcommitted
nfp: Prefer struct_size over open coded arithmetic
As noted in the "Deprecated Interfaces, Language Features, Attributes, and Conventions" documentation [1], size calculations (especially multiplication) should not be performed in memory allocator (or similar) function arguments due to the risk of them overflowing. This could lead to values wrapping around and a smaller allocation being made than the caller was expecting. Using those allocations could lead to linear overflows of heap memory and other misbehaviors. So, use the struct_size() helper to do the arithmetic instead of the argument "size + count * size" in the kzalloc() function. [1] https://www.kernel.org/doc/html/v5.14/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments Signed-off-by: Len Baker <[email protected]> Reviewed-by: Gustavo A. R. Silva <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f55e36d commit 9eb4c32

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/net/ethernet/netronome/nfp/nfp_net_repr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,7 @@ struct nfp_reprs *nfp_reprs_alloc(unsigned int num_reprs)
499499
{
500500
struct nfp_reprs *reprs;
501501

502-
reprs = kzalloc(sizeof(*reprs) +
503-
num_reprs * sizeof(struct net_device *), GFP_KERNEL);
502+
reprs = kzalloc(struct_size(reprs, reprs, num_reprs), GFP_KERNEL);
504503
if (!reprs)
505504
return NULL;
506505
reprs->num_reprs = num_reprs;

0 commit comments

Comments
 (0)