Commit f52f11ec authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

lwtunnel: add options process for arp request 



Without options copied to the dst tun_info in iptunnel_metadata_reply()
called by arp_process for handling arp_request, the generated arp_reply
packet may be dropped or sent out with wrong options for some tunnels
like erspan and vxlan, and the traffic will break.

Fixes: 63d008a4 ("ipv4: send arp replies to the correct tunnel")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 426071f1

net/ipv4/ip_tunnel_core.c

+4 −3
Original line number Diff line number Diff line
@@ -126,15 +126,14 @@ struct metadata_dst *iptunnel_metadata_reply(struct metadata_dst *md, 


	if (!md || md->type != METADATA_IP_TUNNEL ||

	    md->u.tun_info.mode & IP_TUNNEL_INFO_TX)



		return NULL;



	res = metadata_dst_alloc(0, METADATA_IP_TUNNEL, flags);

	src = &md->u.tun_info;

	res = metadata_dst_alloc(src->options_len, METADATA_IP_TUNNEL, flags);

	if (!res)

		return NULL;



	dst = &res->u.tun_info;

	src = &md->u.tun_info;

	dst->key.tun_id = src->key.tun_id;

	if (src->mode & IP_TUNNEL_INFO_IPV6)

		memcpy(&dst->key.u.ipv6.dst, &src->key.u.ipv6.src,
@@ -143,6 +142,8 @@ struct metadata_dst *iptunnel_metadata_reply(struct metadata_dst *md, 
		dst->key.u.ipv4.dst = src->key.u.ipv4.src;

	dst->key.tun_flags = src->key.tun_flags;

	dst->mode = src->mode | IP_TUNNEL_INFO_TX;

	ip_tunnel_info_opts_set(dst, ip_tunnel_info_opts(src),

				src->options_len, 0);



	return res;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE