diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-01-30 18:51:48 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-01 15:12:29 -0800 |
| commit | 1f533ba6d50d0e7a104d1a2c1e1a28ee0b919a90 (patch) | |
| tree | c2cf86cb0a4b7b3fab69c8fd31391caf6af1422d /net/ipv4/fib_semantics.c | |
| parent | ee69804714e204787ec8d06e80ec21e089f030a9 (diff) | |
| download | linux-1f533ba6d50d0e7a104d1a2c1e1a28ee0b919a90.tar.bz2 | |
ipv4: fib: use struct_size() in kzalloc()
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[];
};
instance = kzalloc(sizeof(struct foo) + count * sizeof(struct boo), GFP_KERNEL);
Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:
instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL);
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 'net/ipv4/fib_semantics.c')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 5022bc63863a..8e185b5a2bf6 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -1072,7 +1072,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, goto failure; } - fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL); + fi = kzalloc(struct_size(fi, fib_nh, nhs), GFP_KERNEL); if (!fi) goto failure; fi->fib_metrics = ip_fib_metrics_init(fi->fib_net, cfg->fc_mx, |