[PATCH net] rtnetlink: fix VF info size

[PATCH net] rtnetlink: fix VF info size

[Jiri Benc]

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>
---
 net/core/rtnetlink.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 8d39071f32d7..f0493e3b7471 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -804,7 +804,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_spoofchk)) +
-			 nla_total_size(sizeof(struct ifla_vf_rate)));
+			 nla_total_size(sizeof(struct ifla_vf_rate)) +
+			 nla_total_size(sizeof(struct ifla_vf_link_state)));
 		return size;
 	} else
 		return 0;
-- 
1.8.3.1

Re: [PATCH net] rtnetlink: fix VF info size

[David Miller]

From: Jiri Benc <jbenc@redhat.com>
Date: Fri,  8 Aug 2014 16:44:32 +0200

> 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>

Applied and queued up for -stable, thanks!