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

!9757 net: openvswitch: fix overwriting ct original tuple for ICMPv6 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjie Ruan <ruanjinjie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/E3TMRVU4THCNF3CJV4YYK24XK6BZFUDU/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SH5 
 
Link:https://gitee.com/openeuler/kernel/pulls/9757

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 8f623512 e2432ae9

net/openvswitch/flow.c

+2 −1
Original line number Diff line number Diff line
@@ -561,7 +561,6 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key, 
	 */

	key->tp.src = htons(icmp->icmp6_type);

	key->tp.dst = htons(icmp->icmp6_code);

	memset(&key->ipv6.nd, 0, sizeof(key->ipv6.nd));



	if (icmp->icmp6_code == 0 &&

	    (icmp->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION ||
@@ -570,6 +569,8 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key, 
		struct nd_msg *nd;

		int offset;



		memset(&key->ipv6.nd, 0, sizeof(key->ipv6.nd));



		/* In order to process neighbor discovery options, we need the

		 * entire packet.

		 */