| 1 |
commit: 936f353b2f29bdb407be3d71ddc57c38752c9130 |
| 2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 11 01:51:36 2018 +0000 |
| 4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 14 11:36:29 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=936f353b |
| 7 |
|
| 8 |
net: sched: Remove TCA_OPTIONS from policy |
| 9 |
|
| 10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
| 11 |
|
| 12 |
0000_README | 4 ++++ |
| 13 |
1800_TCA-OPTIONS-sched-fix.patch | 35 +++++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 39 insertions(+) |
| 15 |
|
| 16 |
diff --git a/0000_README b/0000_README |
| 17 |
index 6774045..bdc7ee9 100644 |
| 18 |
--- a/0000_README |
| 19 |
+++ b/0000_README |
| 20 |
@@ -123,6 +123,10 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch |
| 21 |
From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ |
| 22 |
Desc: Enable link security restrictions by default. |
| 23 |
|
| 24 |
+Patch: 1800_TCA-OPTIONS-sched-fix.patch |
| 25 |
+From: https://git.kernel.org |
| 26 |
+Desc: net: sched: Remove TCA_OPTIONS from policy |
| 27 |
+ |
| 28 |
Patch: 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch |
| 29 |
From: https://bugzilla.redhat.com/show_bug.cgi?id=1260207#c5 |
| 30 |
Desc: Add UAS disable quirk. See bug #640082. |
| 31 |
|
| 32 |
diff --git a/1800_TCA-OPTIONS-sched-fix.patch b/1800_TCA-OPTIONS-sched-fix.patch |
| 33 |
new file mode 100644 |
| 34 |
index 0000000..f960fac |
| 35 |
--- /dev/null |
| 36 |
+++ b/1800_TCA-OPTIONS-sched-fix.patch |
| 37 |
@@ -0,0 +1,35 @@ |
| 38 |
+From e72bde6b66299602087c8c2350d36a525e75d06e Mon Sep 17 00:00:00 2001 |
| 39 |
+From: David Ahern <dsahern@×××××.com> |
| 40 |
+Date: Wed, 24 Oct 2018 08:32:49 -0700 |
| 41 |
+Subject: net: sched: Remove TCA_OPTIONS from policy |
| 42 |
+ |
| 43 |
+Marco reported an error with hfsc: |
| 44 |
+root@Calimero:~# tc qdisc add dev eth0 root handle 1:0 hfsc default 1 |
| 45 |
+Error: Attribute failed policy validation. |
| 46 |
+ |
| 47 |
+Apparently a few implementations pass TCA_OPTIONS as a binary instead |
| 48 |
+of nested attribute, so drop TCA_OPTIONS from the policy. |
| 49 |
+ |
| 50 |
+Fixes: 8b4c3cdd9dd8 ("net: sched: Add policy validation for tc attributes") |
| 51 |
+Reported-by: Marco Berizzi <pupilla@××××××.it> |
| 52 |
+Signed-off-by: David Ahern <dsahern@×××××.com> |
| 53 |
+Signed-off-by: David S. Miller <davem@×××××××××.net> |
| 54 |
+--- |
| 55 |
+ net/sched/sch_api.c | 1 - |
| 56 |
+ 1 file changed, 1 deletion(-) |
| 57 |
+ |
| 58 |
+diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c |
| 59 |
+index 022bca98bde6..ca3b0f46de53 100644 |
| 60 |
+--- a/net/sched/sch_api.c |
| 61 |
++++ b/net/sched/sch_api.c |
| 62 |
+@@ -1320,7 +1320,6 @@ check_loop_fn(struct Qdisc *q, unsigned long cl, struct qdisc_walker *w) |
| 63 |
+ |
| 64 |
+ const struct nla_policy rtm_tca_policy[TCA_MAX + 1] = { |
| 65 |
+ [TCA_KIND] = { .type = NLA_STRING }, |
| 66 |
+- [TCA_OPTIONS] = { .type = NLA_NESTED }, |
| 67 |
+ [TCA_RATE] = { .type = NLA_BINARY, |
| 68 |
+ .len = sizeof(struct tc_estimator) }, |
| 69 |
+ [TCA_STAB] = { .type = NLA_NESTED }, |
| 70 |
+-- |
| 71 |
+cgit 1.2-0.3.lf.el7 |
| 72 |
+ |
Archives