diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-12-06 23:34:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:29 -0500 |
| commit | 8210fd2a9fe4b36e99ab777a1a81eb47b703c235 (patch) | |
| tree | e39b0dd28492a6255928557504284fe6e99eead6 | |
| parent | e46962fdd28f8b30b465e507b657627aa4c1a409 (diff) | |
[PATCH] uml: use get_random_bytes() after random pool is seeded
When the UML network driver generates random MACs for its devices, it was
possible for a number of UMLs to get the same MACs because the ethernet
initialization was done before the random pool was properly seeded.
This patch moves the initialization later so that it gets better randomness.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/um/drivers/daemon_kern.c | 2 | ||||
| -rw-r--r-- | arch/um/drivers/mcast_kern.c | 2 | ||||
| -rw-r--r-- | arch/um/drivers/pcap_kern.c | 2 | ||||
| -rw-r--r-- | arch/um/drivers/slip_kern.c | 2 | ||||
| -rw-r--r-- | arch/um/drivers/slirp_kern.c | 2 | ||||
| -rw-r--r-- | arch/um/os-Linux/drivers/ethertap_kern.c | 2 | ||||
| -rw-r--r-- | arch/um/os-Linux/drivers/tuntap_kern.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c index 824386974f88..9c2e7a758f21 100644 --- a/arch/um/drivers/daemon_kern.c +++ b/arch/um/drivers/daemon_kern.c | |||
| @@ -98,4 +98,4 @@ static int register_daemon(void) | |||
| 98 | return 0; | 98 | return 0; |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | __initcall(register_daemon); | 101 | late_initcall(register_daemon); |
diff --git a/arch/um/drivers/mcast_kern.c b/arch/um/drivers/mcast_kern.c index c090fbd464e7..52ccb7b53cd2 100644 --- a/arch/um/drivers/mcast_kern.c +++ b/arch/um/drivers/mcast_kern.c | |||
| @@ -127,4 +127,4 @@ static int register_mcast(void) | |||
| 127 | return 0; | 127 | return 0; |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | __initcall(register_mcast); | 130 | late_initcall(register_mcast); |
diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c index 6e1ef8558283..e67362acf0e7 100644 --- a/arch/um/drivers/pcap_kern.c +++ b/arch/um/drivers/pcap_kern.c | |||
| @@ -109,4 +109,4 @@ static int register_pcap(void) | |||
| 109 | return 0; | 109 | return 0; |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | __initcall(register_pcap); | 112 | late_initcall(register_pcap); |
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c index 788da5439a2d..25634bd1f585 100644 --- a/arch/um/drivers/slip_kern.c +++ b/arch/um/drivers/slip_kern.c | |||
| @@ -95,4 +95,4 @@ static int register_slip(void) | |||
| 95 | return 0; | 95 | return 0; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | __initcall(register_slip); | 98 | late_initcall(register_slip); |
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c index ae322e1c8a87..b3ed8fb874ab 100644 --- a/arch/um/drivers/slirp_kern.c +++ b/arch/um/drivers/slirp_kern.c | |||
| @@ -119,4 +119,4 @@ static int register_slirp(void) | |||
| 119 | return 0; | 119 | return 0; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | __initcall(register_slirp); | 122 | late_initcall(register_slirp); |
diff --git a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c index 16385e2ada85..70541821775f 100644 --- a/arch/um/os-Linux/drivers/ethertap_kern.c +++ b/arch/um/os-Linux/drivers/ethertap_kern.c | |||
| @@ -105,4 +105,4 @@ static int register_ethertap(void) | |||
| 105 | return 0; | 105 | return 0; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | __initcall(register_ethertap); | 108 | late_initcall(register_ethertap); |
diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c index 0edbac63c527..76570a2c25c3 100644 --- a/arch/um/os-Linux/drivers/tuntap_kern.c +++ b/arch/um/os-Linux/drivers/tuntap_kern.c | |||
| @@ -90,4 +90,4 @@ static int register_tuntap(void) | |||
| 90 | return 0; | 90 | return 0; |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | __initcall(register_tuntap); | 93 | late_initcall(register_tuntap); |