Commit dac91170 authored Sep 25, 2019 by David Ahern Committed by David S. Miller Sep 27, 2019

vrf: Do not attempt to create IPv6 mcast rule if IPv6 is disabled

A user reported that vrf create fails when IPv6 is disabled at boot using
'ipv6.disable=1':
   https://bugzilla.kernel.org/show_bug.cgi?id=204903



The failure is adding fib rules at create time. Add RTNL_FAMILY_IP6MR to
the check in vrf_fib_rule if ipv6_mod_enabled is disabled.

Fixes: e4a38c0c ("ipv6: add vrf table handling code for ipv6 mcast")
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Patrick Ruddy <pruddy@vyatta.att-mail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3c30819d

drivers/net/vrf.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1154,7 +1154,8 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it)
		struct sk_buff *skb;
		int err;

		if (family == AF_INET6 && !ipv6_mod_enabled())
		if ((family == AF_INET6 \|\| family == RTNL_FAMILY_IP6MR) &&
		!ipv6_mod_enabled())
		return 0;

		skb = nlmsg_new(vrf_fib_rule_nl_size(), GFP_KERNEL);

Admin message