Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab5d01b6 authored by David Ahern's avatar David Ahern Committed by Greg Kroah-Hartman
Browse files

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: 8b4c3cdd ("net: sched: Add policy validation for tc attributes")
Reported-by: default avatarMarco Berizzi <pupilla@libero.it>
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c286e9d

net/sched/sch_api.c

+0 −1
Original line number Diff line number Diff line
@@ -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 },