Skip to content

Commit 1cd4bc9

Browse files
borkmanndavem330
authored andcommitted
vxlan: Fix regression when dropping packets due to invalid src addresses
Commit f58f45c ("vxlan: drop packets from invalid src-address") has recently been added to vxlan mainly in the context of source address snooping/learning so that when it is enabled, an entry in the FDB is not being created for an invalid address for the corresponding tunnel endpoint. Before commit f58f45c vxlan was similarly behaving as geneve in that it passed through whichever macs were set in the L2 header. It turns out that this change in behavior breaks setups, for example, Cilium with netkit in L3 mode for Pods as well as tunnel mode has been passing before the change in f58f45c for both vxlan and geneve. After mentioned change it is only passing for geneve as in case of vxlan packets are dropped due to vxlan_set_mac() returning false as source and destination macs are zero which for E/W traffic via tunnel is totally fine. Fix it by only opting into the is_valid_ether_addr() check in vxlan_set_mac() when in fact source address snooping/learning is actually enabled in vxlan. This is done by moving the check into vxlan_snoop(). With this change, the Cilium connectivity test suite passes again for both tunnel flavors. Fixes: f58f45c ("vxlan: drop packets from invalid src-address") Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Cc: David Bauer <mail@david-bauer.net> Cc: Ido Schimmel <idosch@nvidia.com> Cc: Nikolay Aleksandrov <razor@blackwall.org> Cc: Martin KaFai Lau <martin.lau@kernel.org> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org> Reviewed-by: David Bauer <mail@david-bauer.net> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent affc18f commit 1cd4bc9

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/net/vxlan/vxlan_core.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,6 +1446,10 @@ static bool vxlan_snoop(struct net_device *dev,
14461446
struct vxlan_fdb *f;
14471447
u32 ifindex = 0;
14481448

1449+
/* Ignore packets from invalid src-address */
1450+
if (!is_valid_ether_addr(src_mac))
1451+
return true;
1452+
14491453
#if IS_ENABLED(CONFIG_IPV6)
14501454
if (src_ip->sa.sa_family == AF_INET6 &&
14511455
(ipv6_addr_type(&src_ip->sin6.sin6_addr) & IPV6_ADDR_LINKLOCAL))
@@ -1616,10 +1620,6 @@ static bool vxlan_set_mac(struct vxlan_dev *vxlan,
16161620
if (ether_addr_equal(eth_hdr(skb)->h_source, vxlan->dev->dev_addr))
16171621
return false;
16181622

1619-
/* Ignore packets from invalid src-address */
1620-
if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
1621-
return false;
1622-
16231623
/* Get address from the outer IP header */
16241624
if (vxlan_get_sk_family(vs) == AF_INET) {
16251625
saddr.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;

0 commit comments

Comments
 (0)