Deleted Added
sdiff udiff text old ( 256281 ) new ( 256381 )
full compact
randomdev_soft.c (256281) randomdev_soft.c (256381)
1/*-
2 * Copyright (c) 2000-2013 Mark R V Murray
3 * Copyright (c) 2004 Robert N. M. Watson
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 *
27 */
28
1/*-
2 * Copyright (c) 2000-2013 Mark R V Murray
3 * Copyright (c) 2004 Robert N. M. Watson
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 *
27 */
28
29#if !defined(YARROW_RNG) && !defined(FORTUNA_RNG)
30#define YARROW_RNG
31#elif defined(YARROW_RNG) && defined(FORTUNA_RNG)
32#error "Must define either YARROW_RNG or FORTUNA_RNG"
29#include "opt_random.h"
30
31#if !defined(RANDOM_YARROW) && !defined(RANDOM_FORTUNA)
32#define RANDOM_YARROW
33#elif defined(RANDOM_YARROW) && defined(RANDOM_FORTUNA)
34#error "Must define either RANDOM_YARROW or RANDOM_FORTUNA"
33#endif
35#endif
36#if defined(RANDOM_FORTUNA)
37#error "Fortuna is not yet implemented"
38#endif
34
35#include <sys/cdefs.h>
39
40#include <sys/cdefs.h>
36__FBSDID("$FreeBSD: stable/10/sys/dev/random/randomdev_soft.c 255379 2013-09-07 22:07:36Z markm $");
41__FBSDID("$FreeBSD: stable/10/sys/dev/random/randomdev_soft.c 256381 2013-10-12 15:31:36Z markm $");
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/fcntl.h>
41#include <sys/kernel.h>
42#include <sys/lock.h>
43#include <sys/malloc.h>
44#include <sys/module.h>
45#include <sys/mutex.h>
46#include <sys/poll.h>
47#include <sys/random.h>
48#include <sys/selinfo.h>
49#include <sys/sysctl.h>
50#include <sys/uio.h>
51#include <sys/unistd.h>
52
53#include <machine/bus.h>
54#include <machine/cpu.h>
55
42
43#include <sys/param.h>
44#include <sys/systm.h>
45#include <sys/fcntl.h>
46#include <sys/kernel.h>
47#include <sys/lock.h>
48#include <sys/malloc.h>
49#include <sys/module.h>
50#include <sys/mutex.h>
51#include <sys/poll.h>
52#include <sys/random.h>
53#include <sys/selinfo.h>
54#include <sys/sysctl.h>
55#include <sys/uio.h>
56#include <sys/unistd.h>
57
58#include <machine/bus.h>
59#include <machine/cpu.h>
60
56#include <dev/random/random_adaptors.h>
57#include <dev/random/randomdev.h>
58#include <dev/random/randomdev_soft.h>
61#include <dev/random/randomdev.h>
62#include <dev/random/randomdev_soft.h>
59#if defined(YARROW_RNG)
63#include <dev/random/random_harvestq.h>
64#include <dev/random/random_adaptors.h>
65#if defined(RANDOM_YARROW)
60#include <dev/random/yarrow.h>
61#endif
66#include <dev/random/yarrow.h>
67#endif
62#if defined(FORTUNA_RNG)
68#if defined(RANDOM_FORTUNA)
63#include <dev/random/fortuna.h>
64#endif
65
69#include <dev/random/fortuna.h>
70#endif
71
66#include "random_harvestq.h"
67
68static int randomdev_poll(int event, struct thread *td);
69static int randomdev_block(int flag);
70static void randomdev_flush_reseed(void);
71
72
73static int randomdev_poll(int event, struct thread *td);
74static int randomdev_block(int flag);
75static void randomdev_flush_reseed(void);
76
72#if defined(YARROW_RNG)
77#if defined(RANDOM_YARROW)
73static struct random_adaptor random_context = {
74 .ident = "Software, Yarrow",
75 .init = randomdev_init,
76 .deinit = randomdev_deinit,
77 .block = randomdev_block,
78 .read = random_yarrow_read,
78static struct random_adaptor random_context = {
79 .ident = "Software, Yarrow",
80 .init = randomdev_init,
81 .deinit = randomdev_deinit,
82 .block = randomdev_block,
83 .read = random_yarrow_read,
79 .write = randomdev_write,
80 .poll = randomdev_poll,
81 .reseed = randomdev_flush_reseed,
84 .poll = randomdev_poll,
85 .reseed = randomdev_flush_reseed,
82 .seeded = 1,
86 .seeded = 0, /* This will be seeded during entropy processing */
83};
84#define RANDOM_MODULE_NAME yarrow
85#define RANDOM_CSPRNG_NAME "yarrow"
86#endif
87
87};
88#define RANDOM_MODULE_NAME yarrow
89#define RANDOM_CSPRNG_NAME "yarrow"
90#endif
91
88#if defined(FORTUNA_RNG)
92#if defined(RANDOM_FORTUNA)
89static struct random_adaptor random_context = {
90 .ident = "Software, Fortuna",
91 .init = randomdev_init,
92 .deinit = randomdev_deinit,
93 .block = randomdev_block,
94 .read = random_fortuna_read,
93static struct random_adaptor random_context = {
94 .ident = "Software, Fortuna",
95 .init = randomdev_init,
96 .deinit = randomdev_deinit,
97 .block = randomdev_block,
98 .read = random_fortuna_read,
95 .write = randomdev_write,
96 .poll = randomdev_poll,
97 .reseed = randomdev_flush_reseed,
99 .poll = randomdev_poll,
100 .reseed = randomdev_flush_reseed,
98 .seeded = 1,
101 .seeded = 0, /* This will be excplicitly seeded at startup when secured */
99};
100#define RANDOM_MODULE_NAME fortuna
101#define RANDOM_CSPRNG_NAME "fortuna"
102};
103#define RANDOM_MODULE_NAME fortuna
104#define RANDOM_CSPRNG_NAME "fortuna"
102
103#endif
104
105#endif
106
107TUNABLE_INT("kern.random.sys.seeded", &random_context.seeded);
108
105/* List for the dynamic sysctls */
106static struct sysctl_ctx_list random_clist;
107
108/* ARGSUSED */
109static int
110random_check_boolean(SYSCTL_HANDLER_ARGS)
111{
112 if (oidp->oid_arg1 != NULL && *(u_int *)(oidp->oid_arg1) != 0)
113 *(u_int *)(oidp->oid_arg1) = 1;
109/* List for the dynamic sysctls */
110static struct sysctl_ctx_list random_clist;
111
112/* ARGSUSED */
113static int
114random_check_boolean(SYSCTL_HANDLER_ARGS)
115{
116 if (oidp->oid_arg1 != NULL && *(u_int *)(oidp->oid_arg1) != 0)
117 *(u_int *)(oidp->oid_arg1) = 1;
114 return sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
118 return (sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req));
115}
116
117void
118randomdev_init(void)
119{
120 struct sysctl_oid *random_sys_o, *random_sys_harvest_o;
121
119}
120
121void
122randomdev_init(void)
123{
124 struct sysctl_oid *random_sys_o, *random_sys_harvest_o;
125
122#if defined(YARROW_RNG)
126#if defined(RANDOM_YARROW)
123 random_yarrow_init_alg(&random_clist);
124#endif
127 random_yarrow_init_alg(&random_clist);
128#endif
125#if defined(FORTUNA_RNG)
129#if defined(RANDOM_FORTUNA)
126 random_fortuna_init_alg(&random_clist);
127#endif
128
129 random_sys_o = SYSCTL_ADD_NODE(&random_clist,
130 SYSCTL_STATIC_CHILDREN(_kern_random),
131 OID_AUTO, "sys", CTLFLAG_RW, 0,
132 "Entropy Device Parameters");
133
134 SYSCTL_ADD_PROC(&random_clist,
135 SYSCTL_CHILDREN(random_sys_o),
136 OID_AUTO, "seeded", CTLTYPE_INT | CTLFLAG_RW,
130 random_fortuna_init_alg(&random_clist);
131#endif
132
133 random_sys_o = SYSCTL_ADD_NODE(&random_clist,
134 SYSCTL_STATIC_CHILDREN(_kern_random),
135 OID_AUTO, "sys", CTLFLAG_RW, 0,
136 "Entropy Device Parameters");
137
138 SYSCTL_ADD_PROC(&random_clist,
139 SYSCTL_CHILDREN(random_sys_o),
140 OID_AUTO, "seeded", CTLTYPE_INT | CTLFLAG_RW,
137 &random_context.seeded, 1, random_check_boolean, "I",
141 &random_context.seeded, 0, random_check_boolean, "I",
138 "Seeded State");
139
140 random_sys_harvest_o = SYSCTL_ADD_NODE(&random_clist,
141 SYSCTL_CHILDREN(random_sys_o),
142 OID_AUTO, "harvest", CTLFLAG_RW, 0,
143 "Entropy Sources");
144
145 SYSCTL_ADD_PROC(&random_clist,

--- 4 unchanged lines hidden (view full) ---

150 SYSCTL_ADD_PROC(&random_clist,
151 SYSCTL_CHILDREN(random_sys_harvest_o),
152 OID_AUTO, "point_to_point", CTLTYPE_INT | CTLFLAG_RW,
153 &harvest.point_to_point, 1, random_check_boolean, "I",
154 "Harvest serial net entropy");
155 SYSCTL_ADD_PROC(&random_clist,
156 SYSCTL_CHILDREN(random_sys_harvest_o),
157 OID_AUTO, "interrupt", CTLTYPE_INT | CTLFLAG_RW,
142 "Seeded State");
143
144 random_sys_harvest_o = SYSCTL_ADD_NODE(&random_clist,
145 SYSCTL_CHILDREN(random_sys_o),
146 OID_AUTO, "harvest", CTLFLAG_RW, 0,
147 "Entropy Sources");
148
149 SYSCTL_ADD_PROC(&random_clist,

--- 4 unchanged lines hidden (view full) ---

154 SYSCTL_ADD_PROC(&random_clist,
155 SYSCTL_CHILDREN(random_sys_harvest_o),
156 OID_AUTO, "point_to_point", CTLTYPE_INT | CTLFLAG_RW,
157 &harvest.point_to_point, 1, random_check_boolean, "I",
158 "Harvest serial net entropy");
159 SYSCTL_ADD_PROC(&random_clist,
160 SYSCTL_CHILDREN(random_sys_harvest_o),
161 OID_AUTO, "interrupt", CTLTYPE_INT | CTLFLAG_RW,
158 &harvest.interrupt, 0, random_check_boolean, "I",
162 &harvest.interrupt, 1, random_check_boolean, "I",
159 "Harvest IRQ entropy");
160 SYSCTL_ADD_PROC(&random_clist,
161 SYSCTL_CHILDREN(random_sys_harvest_o),
162 OID_AUTO, "swi", CTLTYPE_INT | CTLFLAG_RW,
163 "Harvest IRQ entropy");
164 SYSCTL_ADD_PROC(&random_clist,
165 SYSCTL_CHILDREN(random_sys_harvest_o),
166 OID_AUTO, "swi", CTLTYPE_INT | CTLFLAG_RW,
163 &harvest.swi, 0, random_check_boolean, "I",
167 &harvest.swi, 1, random_check_boolean, "I",
164 "Harvest SWI entropy");
165
166 random_harvestq_init(random_process_event);
167
168 /* Register the randomness harvesting routine */
169 randomdev_init_harvester(random_harvestq_internal,
170 random_context.read);
171}

--- 5 unchanged lines hidden (view full) ---

177 randomdev_deinit_harvester();
178
179 /*
180 * Command the hash/reseed thread to end and wait for it to finish
181 */
182 random_kthread_control = -1;
183 tsleep((void *)&random_kthread_control, 0, "term", 0);
184
168 "Harvest SWI entropy");
169
170 random_harvestq_init(random_process_event);
171
172 /* Register the randomness harvesting routine */
173 randomdev_init_harvester(random_harvestq_internal,
174 random_context.read);
175}

--- 5 unchanged lines hidden (view full) ---

181 randomdev_deinit_harvester();
182
183 /*
184 * Command the hash/reseed thread to end and wait for it to finish
185 */
186 random_kthread_control = -1;
187 tsleep((void *)&random_kthread_control, 0, "term", 0);
188
185#if defined(YARROW_RNG)
189#if defined(RANDOM_YARROW)
186 random_yarrow_deinit_alg();
187#endif
190 random_yarrow_deinit_alg();
191#endif
188#if defined(FORTUNA_RNG)
192#if defined(RANDOM_FORTUNA)
189 random_fortuna_deinit_alg();
190#endif
191
192 sysctl_ctx_free(&random_clist);
193}
194
195void
193 random_fortuna_deinit_alg();
194#endif
195
196 sysctl_ctx_free(&random_clist);
197}
198
199void
196randomdev_write(void *buf, int count)
197{
198 int i;
199 u_int chunk;
200
201 /*
202 * Break the input up into HARVESTSIZE chunks. The writer has too
203 * much control here, so "estimate" the entropy as zero.
204 */
205 for (i = 0; i < count; i += HARVESTSIZE) {
206 chunk = HARVESTSIZE;
207 if (i + chunk >= count)
208 chunk = (u_int)(count - i);
209 random_harvestq_internal(get_cyclecount(), (char *)buf + i,
210 chunk, 0, 0, RANDOM_WRITE);
211 }
212}
213
214void
215randomdev_unblock(void)
216{
217 if (!random_context.seeded) {
200randomdev_unblock(void)
201{
202 if (!random_context.seeded) {
218 random_context.seeded = 1;
219 selwakeuppri(&random_context.rsel, PUSER);
220 wakeup(&random_context);
203 selwakeuppri(&random_context.rsel, PUSER);
204 wakeup(&random_context);
205 printf("random: unblocking device.\n");
206 random_context.seeded = 1;
221 }
207 }
208 /* Do arc4random(9) a favour while we are about it. */
222 (void)atomic_cmpset_int(&arc4rand_iniseed_state, ARC4_ENTR_NONE,
223 ARC4_ENTR_HAVE);
224}
225
226static int
227randomdev_poll(int events, struct thread *td)
228{
229 int revents = 0;
209 (void)atomic_cmpset_int(&arc4rand_iniseed_state, ARC4_ENTR_NONE,
210 ARC4_ENTR_HAVE);
211}
212
213static int
214randomdev_poll(int events, struct thread *td)
215{
216 int revents = 0;
217
230 mtx_lock(&random_reseed_mtx);
231
232 if (random_context.seeded)
233 revents = events & (POLLIN | POLLRDNORM);
234 else
235 selrecord(td, &random_context.rsel);
236
237 mtx_unlock(&random_reseed_mtx);
218 mtx_lock(&random_reseed_mtx);
219
220 if (random_context.seeded)
221 revents = events & (POLLIN | POLLRDNORM);
222 else
223 selrecord(td, &random_context.rsel);
224
225 mtx_unlock(&random_reseed_mtx);
238 return revents;
226 return (revents);
239}
240
241static int
242randomdev_block(int flag)
243{
244 int error = 0;
245
246 mtx_lock(&random_reseed_mtx);
247
248 /* Blocking logic */
249 while (!random_context.seeded && !error) {
250 if (flag & O_NONBLOCK)
251 error = EWOULDBLOCK;
252 else {
227}
228
229static int
230randomdev_block(int flag)
231{
232 int error = 0;
233
234 mtx_lock(&random_reseed_mtx);
235
236 /* Blocking logic */
237 while (!random_context.seeded && !error) {
238 if (flag & O_NONBLOCK)
239 error = EWOULDBLOCK;
240 else {
253 printf("Entropy device is blocking.\n");
241 printf("random: blocking on read.\n");
254 error = msleep(&random_context,
255 &random_reseed_mtx,
256 PUSER | PCATCH, "block", 0);
257 }
258 }
259 mtx_unlock(&random_reseed_mtx);
260
242 error = msleep(&random_context,
243 &random_reseed_mtx,
244 PUSER | PCATCH, "block", 0);
245 }
246 }
247 mtx_unlock(&random_reseed_mtx);
248
261 return error;
249 return (error);
262}
263
264/* Helper routine to perform explicit reseeds */
265static void
266randomdev_flush_reseed(void)
267{
268 /* Command a entropy queue flush and wait for it to finish */
269 random_kthread_control = 1;
270 while (random_kthread_control)
271 pause("-", hz / 10);
272
250}
251
252/* Helper routine to perform explicit reseeds */
253static void
254randomdev_flush_reseed(void)
255{
256 /* Command a entropy queue flush and wait for it to finish */
257 random_kthread_control = 1;
258 while (random_kthread_control)
259 pause("-", hz / 10);
260
273#if defined(YARROW_RNG)
261#if defined(RANDOM_YARROW)
262 /* This ultimately calls randomdev_unblock() */
274 random_yarrow_reseed();
275#endif
263 random_yarrow_reseed();
264#endif
276#if defined(FORTUNA_RNG)
265#if defined(RANDOM_FORTUNA)
266 /* This ultimately calls randomdev_unblock() */
277 random_fortuna_reseed();
278#endif
279}
280
281static int
267 random_fortuna_reseed();
268#endif
269}
270
271static int
282randomdev_modevent(module_t mod, int type, void *unused)
272randomdev_modevent(module_t mod __unused, int type, void *unused __unused)
283{
284
285 switch (type) {
286 case MOD_LOAD:
287 random_adaptor_register(RANDOM_CSPRNG_NAME, &random_context);
288 /*
289 * For statically built kernels that contain both device
290 * random and options PADLOCK_RNG/RDRAND_RNG/etc..,

--- 17 unchanged lines hidden --- 		273{
274
275 switch (type) {
276 case MOD_LOAD:
277 random_adaptor_register(RANDOM_CSPRNG_NAME, &random_context);
278 /*
279 * For statically built kernels that contain both device
280 * random and options PADLOCK_RNG/RDRAND_RNG/etc..,

--- 17 unchanged lines hidden ---