diff options
author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-03-29 16:28:41 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-02 00:01:46 +0200 |
commit | db4863fdb897f6c55461a0446592c524dae6bfbe (patch) | |
tree | d2d5ac1089ee8ebe3d8a46eb1caafe6ce0aea23d /drivers/net/ethernet/chelsio/cxgb3/l2t.c | |
parent | cxgb3/l2t: Fix undefined behaviour (diff) | |
download | linux-db4863fdb897f6c55461a0446592c524dae6bfbe.tar.xz linux-db4863fdb897f6c55461a0446592c524dae6bfbe.zip |
cxgb3/l2t: Use struct_size() in kvzalloc()
One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:
struct foo {
int stuff;
struct boo entry[];
};
size = sizeof(struct foo) + count * sizeof(struct boo);
instance = kvzalloc(size, GFP_KERNEL);
Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:
instance = kvzalloc(struct_size(instance, entry, count), GFP_KERNEL);
Notice that, in this case, variable size is not necessary, hence
it is removed.
This code was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb3/l2t.c')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb3/l2t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c index 0e9182d3f02c..b3e4118a15e7 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.c +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c @@ -443,9 +443,9 @@ found: struct l2t_data *t3_init_l2t(unsigned int l2t_capacity) { struct l2t_data *d; - int i, size = sizeof(*d) + l2t_capacity * sizeof(struct l2t_entry); + int i; - d = kvzalloc(size, GFP_KERNEL); + d = kvzalloc(struct_size(d, l2tab, l2t_capacity), GFP_KERNEL); if (!d) return NULL; |