summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorDavid Ahern2018-10-24 17:32:49 +0200
committerGreg Kroah-Hartman2018-11-13 20:09:00 +0100
commitab5d01b6130a4faa37a393cf828c6f65c45e7251 (patch)
tree060cf1e33b3da3a6b885cbd9a88346178a9d69e7 /net/sched
parentBtrfs: fix use-after-free when dumping free space (diff)
downloadkernel-qcow2-linux-ab5d01b6130a4faa37a393cf828c6f65c45e7251.tar.gz
kernel-qcow2-linux-ab5d01b6130a4faa37a393cf828c6f65c45e7251.tar.xz
kernel-qcow2-linux-ab5d01b6130a4faa37a393cf828c6f65c45e7251.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>
Diffstat (limited to 'net/sched')
-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 3dc0acf54245..be7cd140b2a3 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1309,7 +1309,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 },