1 files changed, 16 insertions, 1 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 25443fd946a8..0aa36b093013 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -963,6 +963,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
         struct net *net = dev_net(idev->dev);
         struct inet6_ifaddr *ifa = NULL;
         struct rt6_info *rt;
+        struct in6_validator_info i6vi;
         unsigned int hash;
         int err = 0;
         int addr_type = ipv6_addr_type(addr);
@@ -974,6 +975,9 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
                 return ERR_PTR(-EADDRNOTAVAIL);
 
         rcu_read_lock_bh();
+
+        in6_dev_hold(idev);
+
         if (idev->dead) {
                 err = -ENODEV;                  /*XXX*/
                 goto out2;
@@ -984,6 +988,17 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
                 goto out2;
         }
 
+        i6vi.i6vi_addr = *addr;
+        i6vi.i6vi_dev = idev;
+        rcu_read_unlock_bh();
+
+        err = inet6addr_validator_notifier_call_chain(NETDEV_UP, &i6vi);
+
+        rcu_read_lock_bh();
+        err = notifier_to_errno(err);
+        if (err)
+                goto out2;
+
         spin_lock(&addrconf_hash_lock);
 
         /* Ignore adding duplicate addresses on an interface */
@@ -1034,7 +1049,6 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
         ifa->rt = rt;
 
         ifa->idev = idev;
-        in6_dev_hold(idev);
         /* For caller */
         in6_ifa_hold(ifa);
 
@@ -1062,6 +1076,7 @@ out2:
                 inet6addr_notifier_call_chain(NETDEV_UP, ifa);
         else {
                 kfree(ifa);
+                in6_dev_put(idev);
                 ifa = ERR_PTR(err);
         }