From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Benc Subject: [PATCH net-next 3/3] vxlan: support ndo_fill_metadata_dst also for IPv6 Date: Wed, 2 Dec 2015 19:12:10 +0100 Message-ID: <3ad28a22a4f5acde5cff3cdb4b6853db249e543d.1449079592.git.jbenc@redhat.com> References: Cc: Jesse Gross , Pravin B Shelar To: netdev@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:33416 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758518AbbLBSMj (ORCPT ); Wed, 2 Dec 2015 13:12:39 -0500 In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: Fill the metadata correctly even when tunneling over IPv6. Also, check that the provided metadata is of an address family that is supported by the tunnel. Signed-off-by: Jiri Benc --- drivers/net/vxlan.c | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 2945cf7f9c73..d2edc35cfdaf 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2401,37 +2401,45 @@ static int vxlan_change_mtu(struct net_device *dev, int new_mtu) return 0; } -static int egress_ipv4_tun_info(struct net_device *dev, struct sk_buff *skb, - struct ip_tunnel_info *info, - __be16 sport, __be16 dport) -{ - struct vxlan_dev *vxlan = netdev_priv(dev); - struct rtable *rt; - - rt = vxlan_get_route(vxlan, skb, 0, info->key.tos, - info->key.u.ipv4.dst, &info->key.u.ipv4.src); - if (IS_ERR(rt)) - return PTR_ERR(rt); - ip_rt_put(rt); - - info->key.tp_src = sport; - info->key.tp_dst = dport; - return 0; -} - static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) { struct vxlan_dev *vxlan = netdev_priv(dev); struct ip_tunnel_info *info = skb_tunnel_info(skb); + struct dst_entry *ndst; + struct rtable *rt; __be16 sport, dport; sport = udp_flow_src_port(dev_net(dev), skb, vxlan->cfg.port_min, vxlan->cfg.port_max, true); dport = info->key.tp_dst ? : vxlan->cfg.dst_port; - if (ip_tunnel_info_af(info) == AF_INET) - return egress_ipv4_tun_info(dev, skb, info, sport, dport); - return -EINVAL; + if (ip_tunnel_info_af(info) == AF_INET) { + if (!vxlan->vn4_sock) + return -EINVAL; + rt = vxlan_get_route(vxlan, skb, 0, info->key.tos, + info->key.u.ipv4.dst, + &info->key.u.ipv4.src); + if (IS_ERR(rt)) + return PTR_ERR(rt); + ip_rt_put(rt); + } else { + if (!IS_ENABLED(CONFIG_IPV6)) + return -EPFNOSUPPORT; + +#if IS_ENABLED(CONFIG_IPV6) + if (!vxlan->vn6_sock) + return -EINVAL; + ndst = vxlan6_get_route(vxlan, skb, 0, info->key.tos, + &info->key.u.ipv6.dst, + &info->key.u.ipv6.src); + if (IS_ERR(ndst)) + return PTR_ERR(ndst); + dst_release(ndst); +#endif + } + info->key.tp_src = sport; + info->key.tp_dst = dport; + return 0; } static const struct net_device_ops vxlan_netdev_ops = { -- 1.8.3.1