Merge branch 'x86/cache' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 20 insertions, 4 deletions

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 98541c6399db..85e73f48e48f 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1311,6 +1311,18 @@ check_loop_fn(struct Qdisc *q, unsigned long cl, struct qdisc_walker *w)
  * Delete/get qdisc.
  */
 
+const struct nla_policy rtm_tca_policy[TCA_MAX + 1] = {
+        [TCA_KIND]              = { .type = NLA_STRING },
+        [TCA_OPTIONS]           = { .type = NLA_NESTED },
+        [TCA_RATE]              = { .type = NLA_BINARY,
+                                    .len = sizeof(struct tc_estimator) },
+        [TCA_STAB]              = { .type = NLA_NESTED },
+        [TCA_DUMP_INVISIBLE]    = { .type = NLA_FLAG },
+        [TCA_CHAIN]             = { .type = NLA_U32 },
+        [TCA_INGRESS_BLOCK]     = { .type = NLA_U32 },
+        [TCA_EGRESS_BLOCK]      = { .type = NLA_U32 },
+};
+
 static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
                         struct netlink_ext_ack *extack)
 {
@@ -1327,7 +1339,8 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
             !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                 return -EPERM;
 
-        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL, extack);
+        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, rtm_tca_policy,
+                          extack);
         if (err < 0)
                 return err;
 
@@ -1411,7 +1424,8 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
 
 replay:
         /* Reinit, just in case something touches this. */
-        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL, extack);
+        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, rtm_tca_policy,
+                          extack);
         if (err < 0)
                 return err;
 
@@ -1645,7 +1659,8 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
         idx = 0;
         ASSERT_RTNL();
 
-        err = nlmsg_parse(nlh, sizeof(struct tcmsg), tca, TCA_MAX, NULL, NULL);
+        err = nlmsg_parse(nlh, sizeof(struct tcmsg), tca, TCA_MAX,
+                          rtm_tca_policy, NULL);
         if (err < 0)
                 return err;
 
@@ -1864,7 +1879,8 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n,
             !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                 return -EPERM;
 
-        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL, extack);
+        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, rtm_tca_policy,
+                          extack);
         if (err < 0)
                 return err;