| Message ID | 2aa75f6fa62ac9dbe4f16ad5ba75dd04a51d4b99.1718804000.git.gnault@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 31392048f55f98cb01ca709d32d06d926ab9760a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v3] vxlan: Pull inner IP header in vxlan_xmit_one(). | expand |
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 19 Jun 2024 15:34:57 +0200 you wrote: > Ensure the inner IP header is part of the skb's linear data before > setting old_iph. Otherwise, on a non-linear skb, old_iph could point > outside of the packet data. > > Unlike classical VXLAN, which always encapsulates Ethernet packets, > VXLAN-GPE can transport IP packets directly. In that case, we need to > look at skb->protocol to figure out if an Ethernet header is present. > > [...] Here is the summary with links: - [net,v3] vxlan: Pull inner IP header in vxlan_xmit_one(). https://git.kernel.org/netdev/net/c/31392048f55f You are awesome, thank you!
diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index 567cb3faab70..ba59e92ab941 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -2339,7 +2339,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, struct ip_tunnel_key *pkey; struct ip_tunnel_key key; struct vxlan_dev *vxlan = netdev_priv(dev); - const struct iphdr *old_iph = ip_hdr(skb); + const struct iphdr *old_iph; struct vxlan_metadata _md; struct vxlan_metadata *md = &_md; unsigned int pkt_len = skb->len; @@ -2353,8 +2353,15 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, bool use_cache; bool udp_sum = false; bool xnet = !net_eq(vxlan->net, dev_net(vxlan->dev)); + bool no_eth_encap; __be32 vni = 0; + no_eth_encap = flags & VXLAN_F_GPE && skb->protocol != htons(ETH_P_TEB); + if (!skb_vlan_inet_prepare(skb, no_eth_encap)) + goto drop; + + old_iph = ip_hdr(skb); + info = skb_tunnel_info(skb); use_cache = ip_tunnel_dst_cache_usable(skb, info);
Ensure the inner IP header is part of the skb's linear data before setting old_iph. Otherwise, on a non-linear skb, old_iph could point outside of the packet data. Unlike classical VXLAN, which always encapsulates Ethernet packets, VXLAN-GPE can transport IP packets directly. In that case, we need to look at skb->protocol to figure out if an Ethernet header is present. Fixes: d342894c5d2f ("vxlan: virtual extensible lan") Signed-off-by: Guillaume Nault <gnault@redhat.com> --- v2: * Handle the case of VXLAN-GPE carrying Ethernet frames (Paolo) * s/fragmented skb/non-linear skb/ (Eric) v3: * Fix the skb->protocol test. * Rebase on top of latest net tree: use the new skb_vlan_inet_prepare() boolean parameter to avoid pulling the size of an Ethernet header when there is none. drivers/net/vxlan/vxlan_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)