1 files changed, 57 insertions, 2 deletions

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 18b5aae99bec..152744643074 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -837,8 +837,7 @@ static void copy_rtnl_link_stats(struct rtnl_link_stats *a,
 static inline int rtnl_vfinfo_size(const struct net_device *dev,
                                    u32 ext_filter_mask)
 {
-        if (dev->dev.parent && dev_is_pci(dev->dev.parent) &&
-            (ext_filter_mask & RTEXT_FILTER_VF)) {
+        if (dev->dev.parent && (ext_filter_mask & RTEXT_FILTER_VF)) {
                 int num_vfs = dev_num_vf(dev->dev.parent);
                 size_t size = nla_total_size(0);
                 size += num_vfs *
@@ -3829,6 +3828,39 @@ static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev,
                 *idxattr = 0;
         }
 
+        if (stats_attr_valid(filter_mask, IFLA_STATS_AF_SPEC, *idxattr)) {
+                struct rtnl_af_ops *af_ops;
+
+                *idxattr = IFLA_STATS_AF_SPEC;
+                attr = nla_nest_start(skb, IFLA_STATS_AF_SPEC);
+                if (!attr)
+                        goto nla_put_failure;
+
+                list_for_each_entry(af_ops, &rtnl_af_ops, list) {
+                        if (af_ops->fill_stats_af) {
+                                struct nlattr *af;
+                                int err;
+
+                                af = nla_nest_start(skb, af_ops->family);
+                                if (!af)
+                                        goto nla_put_failure;
+
+                                err = af_ops->fill_stats_af(skb, dev);
+
+                                if (err == -ENODATA)
+                                        nla_nest_cancel(skb, af);
+                                else if (err < 0)
+                                        goto nla_put_failure;
+
+                                nla_nest_end(skb, af);
+                        }
+                }
+
+                nla_nest_end(skb, attr);
+
+                *idxattr = 0;
+        }
+
         nlmsg_end(skb, nlh);
 
         return 0;
@@ -3885,6 +3917,23 @@ static size_t if_nlmsg_stats_size(const struct net_device *dev,
         if (stats_attr_valid(filter_mask, IFLA_STATS_LINK_OFFLOAD_XSTATS, 0))
                 size += rtnl_get_offload_stats_size(dev);
 
+        if (stats_attr_valid(filter_mask, IFLA_STATS_AF_SPEC, 0)) {
+                struct rtnl_af_ops *af_ops;
+
+                /* for IFLA_STATS_AF_SPEC */
+                size += nla_total_size(0);
+
+                list_for_each_entry(af_ops, &rtnl_af_ops, list) {
+                        if (af_ops->get_stats_af_size) {
+                                size += nla_total_size(
+                                        af_ops->get_stats_af_size(dev));
+
+                                /* for AF_* */
+                                size += nla_total_size(0);
+                        }
+                }
+        }
+
         return size;
 }
 
@@ -3898,6 +3947,9 @@ static int rtnl_stats_get(struct sk_buff *skb, struct nlmsghdr *nlh)
         u32 filter_mask;
         int err;
 
+        if (nlmsg_len(nlh) < sizeof(*ifsm))
+                return -EINVAL;
+
         ifsm = nlmsg_data(nlh);
         if (ifsm->ifindex > 0)
                 dev = __dev_get_by_index(net, ifsm->ifindex);
@@ -3947,6 +3999,9 @@ static int rtnl_stats_dump(struct sk_buff *skb, struct netlink_callback *cb)
 
         cb->seq = net->dev_base_seq;
 
+        if (nlmsg_len(cb->nlh) < sizeof(*ifsm))
+                return -EINVAL;
+
         ifsm = nlmsg_data(cb->nlh);
         filter_mask = ifsm->filter_mask;
         if (!filter_mask)