diff options
author | Mark Murray <markm@FreeBSD.org> | 2000-07-11 19:37:25 +0000 |
---|---|---|
committer | Mark Murray <markm@FreeBSD.org> | 2000-07-11 19:37:25 +0000 |
commit | 4d0e6f79d62c5a8b2edf7fe8bc807c6651c13dcd (patch) | |
tree | c0ee4b80e31162e0c1fc977982722a910754422e /sys/dev/random | |
parent | d4c1816924d21f56a39167f7437d64064367a32f (diff) | |
download | src-4d0e6f79d62c5a8b2edf7fe8bc807c6651c13dcd.tar.gz src-4d0e6f79d62c5a8b2edf7fe8bc807c6651c13dcd.zip |
Storing to a pointer is (effectively) atomic; no need to protect this
with splhigh(). However, the entropy-harvesting routine needs pretty
serious irq-protection, as it is called out of irq handlers etc.
Clues given by: bde
Notes
Notes:
svn path=/head/; revision=62969
Diffstat (limited to 'sys/dev/random')
-rw-r--r-- | sys/dev/random/harvest.c | 8 | ||||
-rw-r--r-- | sys/dev/random/yarrow.c | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/dev/random/harvest.c b/sys/dev/random/harvest.c index ceb9f9f3a5c6..591d0d023e25 100644 --- a/sys/dev/random/harvest.c +++ b/sys/dev/random/harvest.c @@ -47,22 +47,14 @@ static void (*reap)(struct timespec *, u_int64_t, u_int, u_int, u_int) = NULL; void random_init_harvester(void (*reaper)(struct timespec *, u_int64_t, u_int, u_int, u_int)) { - intrmask_t mask; - - mask = splhigh(); reap = reaper; - splx(mask); } /* Deinitialise the harvester at unload time */ void random_deinit_harvester(void) { - intrmask_t mask; - - mask = splhigh(); reap = NULL; - splx(mask); } /* Entropy harvesting routine. This is supposed to be fast; do */ diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c index 99453f6a3e91..c6ae4481a0eb 100644 --- a/sys/dev/random/yarrow.c +++ b/sys/dev/random/yarrow.c @@ -320,8 +320,8 @@ random_harvest_internal(struct timespec *nanotime, u_int64_t entropy, #endif if (origin < ENTROPYSOURCE) { - /* The reseed task must not be jumped on */ - mask = splsofttq(); + /* Called inside irq handlers; protect from interference */ + mask = splhigh(); which = random_state.which; pool = &random_state.pool[which]; |