Unverified Commit 10f981d4 authored Jul 04, 2024 by openeuler-ci-bot Committed by Gitee Jul 04, 2024

!9754 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/YWZKPVIKKIBD7DS4Z66KTKH4DLOXX7JW/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SH5 
 
Link:https://gitee.com/openeuler/kernel/pulls/9754

 

Reviewed-by: Liu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: Zhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents 5d1381c3 038100a0

net/openvswitch/flow.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -427,7 +427,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 \|\|
		@@ -436,6 +435,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.
		*/