Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64e724f6 authored by Brian Haley's avatar Brian Haley Committed by David S. Miller
Browse files

ipv6: Don't add routes to ipv6 disabled interfaces. 



If the interface has IPv6 disabled, don't add a multicast or
link-local route since we won't be adding a link-local address.

Reported-by: default avatarMahesh Kelkar <maheshkelkar@gmail.com>
Signed-off-by: default avatarBrian Haley <brian.haley@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be2b6e62

net/ipv6/addrconf.c

+9 −5
Original line number Diff line number Diff line
@@ -1760,7 +1760,10 @@ static struct inet6_dev *addrconf_add_dev(struct net_device *dev) 


	idev = ipv6_find_idev(dev);

	if (!idev)

		return NULL;

		return ERR_PTR(-ENOBUFS);



	if (idev->cnf.disable_ipv6)

		return ERR_PTR(-EACCES);



	/* Add default multicast route */

	addrconf_add_mroute(dev);
@@ -2129,8 +2132,9 @@ static int inet6_addr_add(struct net *net, int ifindex, struct in6_addr *pfx, 
	if (!dev)

		return -ENODEV;



	if ((idev = addrconf_add_dev(dev)) == NULL)

		return -ENOBUFS;

	idev = addrconf_add_dev(dev);

	if (IS_ERR(idev))

		return PTR_ERR(idev);



	scope = ipv6_addr_scope(pfx);
@@ -2377,7 +2381,7 @@ static void addrconf_dev_config(struct net_device *dev) 
	}



	idev = addrconf_add_dev(dev);

	if (idev == NULL)

	if (IS_ERR(idev))

		return;



	memset(&addr, 0, sizeof(struct in6_addr));
@@ -2468,7 +2472,7 @@ static void addrconf_ip6_tnl_config(struct net_device *dev) 
	ASSERT_RTNL();



	idev = addrconf_add_dev(dev);

	if (!idev) {

	if (IS_ERR(idev)) {

		printk(KERN_DEBUG "init ip6-ip6: add_dev failed\n");

		return;

	}