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

3.0-stable patches

added patches:
	usb-feed-usb-device-information-to-the-dev-random-driver.patch
---

diff --git a/queue-3.0/series b/queue-3.0/series
index 0942c6c5161..472a10a12d1 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -20,3 +20,4 @@ drivers-char-random.c-fix-boot-id-uniqueness-race.patch
 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
diff --git a/queue-3.0/usb-feed-usb-device-information-to-the-dev-random-driver.patch b/queue-3.0/usb-feed-usb-device-information-to-the-dev-random-driver.patch
new file mode 100644
index 00000000000..ce7e6ea03cc
--- /dev/null
+++ b/queue-3.0/usb-feed-usb-device-information-to-the-dev-random-driver.patch
@@ -0,0 +1,46 @@
+From b04b3156a20d395a7faa8eed98698d1e17a36000 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Wed, 4 Jul 2012 11:22:20 -0400
+Subject: usb: feed USB device information to the /dev/random driver
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+commit b04b3156a20d395a7faa8eed98698d1e17a36000 upstream.
+
+Send the USB device's serial, product, and manufacturer strings to the
+/dev/random driver to help seed its pools.
+
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Acked-by: Greg KH <greg@kroah.com>
+Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/core/hub.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -24,6 +24,7 @@
+ #include <linux/kthread.h>
+ #include <linux/mutex.h>
+ #include <linux/freezer.h>
++#include <linux/random.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/byteorder.h>
+@@ -1902,6 +1903,14 @@ int usb_new_device(struct usb_device *ud
+ 	/* Tell the world! */
+ 	announce_device(udev);
+ 
++	if (udev->serial)
++		add_device_randomness(udev->serial, strlen(udev->serial));
++	if (udev->product)
++		add_device_randomness(udev->product, strlen(udev->product));
++	if (udev->manufacturer)
++		add_device_randomness(udev->manufacturer,
++				      strlen(udev->manufacturer));
++
+ 	device_enable_async_suspend(&udev->dev);
+ 	/* Register the device.  The device driver is responsible
+ 	 * for configuring the device and invoking the add-device