summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ahern <dsahern@gmail.com>2018-10-24 08:32:49 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-13 11:15:18 -0800
commitdfba4092167df3bb9b6abb0510ea4c680bb8ece5 (patch)
tree6f56baabed17689af38d40be145a8d39b4a0bdb2
parentfc8a236ee0580c920c48696f0df806affa892cbc (diff)
downloadlinux-stable-dfba4092167df3bb9b6abb0510ea4c680bb8ece5.tar.gz
linux-stable-dfba4092167df3bb9b6abb0510ea4c680bb8ece5.tar.bz2
linux-stable-dfba4092167df3bb9b6abb0510ea4c680bb8ece5.zip
net: sched: Remove TCA_OPTIONS from policy
commit e72bde6b66299602087c8c2350d36a525e75d06e upstream. Marco reported an error with hfsc: root@Calimero:~# tc qdisc add dev eth0 root handle 1:0 hfsc default 1 Error: Attribute failed policy validation. Apparently a few implementations pass TCA_OPTIONS as a binary instead of nested attribute, so drop TCA_OPTIONS from the policy. Fixes: 8b4c3cdd9dd8 ("net: sched: Add policy validation for tc attributes") Reported-by: Marco Berizzi <pupilla@libero.it> Signed-off-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/sched/sch_api.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 691ca96f7460..7b4270987ac1 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1218,7 +1218,6 @@ check_loop_fn(struct Qdisc *q, unsigned long cl, struct qdisc_walker *w)
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 },