diff options
author | Jiri Benc <jbenc@redhat.com> | 2014-08-08 16:44:32 +0200 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-10-17 09:43:10 +0200 |
commit | 5794d8f0eb051c58c0b854e39dbff863243cc89e (patch) | |
tree | 1d06986b14d3669b3fe5e621f056dec30d11b6fb /net/core | |
parent | 3298e331fa90fb04800cbc88ce25f7be30acd241 (diff) |
rtnetlink: fix VF info size
[ Upstream commit 945a36761fd7877660f630bbdeb4ff9ff80d1935 ]
Commit 1d8faf48c74b8 ("net/core: Add VF link state control") added new
attribute to IFLA_VF_INFO group in rtnl_fill_ifinfo but did not adjust size
of the allocated memory in if_nlmsg_size/rtnl_vfinfo_size. As the result, we
may trigger warnings in rtnl_getlink and similar functions when many VF
links are enabled, as the information does not fit into the allocated skb.
Fixes: 1d8faf48c74b8 ("net/core: Add VF link state control")
Reported-by: Yulong Pei <ypei@redhat.com>
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/rtnetlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 070c51506eb1..93ad6c5b2d77 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -739,7 +739,8 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev, (nla_total_size(sizeof(struct ifla_vf_mac)) + nla_total_size(sizeof(struct ifla_vf_vlan)) + nla_total_size(sizeof(struct ifla_vf_tx_rate)) + - nla_total_size(sizeof(struct ifla_vf_spoofchk))); + nla_total_size(sizeof(struct ifla_vf_spoofchk)) + + nla_total_size(sizeof(struct ifla_vf_link_state))); return size; } else return 0; |