Commit 6601abf5 authored by Hangbin Liu's avatar Hangbin Liu Committed by Zheng Zengkai
Browse files

selftests/bpf: Set gopt opt_class to 0 if get tunnel opt failed 



stable inclusion
from stable-5.10.27
commit d5380ceede6fe2d2e305ee9664403089291eca9f
bugzilla: 51493

--------------------------------

[ Upstream commit 31254dc9 ]

When fixing the bpf test_tunnel.sh geneve failure. I only fixed the IPv4
part but forgot the IPv6 issue. Similar with the IPv4 fixes 557c223b
("selftests/bpf: No need to drop the packet when there is no geneve opt"),
when there is no tunnel option and bpf_skb_get_tunnel_opt() returns error,
there is no need to drop the packets and break all geneve rx traffic.
Just set opt_class to 0 and keep returning TC_ACT_OK at the end.

Fixes: 557c223b ("selftests/bpf: No need to drop the packet when there is no geneve opt")
Fixes: 933a741e ("selftests/bpf: bpf tunnel test.")
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
Link: https://lore.kernel.org/bpf/20210309032214.2112438-1-liuhangbin@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatar&nbsp; Weilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 353ae55e

tools/testing/selftests/bpf/progs/test_tunnel_kern.c

+2 −4
Original line number Diff line number Diff line
@@ -508,10 +508,8 @@ int _ip6geneve_get_tunnel(struct __sk_buff *skb) 
	}



	ret = bpf_skb_get_tunnel_opt(skb, &gopt, sizeof(gopt));

	if (ret < 0) {

		ERROR(ret);

		return TC_ACT_SHOT;

	}

	if (ret < 0)

		gopt.opt_class = 0;



	bpf_trace_printk(fmt, sizeof(fmt),

			key.tunnel_id, key.remote_ipv4, gopt.opt_class);