aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorwenxu <wenxu@ucloud.cn>2020-11-25 12:01:21 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-23 15:53:23 +0100
commit496ef46dbf6dcc432597f53af7be92c6a41dabec (patch)
tree731498859c8254374484a7176baedc652790dd22 /net/core/dev.c
parent40bf5450ba6fb587b54a9e19abc41412c8f8b825 (diff)
downloadkernel_replicant_linux-496ef46dbf6dcc432597f53af7be92c6a41dabec.tar.gz
kernel_replicant_linux-496ef46dbf6dcc432597f53af7be92c6a41dabec.tar.bz2
kernel_replicant_linux-496ef46dbf6dcc432597f53af7be92c6a41dabec.zip
net/sched: fix miss init the mru in qdisc_skb_cb
[ Upstream commit aadaca9e7c392dbf877af8cefb156199f1a67bbe ] The mru in the qdisc_skb_cb should be init as 0. Only defrag packets in the act_ct will set the value. Fixes: 038ebb1a713d ("net/sched: act_ct: fix miss set mru for ovs after defrag in act_ct") Signed-off-by: wenxu <wenxu@ucloud.cn> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index da85cb939869..210d0fce58e1 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3867,6 +3867,7 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev)
return skb;
/* qdisc_skb_cb(skb)->pkt_len was already set by the caller. */
+ qdisc_skb_cb(skb)->mru = 0;
mini_qdisc_bstats_cpu_update(miniq, skb);
switch (tcf_classify(skb, miniq->filter_list, &cl_res, false)) {
@@ -4950,6 +4951,7 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,
}
qdisc_skb_cb(skb)->pkt_len = skb->len;
+ qdisc_skb_cb(skb)->mru = 0;
skb->tc_at_ingress = 1;
mini_qdisc_bstats_cpu_update(miniq, skb);