On Thu, Dec 3, 2015 at 2:41 AM, Jiri Benc <jb...@redhat.com> wrote:
> 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 <jb...@redhat.com>
> ---
> v2: fixed unused variable warning when building without IPv6
> ---
> drivers/net/vxlan.c | 26 ++++++++++++++++++++++++--
> 1 file changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> index 5a38558da157..d3594de3ad07 100644
> --- a/drivers/net/vxlan.c
> +++ b/drivers/net/vxlan.c
> @@ -2413,15 +2413,37 @@ 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);
> +#if IS_ENABLED(CONFIG_IPV6)
> + struct dst_entry *ndst;
> +#endif
> __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)
> + if (ip_tunnel_info_af(info) == AF_INET) {
> + if (!vxlan->vn4_sock)
> + return -EINVAL;
> return egress_ipv4_tun_info(dev, skb, info, sport, dport);
> - return -EINVAL;
> + } 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.u.ipv6.dst,
> + &info->key.u.ipv6.src);
> + if (IS_ERR(ndst))
> + return PTR_ERR(ndst);
> + dst_release(ndst);
> +#endif
Rather than checking IS_ENABLED(CONFIG_IPV6) three separate times, all
code can is restructured in one #if #else block by moving the ndst
definition to IPv6 local block.
> + 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
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
