Commit 2ae2904b authored by Fabian Frederick's avatar Fabian Frederick Committed by David S. Miller
Browse files

vxlan: don't collect metadata if remote checksum is wrong 



call vxlan_remcsum() before md filling in vxlan_rcv()

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74705582

drivers/net/vxlan.c

+4 −3
Original line number Diff line number Diff line
@@ -1875,6 +1875,10 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) 
				   !net_eq(vxlan->net, dev_net(vxlan->dev))))

		goto drop;



	if (vs->flags & VXLAN_F_REMCSUM_RX)

		if (!vxlan_remcsum(&unparsed, skb, vs->flags))

			goto drop;



	if (vxlan_collect_metadata(vs)) {

		struct metadata_dst *tun_dst;
@@ -1891,9 +1895,6 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) 
		memset(md, 0, sizeof(*md));

	}



	if (vs->flags & VXLAN_F_REMCSUM_RX)

		if (!vxlan_remcsum(&unparsed, skb, vs->flags))

			goto drop;

	if (vs->flags & VXLAN_F_GBP)

		vxlan_parse_gbp_hdr(&unparsed, skb, vs->flags, md);

	/* Note that GBP and GPE can never be active together. This is