OSDN Git Service

nfp: Prefer struct_size over open coded arithmetic
authorLen Baker <len.baker@gmx.com>
Sun, 12 Sep 2021 13:10:57 +0000 (15:10 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Sep 2021 12:02:38 +0000 (13:02 +0100)
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 <len.baker@gmx.com>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c

index 3b8e675..369f6ae 100644 (file)
@@ -499,8 +499,7 @@ struct nfp_reprs *nfp_reprs_alloc(unsigned int num_reprs)
 {
        struct nfp_reprs *reprs;
 
-       reprs = kzalloc(sizeof(*reprs) +
-                       num_reprs * sizeof(struct net_device *), GFP_KERNEL);
+       reprs = kzalloc(struct_size(reprs, reprs, num_reprs), GFP_KERNEL);
        if (!reprs)
                return NULL;
        reprs->num_reprs = num_reprs;