diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2012-07-04 11:22:20 -0400 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:41:20 +0200 |
| commit | d86264c4f3d78c65be21fde93ad0d8f5cf61eee6 (patch) | |
| tree | 9924ce53f7decd28a43ec6a8e0d3c2b865a37ab0 | |
| parent | f2652a50ab5bd7a65c9c4156648cd75b2ed7e53d (diff) | |
usb: feed USB device information to the /dev/random driver
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: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | drivers/usb/core/hub.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 069de191ece9..02aad5091243 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -23,6 +23,7 @@ #include <linux/mutex.h> #include <linux/freezer.h> #include <linux/usb/quirks.h> +#include <linux/random.h> #include <asm/uaccess.h> #include <asm/byteorder.h> @@ -1831,6 +1832,14 @@ int usb_new_device(struct usb_device *udev) /* 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)); + /* Register the device. The device driver is responsible * for configuring the device and invoking the add-device * notifier chain (used by usbfs and possibly others). |