diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2018-11-10 20:51:36 -0500 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2018-11-14 08:15:41 -0500 |
| commit | f1ccd5f707733ba5115c78edc91afa9c0fe8745d (patch) | |
| tree | bd4b5fecff8923fef8a0d81d0993ba44d3426df9 | |
| parent | Linux patch 4.18.18 (diff) | |
| download | linux-patches-f1ccd5f7.tar.gz linux-patches-f1ccd5f7.tar.bz2 linux-patches-f1ccd5f7.zip | |
net: sched: Remove TCA_OPTIONS from policy
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1800_TCA-OPTIONS-sched-fix.patch | 35 |
2 files changed, 39 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 67740455..bdc7ee9a 100644 --- a/0000_README +++ b/0000_README @@ -123,6 +123,10 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ Desc: Enable link security restrictions by default. +Patch: 1800_TCA-OPTIONS-sched-fix.patch +From: https://git.kernel.org +Desc: net: sched: Remove TCA_OPTIONS from policy + Patch: 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch From: https://bugzilla.redhat.com/show_bug.cgi?id=1260207#c5 Desc: Add UAS disable quirk. See bug #640082. diff --git a/1800_TCA-OPTIONS-sched-fix.patch b/1800_TCA-OPTIONS-sched-fix.patch new file mode 100644 index 00000000..f960facf --- /dev/null +++ b/1800_TCA-OPTIONS-sched-fix.patch @@ -0,0 +1,35 @@ +From e72bde6b66299602087c8c2350d36a525e75d06e Mon Sep 17 00:00:00 2001 +From: David Ahern <dsahern@gmail.com> +Date: Wed, 24 Oct 2018 08:32:49 -0700 +Subject: net: sched: Remove TCA_OPTIONS from policy + +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> +--- + net/sched/sch_api.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c +index 022bca98bde6..ca3b0f46de53 100644 +--- a/net/sched/sch_api.c ++++ b/net/sched/sch_api.c +@@ -1320,7 +1320,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 }, +-- +cgit 1.2-0.3.lf.el7 + |