3 files changed, 29 insertions, 0 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1d5ad053ccf7..811632d4d8b1 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3634,6 +3634,8 @@ int dev_set_mtu_ext(struct net_device *dev, int mtu,
 int dev_set_mtu(struct net_device *, int);
 int dev_change_tx_queue_len(struct net_device *, unsigned long);
 void dev_set_group(struct net_device *, int);
+int dev_pre_changeaddr_notify(struct net_device *dev, const char *addr,
+                              struct netlink_ext_ack *extack);
 int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa,
                         struct netlink_ext_ack *extack);
 int dev_change_carrier(struct net_device *, bool new_carrier);
diff --git a/net/core/dev.c b/net/core/dev.c
index 01497b7d1bdf..ed9aa4a91f1f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7757,6 +7757,27 @@ void dev_set_group(struct net_device *dev, int new_group)
 EXPORT_SYMBOL(dev_set_group);
 
 /**
+ *      dev_pre_changeaddr_notify - Call NETDEV_PRE_CHANGEADDR.
+ *      @dev: device
+ *      @addr: new address
+ *      @extack: netlink extended ack
+ */
+int dev_pre_changeaddr_notify(struct net_device *dev, const char *addr,
+                              struct netlink_ext_ack *extack)
+{
+        struct netdev_notifier_pre_changeaddr_info info = {
+                .info.dev = dev,
+                .info.extack = extack,
+                .dev_addr = addr,
+        };
+        int rc;
+
+        rc = call_netdevice_notifiers_info(NETDEV_PRE_CHANGEADDR, &info.info);
+        return notifier_to_errno(rc);
+}
+EXPORT_SYMBOL(dev_pre_changeaddr_notify);
+
+/**
  *      dev_set_mac_address - Change Media Access Control Address
  *      @dev: device
  *      @sa: new address
@@ -7776,6 +7797,9 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa,
                 return -EINVAL;
         if (!netif_device_present(dev))
                 return -ENODEV;
+        err = dev_pre_changeaddr_notify(dev, sa->sa_data, extack);
+        if (err)
+                return err;
         err = ops->ndo_set_mac_address(dev, sa);
         if (err)
                 return err;
diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
index 81a8cd4ea3bd..a6723b306717 100644
--- a/net/core/dev_addr_lists.c
+++ b/net/core/dev_addr_lists.c
@@ -498,6 +498,9 @@ int dev_addr_add(struct net_device *dev, const unsigned char *addr,
 
         ASSERT_RTNL();
 
+        err = dev_pre_changeaddr_notify(dev, addr, NULL);
+        if (err)
+                return err;
         err = __hw_addr_add(&dev->dev_addrs, addr, dev->addr_len, addr_type);
         if (!err)
                 call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);