AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfp: flower: use struct_size() helper

Browse Source 
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 nfp_tun_active_tuns {
	...
        struct route_ip_info {
                __be32 ipv4;
                __be32 egress_port;
                __be32 extra[2];
        } tun_info[];
};

Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.

So, replace the following form:

sizeof(struct nfp_tun_active_tuns) + sizeof(struct route_ip_info) * count

with:

struct_size(payload, tun_info, count)

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gustavo A. R. Silva 2019-06-05 15:38:27 -05:00 committed by David S. Miller
parent 80598e6230
commit 856e6d9f9d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
View File

@ -162,8 +162,7 @@ void nfp_tunnel_keep_alive(struct nfp_app *app, struct sk_buff *skb)
} }
pay_len = nfp_flower_cmsg_get_data_len(skb); pay_len = nfp_flower_cmsg_get_data_len(skb);
if (pay_len != sizeof(struct nfp_tun_active_tuns) + if (pay_len != struct_size(payload, tun_info, count)) {
sizeof(struct route_ip_info) * count) {
nfp_flower_cmsg_warn(app, "Corruption in tunnel keep-alive message.\n"); nfp_flower_cmsg_warn(app, "Corruption in tunnel keep-alive message.\n");
return; return;
} }