Skip to content

Commit

Permalink
ip6_gre: Avoid updating tunnel->tun_hlen in __gre6_xmit()
Browse files Browse the repository at this point in the history
[ Upstream commit f40c064 ]

Do not update tunnel->tun_hlen in data plane code.  Use a local variable
instead, just like "tunnel_hlen" in net/ipv4/ip_gre.c:gre_fb_xmit().

Co-developed-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Peilin Ye <peilin.ye@bytedance.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
ypl-coffee authored and gregkh committed Apr 27, 2022
1 parent 8fb76ad commit 200f96e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/ipv6/ip6_gre.c
Expand Up @@ -743,6 +743,7 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,
struct ip_tunnel_info *tun_info;
const struct ip_tunnel_key *key;
__be16 flags;
int tun_hlen;

tun_info = skb_tunnel_info_txcheck(skb);
if (IS_ERR(tun_info) ||
Expand All @@ -760,9 +761,9 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,
dsfield = key->tos;
flags = key->tun_flags &
(TUNNEL_CSUM | TUNNEL_KEY | TUNNEL_SEQ);
tunnel->tun_hlen = gre_calc_hlen(flags);
tun_hlen = gre_calc_hlen(flags);

gre_build_header(skb, tunnel->tun_hlen,
gre_build_header(skb, tun_hlen,
flags, protocol,
tunnel_id_to_key32(tun_info->key.tun_id),
(flags & TUNNEL_SEQ) ? htonl(tunnel->o_seqno++)
Expand Down

0 comments on commit 200f96e

Please sign in to comment.