diff options
| author | Gustavo A. R. Silva <gustavoars@kernel.org> | 2020-06-22 18:07:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-23 20:27:09 -0700 |
| commit | 6f3934576853a4fa60dea74ac8822f0f016ef9e8 (patch) | |
| tree | 04951421e617a66f3d9d007a57db9092de5d605f /net/ipv6/exthdrs.c | |
| parent | 5777cbba79ab041ccc08252abf6ea6bbd1f4c285 (diff) | |
| download | linux-6f3934576853a4fa60dea74ac8822f0f016ef9e8.tar.bz2 | |
net: ipv6: Use struct_size() helper and kcalloc()
Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes. Also, remove unnecessary
function ipv6_rpl_srh_alloc_size() and replace kzalloc() with kcalloc(),
which has a 2-factor argument form for multiplication.
This code was detected with the help of Coccinelle and, audited and
fixed manually.
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/exthdrs.c')
| -rw-r--r-- | net/ipv6/exthdrs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 5a8bbcdcaf2b..e9b366994475 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -580,7 +580,7 @@ looped_back: hdr->segments_left--; i = n - hdr->segments_left; - buf = kzalloc(ipv6_rpl_srh_alloc_size(n + 1) * 2, GFP_ATOMIC); + buf = kcalloc(struct_size(hdr, segments.addr, n + 2), 2, GFP_ATOMIC); if (unlikely(!buf)) { kfree_skb(skb); return -1; |