Commit c9e78efb authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

vxlan: move vxlan device lookup before iptunnel_pull_header 



This is in preparation for iptunnel_pull_header calling skb_scrub_packet.

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fc47545

drivers/net/vxlan.c

+11 −12
Original line number Diff line number Diff line
@@ -1187,22 +1187,16 @@ static void vxlan_parse_gbp_hdr(struct vxlanhdr *unparsed, 
	unparsed->vx_flags &= ~VXLAN_GBP_USED_BITS;

}



static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb,

		      struct vxlan_metadata *md, __be32 vni,

static void vxlan_rcv(struct vxlan_dev *vxlan, struct vxlan_sock *vs,

		      struct sk_buff *skb, struct vxlan_metadata *md,

		      struct metadata_dst *tun_dst)

{

	struct iphdr *oip = NULL;

	struct ipv6hdr *oip6 = NULL;

	struct vxlan_dev *vxlan;

	struct pcpu_sw_netstats *stats;

	union vxlan_addr saddr;

	int err = 0;



	/* Is this VNI defined? */

	vxlan = vxlan_vs_find_vni(vs, vni);

	if (!vxlan)

		goto drop;



	skb_reset_mac_header(skb);

	skb_scrub_packet(skb, !net_eq(vxlan->net, dev_net(vxlan->dev)));

	skb->protocol = eth_type_trans(skb, vxlan->dev);
@@ -1281,6 +1275,7 @@ static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb, 
static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)

{

	struct metadata_dst *tun_dst = NULL;

	struct vxlan_dev *vxlan;

	struct vxlan_sock *vs;

	struct vxlanhdr unparsed;

	struct vxlan_metadata _md;
@@ -1302,13 +1297,17 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 
	unparsed.vx_flags &= ~VXLAN_HF_VNI;

	unparsed.vx_vni &= ~VXLAN_VNI_MASK;



	if (iptunnel_pull_header(skb, VXLAN_HLEN, htons(ETH_P_TEB)))

		goto drop;



	vs = rcu_dereference_sk_user_data(sk);

	if (!vs)

		goto drop;



	vxlan = vxlan_vs_find_vni(vs, vxlan_vni(vxlan_hdr(skb)->vx_vni));

	if (!vxlan)

		goto drop;



	if (iptunnel_pull_header(skb, VXLAN_HLEN, htons(ETH_P_TEB)))

		goto drop;



	if (vxlan_collect_metadata(vs)) {

		__be32 vni = vxlan_vni(vxlan_hdr(skb)->vx_vni);
@@ -1344,7 +1343,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 
		goto drop;

	}



	vxlan_rcv(vs, skb, md, vxlan_vni(vxlan_hdr(skb)->vx_vni), tun_dst);

	vxlan_rcv(vxlan, vs, skb, md, tun_dst);

	return 0;



drop: