Commit cf1c9ccb authored Feb 28, 2019 by Jiri Benc Committed by David S. Miller Mar 01, 2019

geneve: correctly handle ipv6.disable module parameter



When IPv6 is compiled but disabled at runtime, geneve_sock_add returns
-EAFNOSUPPORT. For metadata based tunnels, this causes failure of the whole
operation of bringing up the tunnel.

Ignore failure of IPv6 socket creation for metadata based tunnels caused by
IPv6 not being available.

This is the same fix as what commit d074bf96 ("vxlan: correctly handle
ipv6.disable module parameter") is doing for vxlan.

Note there's also commit c0a47e44 ("geneve: should not call rt6_lookup()
when ipv6 was disabled") which fixes a similar issue but for regular
tunnels, while this patch is needed for metadata based tunnels.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f08d6114

drivers/net/geneve.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -692,15 +692,20 @@ out:
		static int geneve_open(struct net_device *dev)
		{
		struct geneve_dev *geneve = netdev_priv(dev);
		bool ipv6 = !!(geneve->info.mode & IP_TUNNEL_INFO_IPV6);
		bool metadata = geneve->collect_md;
		bool ipv4, ipv6;
		int ret = 0;

		ipv6 = geneve->info.mode & IP_TUNNEL_INFO_IPV6 \|\| metadata;
		ipv4 = !ipv6 \|\| metadata;
		#if IS_ENABLED(CONFIG_IPV6)
		if (ipv6 \|\| metadata)
		if (ipv6) {
		ret = geneve_sock_add(geneve, true);
		if (ret < 0 && ret != -EAFNOSUPPORT)
		ipv4 = false;
		}
		#endif
		if (!ret && (!ipv6 \|\| metadata))
		if (ipv4)
		ret = geneve_sock_add(geneve, false);
		if (ret < 0)
		geneve_sock_release(geneve);

Admin message