diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2012-07-04 21:23:25 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-17 15:36:09 -0400 |
| commit | e0e0a1bbba898b34a416c5e646fc374a5f55b3ab (patch) | |
| tree | 85d85033a51e3525a0ff68834fb7aa193a3adc82 | |
| parent | ec0b0f6434c99db2c51cbdfcfc62b1daeca47b96 (diff) | |
| download | lwn-e0e0a1bbba898b34a416c5e646fc374a5f55b3ab.tar.gz lwn-e0e0a1bbba898b34a416c5e646fc374a5f55b3ab.zip | |
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>
| -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 bcd5f6edbad8..7daff00c9e2f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1177,6 +1177,7 @@ static int __dev_open(struct net_device *dev) * Wakeup transmit queue engine */ dev_activate(dev); + add_device_randomness(dev->dev_addr, dev->addr_len); } return ret; @@ -4492,6 +4493,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); @@ -5141,6 +5143,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 31e85d327aa2..835f38c95847 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -974,6 +974,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]) { |