Unverified Commit 6a985437 authored Jun 08, 2024 by openeuler-ci-bot Committed by Gitee Jun 08, 2024

!8628 erspan: make sure erspan_base_hdr is present in skb->head

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VCBQYEAY344C5HTHZPAPVQHEGPP75VEM/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QG0F 
 
Link:https://gitee.com/openeuler/kernel/pulls/8628

 

Reviewed-by: Yue Haibing <yuehaibing@huawei.com>
Reviewed-by: Liu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents 063e0f47 4d50a113

net/ipv4/ip_gre.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,9 @@ static int erspan_rcv(struct sk_buff skb, struct tnl_ptk_info tpi,

		itn = net_generic(net, erspan_net_id);

		if (unlikely(!pskb_may_pull(skb, gre_hdr_len + sizeof(*ershdr))))
		return PACKET_REJECT;

		iph = ip_hdr(skb);
		ershdr = (struct erspan_base_hdr *)(skb->data + gre_hdr_len);
		ver = ershdr->ver;

net/ipv6/ip6_gre.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -551,6 +551,9 @@ static int ip6erspan_rcv(struct sk_buff skb, struct tnl_ptk_info tpi,
		struct ip6_tnl *tunnel;
		u8 ver;

		if (unlikely(!pskb_may_pull(skb, sizeof(*ershdr))))
		return PACKET_REJECT;

		ipv6h = ipv6_hdr(skb);
		ershdr = (struct erspan_base_hdr *)skb->data;
		ver = ershdr->ver;