Unverified Commit c0ab8963 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6652 geneve: make sure to pull inner header in geneve_rx() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5ESDDQSEVM3PUE2W5DHH5H773ZCXTAJ5/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9HK9B 
 
Link:https://gitee.com/openeuler/kernel/pulls/6652

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents e924d385 c252313e

drivers/net/geneve.c

+16 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs, 
	struct metadata_dst *tun_dst = NULL;

	struct pcpu_sw_netstats *stats;

	unsigned int len;

	int err = 0;

	int nh, err = 0;

	void *oiph;



	if (ip_tunnel_collect_metadata() || gs->collect_md) {
@@ -261,9 +261,23 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs, 
		goto drop;

	}



	oiph = skb_network_header(skb);

	/* Save offset of outer header relative to skb->head,

	 * because we are going to reset the network header to the inner header

	 * and might change skb->head.

	 */

	nh = skb_network_header(skb) - skb->head;



	skb_reset_network_header(skb);



	if (!pskb_inet_may_pull(skb)) {

		DEV_STATS_INC(geneve->dev, rx_length_errors);

		DEV_STATS_INC(geneve->dev, rx_errors);

		goto drop;

	}



	/* Get the outer header. */

	oiph = skb->head + nh;



	if (geneve_get_sk_family(gs) == AF_INET)

		err = IP_ECN_decapsulate(oiph, skb);

#if IS_ENABLED(CONFIG_IPV6)