diff options
author | David S. Miller <davem@davemloft.net> | 2019-04-04 10:55:59 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-04 10:55:59 -0700 |
commit | 3baf5c2d6f4f5bc1bf55b6f3d45015419ca89914 (patch) | |
tree | 745972ccb1eada0d1672c97b65bbde019890316c /net | |
parent | aecfde23108b8e637d9f5c5e523b24fb97035dc3 (diff) | |
parent | c87b4ecdbe8db27867a7b7f840291cd843406bd7 (diff) | |
download | linux-stable-3baf5c2d6f4f5bc1bf55b6f3d45015419ca89914.tar.gz linux-stable-3baf5c2d6f4f5bc1bf55b6f3d45015419ca89914.tar.bz2 linux-stable-3baf5c2d6f4f5bc1bf55b6f3d45015419ca89914.zip |
Merge branch 'sch_cake-fixes'
Toke Høiland-Jørgensen says:
====================
sched: A few small fixes for sch_cake
Kevin noticed a few issues with the way CAKE reads the skb protocol and the IP
diffserv fields. This series fixes those two issues, and should probably go to
in 4.19 as well. However, the previous refactoring patch means they don't apply
as-is; I can send a follow-up directly to stable if that's OK with you?
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/sched/sch_cake.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index acc9b9da985f..259d97bc2abd 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1517,16 +1517,27 @@ static unsigned int cake_drop(struct Qdisc *sch, struct sk_buff **to_free) static u8 cake_handle_diffserv(struct sk_buff *skb, u16 wash) { + int wlen = skb_network_offset(skb); u8 dscp; - switch (skb->protocol) { + switch (tc_skb_protocol(skb)) { case htons(ETH_P_IP): + wlen += sizeof(struct iphdr); + if (!pskb_may_pull(skb, wlen) || + skb_try_make_writable(skb, wlen)) + return 0; + dscp = ipv4_get_dsfield(ip_hdr(skb)) >> 2; if (wash && dscp) ipv4_change_dsfield(ip_hdr(skb), INET_ECN_MASK, 0); return dscp; case htons(ETH_P_IPV6): + wlen += sizeof(struct ipv6hdr); + if (!pskb_may_pull(skb, wlen) || + skb_try_make_writable(skb, wlen)) + return 0; + dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> 2; if (wash && dscp) ipv6_change_dsfield(ipv6_hdr(skb), INET_ECN_MASK, 0); |