ipv6: allow userspace to add IFA_F_OPTIMISTIC addresses
According to RFC 4429 (section 3.1), adding new IPv6 addresses as optimistic addresses is acceptable, as long as the implementation follows some rules: * Optimistic DAD SHOULD only be used when the implementation is aware that the address is based on a most likely unique interface identifier (such as in [RFC2464]), generated randomly [RFC3041], or by a well-distributed hash function [RFC3972] or assigned by Dynamic Host Configuration Protocol for IPv6 (DHCPv6) [RFC3315]. Optimistic DAD SHOULD NOT be used for manually entered addresses. Thus, it seems reasonable to allow userspace to set the optimistic flag when adding new addresses. We must not let userspace set NODAD + OPTIMISTIC, since if the kernel is not performing DAD we would never clear the optimistic flag. We must also ignore userspace's request to add OPTIMISTIC flag to addresses that have already completed DAD (addresses that don't have the TENTATIVE flag, or that have the DADFAILED flag). Then we also need to clear the OPTIMISTIC flag on permanent addresses when DAD fails. Otherwise, IFA_F_OPTIMISTIC addresses added by userspace can still be used after DAD has failed, because in ipv6_chk_addr_and_flags(), IFA_F_OPTIMISTIC overrides IFA_F_TENTATIVE. Setting IFA_F_OPTIMISTIC from userspace is conditional on CONFIG_IPV6_OPTIMISTIC_DAD and the optimistic_dad sysctl. Signed-off-by: Sabrina Dubroca <sd@queasysnail.net> Reviewed-by: Stefano Brivio <sbrivio@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
3a053b1a30
Коммит
f1c02cfb7b
|
@ -1459,6 +1459,21 @@ static bool ipv6_use_optimistic_addr(struct net *net,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool ipv6_allow_optimistic_dad(struct net *net,
|
||||||
|
struct inet6_dev *idev)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
|
||||||
|
if (!idev)
|
||||||
|
return false;
|
||||||
|
if (!net->ipv6.devconf_all->optimistic_dad && !idev->cnf.optimistic_dad)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
static int ipv6_get_saddr_eval(struct net *net,
|
static int ipv6_get_saddr_eval(struct net *net,
|
||||||
struct ipv6_saddr_score *score,
|
struct ipv6_saddr_score *score,
|
||||||
struct ipv6_saddr_dst *dst,
|
struct ipv6_saddr_dst *dst,
|
||||||
|
@ -1968,6 +1983,8 @@ static void addrconf_dad_stop(struct inet6_ifaddr *ifp, int dad_failed)
|
||||||
spin_lock_bh(&ifp->lock);
|
spin_lock_bh(&ifp->lock);
|
||||||
addrconf_del_dad_work(ifp);
|
addrconf_del_dad_work(ifp);
|
||||||
ifp->flags |= IFA_F_TENTATIVE;
|
ifp->flags |= IFA_F_TENTATIVE;
|
||||||
|
if (dad_failed)
|
||||||
|
ifp->flags &= ~IFA_F_OPTIMISTIC;
|
||||||
spin_unlock_bh(&ifp->lock);
|
spin_unlock_bh(&ifp->lock);
|
||||||
if (dad_failed)
|
if (dad_failed)
|
||||||
ipv6_ifa_notify(0, ifp);
|
ipv6_ifa_notify(0, ifp);
|
||||||
|
@ -4501,6 +4518,9 @@ static int inet6_addr_modify(struct inet6_ifaddr *ifp, u32 ifa_flags,
|
||||||
(ifp->flags & IFA_F_TEMPORARY || ifp->prefix_len != 64))
|
(ifp->flags & IFA_F_TEMPORARY || ifp->prefix_len != 64))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (!(ifp->flags & IFA_F_TENTATIVE) || ifp->flags & IFA_F_DADFAILED)
|
||||||
|
ifa_flags &= ~IFA_F_OPTIMISTIC;
|
||||||
|
|
||||||
timeout = addrconf_timeout_fixup(valid_lft, HZ);
|
timeout = addrconf_timeout_fixup(valid_lft, HZ);
|
||||||
if (addrconf_finite_timeout(timeout)) {
|
if (addrconf_finite_timeout(timeout)) {
|
||||||
expires = jiffies_to_clock_t(timeout * HZ);
|
expires = jiffies_to_clock_t(timeout * HZ);
|
||||||
|
@ -4574,6 +4594,7 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||||
struct in6_addr *pfx, *peer_pfx;
|
struct in6_addr *pfx, *peer_pfx;
|
||||||
struct inet6_ifaddr *ifa;
|
struct inet6_ifaddr *ifa;
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
|
struct inet6_dev *idev;
|
||||||
u32 valid_lft = INFINITY_LIFE_TIME, preferred_lft = INFINITY_LIFE_TIME;
|
u32 valid_lft = INFINITY_LIFE_TIME, preferred_lft = INFINITY_LIFE_TIME;
|
||||||
u32 ifa_flags;
|
u32 ifa_flags;
|
||||||
int err;
|
int err;
|
||||||
|
@ -4607,7 +4628,19 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||||
|
|
||||||
/* We ignore other flags so far. */
|
/* We ignore other flags so far. */
|
||||||
ifa_flags &= IFA_F_NODAD | IFA_F_HOMEADDRESS | IFA_F_MANAGETEMPADDR |
|
ifa_flags &= IFA_F_NODAD | IFA_F_HOMEADDRESS | IFA_F_MANAGETEMPADDR |
|
||||||
IFA_F_NOPREFIXROUTE | IFA_F_MCAUTOJOIN;
|
IFA_F_NOPREFIXROUTE | IFA_F_MCAUTOJOIN | IFA_F_OPTIMISTIC;
|
||||||
|
|
||||||
|
idev = ipv6_find_idev(dev);
|
||||||
|
if (IS_ERR(idev))
|
||||||
|
return PTR_ERR(idev);
|
||||||
|
|
||||||
|
if (!ipv6_allow_optimistic_dad(net, idev))
|
||||||
|
ifa_flags &= ~IFA_F_OPTIMISTIC;
|
||||||
|
|
||||||
|
if (ifa_flags & IFA_F_NODAD && ifa_flags & IFA_F_OPTIMISTIC) {
|
||||||
|
NL_SET_ERR_MSG(extack, "IFA_F_NODAD and IFA_F_OPTIMISTIC are mutually exclusive");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
ifa = ipv6_get_ifaddr(net, pfx, dev, 1);
|
ifa = ipv6_get_ifaddr(net, pfx, dev, 1);
|
||||||
if (!ifa) {
|
if (!ifa) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче