diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2012-07-04 21:23:25 -0400 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:41:20 +0200 |
| commit | 4bc4a0f1e034193d7c78783271053d9b00e120e1 (patch) | |
| tree | d073fc7d301610d7353c5da772db7f323614e9ff | |
| parent | d86264c4f3d78c65be21fde93ad0d8f5cf61eee6 (diff) | |
net: feed /dev/random with the MAC address when registering a device
commit 7bf2357524408b97fec58344caf7397f8140c3fd upstream.
Cc: David Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | net/core/dev.c | 3 | ||||
| -rw-r--r-- | net/core/rtnetlink.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 84a0705920b6..46e2a29b5df3 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1133,6 +1133,7 @@ int dev_open(struct net_device *dev) /* * ... and announce new interface. */ + add_device_randomness(dev->dev_addr, dev->addr_len); call_netdevice_notifiers(NETDEV_UP, dev); } @@ -4268,6 +4269,7 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa) err = ops->ndo_set_mac_address(dev, sa); if (!err) call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); + add_device_randomness(dev->dev_addr, dev->addr_len); return err; } EXPORT_SYMBOL(dev_set_mac_address); @@ -4871,6 +4873,7 @@ int register_netdevice(struct net_device *dev) dev_init_scheduler(dev); dev_hold(dev); list_netdevice(dev); + add_device_randomness(dev->dev_addr, dev->addr_len); /* Notify protocols, that a new device appeared. */ ret = call_netdevice_notifiers(NETDEV_REGISTER, dev); diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index d4fd895e8712..9d700421df0e 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -817,6 +817,7 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm, goto errout; send_addr_notify = 1; modified = 1; + add_device_randomness(dev->dev_addr, dev->addr_len); } if (tb[IFLA_MTU]) { |