diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2018-11-10 20:18:51 -0500 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2018-11-14 09:00:41 -0500 |
| commit | 272e46e83879ef24d9ebd68ff3fd74cac370cc46 (patch) | |
| tree | 05ff25dc9303c5776b6efe584870c76a335ded90 | |
| parent | Linux patch 4.14.80 (diff) | |
| download | linux-patches-272e46e83879ef24d9ebd68ff3fd74cac370cc46.tar.gz linux-patches-272e46e83879ef24d9ebd68ff3fd74cac370cc46.tar.bz2 linux-patches-272e46e83879ef24d9ebd68ff3fd74cac370cc46.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 9993abab..28ef8f28 100644 --- a/0000_README +++ b/0000_README @@ -375,6 +375,10 @@ Patch: 1700_ia64_fix_ptrace.patch From: https://patchwork.kernel.org/patch/10198159/ Desc: ia64: fix ptrace(PTRACE_GETREGS) (unbreaks strace, gdb). +Patch: 1800_TCA-OPTIONS-sched-fix.patch +From: https://git.kernel.org +Desc: net: sched: Remove TCA_OPTIONS from policy + Patch: 2100_bcache-data-corruption-fix-for-bi-partno.patch From: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=62530ed8b1d07a45dec94d46e521c0c6c2d476e6 Desc: bio: ensure __bio_clone_fast copies bi_partno. 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 + |