From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 9 Aug 2012 20:51:47 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.5.2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59bc25cd9532c155aee43e21dc0b357cbd3f93f1;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	net-feed-dev-random-with-the-mac-address-when-registering-a-device.patch
---

diff --git a/queue-3.4/net-feed-dev-random-with-the-mac-address-when-registering-a-device.patch b/queue-3.4/net-feed-dev-random-with-the-mac-address-when-registering-a-device.patch
new file mode 100644
index 00000000000..33026bf33b2
--- /dev/null
+++ b/queue-3.4/net-feed-dev-random-with-the-mac-address-when-registering-a-device.patch
@@ -0,0 +1,55 @@
+From 7bf2357524408b97fec58344caf7397f8140c3fd Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Wed, 4 Jul 2012 21:23:25 -0400
+Subject: net: feed /dev/random with the MAC address when registering a device
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/core/dev.c       |    3 +++
+ net/core/rtnetlink.c |    1 +
+ 2 files changed, 4 insertions(+)
+
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -1173,6 +1173,7 @@ static int __dev_open(struct net_device
+ 		net_dmaengine_get();
+ 		dev_set_rx_mode(dev);
+ 		dev_activate(dev);
++		add_device_randomness(dev->dev_addr, dev->addr_len);
+ 	}
+ 
+ 	return ret;
+@@ -4765,6 +4766,7 @@ int dev_set_mac_address(struct net_devic
+ 	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);
+@@ -5543,6 +5545,7 @@ int register_netdevice(struct net_device
+ 	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);
+--- a/net/core/rtnetlink.c
++++ b/net/core/rtnetlink.c
+@@ -1376,6 +1376,7 @@ static int do_setlink(struct net_device
+ 			goto errout;
+ 		send_addr_notify = 1;
+ 		modified = 1;
++		add_device_randomness(dev->dev_addr, dev->addr_len);
+ 	}
+ 
+ 	if (tb[IFLA_MTU]) {
diff --git a/queue-3.4/series b/queue-3.4/series
index faeb5ef762d..6cb077341a6 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -31,3 +31,4 @@ random-make-add_interrupt_randomness-do-something-sane.patch
 random-use-lockless-techniques-in-the-interrupt-path.patch
 random-create-add_device_randomness-interface.patch
 usb-feed-usb-device-information-to-the-dev-random-driver.patch
+net-feed-dev-random-with-the-mac-address-when-registering-a-device.patch