Commit 5540fbf4 authored Apr 24, 2018 by William Tu Committed by Daniel Borkmann Apr 25, 2018

bpf: clear the ip_tunnel_info.



The percpu metadata_dst might carry the stale ip_tunnel_info
and cause incorrect behavior.  When mixing tests using ipv4/ipv6
bpf vxlan and geneve tunnel, the ipv6 tunnel info incorrectly uses
ipv4's src ip addr as its ipv6 src address, because the previous
tunnel info does not clean up.  The patch zeros the fields in
ip_tunnel_info.

Signed-off-by: William Tu <u9012063@gmail.com>
Reported-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent b3f8adee

net/core/filter.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3240,6 +3240,7 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb,
		skb_dst_set(skb, (struct dst_entry *) md);

		info = &md->u.tun_info;
		memset(info, 0, sizeof(*info));
		info->mode = IP_TUNNEL_INFO_TX;

		info->key.tun_flags = TUNNEL_KEY \| TUNNEL_CSUM \| TUNNEL_NOCACHE;

Admin message