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

Commit 53fb996f authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Greg Kroah-Hartman
Browse files

ipv6: take care of disable_policy when restoring routes 



commit 3b0dc529f56b5f2328244130683210be98f16f7f upstream.

When routes corresponding to addresses are restored by
fixup_permanent_addr(), the dst_nopolicy parameter was not set.
The typical use case is a user that configures an address on a down
interface and then put this interface up.

Let's take care of this flag in addrconf_f6i_alloc(), so that every callers
benefit ont it.

CC: stable@kernel.org
CC: David Forster <dforster@brocade.com>
Fixes: df789fe7 ("ipv6: Provide ipv6 version of "disable_policy" sysctl")
Reported-by: default avatarSiwar Zitouni <siwar.zitouni@6wind.com>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20220623120015.32640-1-nicolas.dichtel@6wind.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 871cbc20

net/ipv6/addrconf.c

+0 −4
Original line number Diff line number Diff line
@@ -1102,10 +1102,6 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg, 
		goto out;

	}



	if (net->ipv6.devconf_all->disable_policy ||

	    idev->cnf.disable_policy)

		f6i->dst_nopolicy = true;



	neigh_parms_data_state_setall(idev->nd_parms);



	ifa->addr = *cfg->pfx;

net/ipv6/route.c

+8 −1
Original line number Diff line number Diff line
@@ -4483,8 +4483,15 @@ struct fib6_info *addrconf_f6i_alloc(struct net *net, 
	}



	f6i = ip6_route_info_create(&cfg, gfp_flags, NULL);

	if (!IS_ERR(f6i))

	if (!IS_ERR(f6i)) {

		f6i->dst_nocount = true;



		if (!anycast &&

		    (net->ipv6.devconf_all->disable_policy ||

		     idev->cnf.disable_policy))

			f6i->dst_nopolicy = true;

	}



	return f6i;

}