diff options
author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-10-23 20:05:27 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-25 19:03:39 -0400 |
commit | f84be2bd96a108b09c8440263fa3adb3fb225fa3 (patch) | |
tree | ad341d7bcd581cba4d38d39296692256d8a747d5 /net | |
parent | 974daef7f8bb5d7be78fae3a240fcce43cae0135 (diff) | |
download | op-kernel-dev-f84be2bd96a108b09c8440263fa3adb3fb225fa3.zip op-kernel-dev-f84be2bd96a108b09c8440263fa3adb3fb225fa3.tar.gz |
net: make net_get_random_once irq safe
I initial build non irq safe version of net_get_random_once because I
would liked to have the freedom to defer even the extraction process of
get_random_bytes until the nonblocking pool is fully seeded.
I don't think this is a good idea anymore and thus this patch makes
net_get_random_once irq safe. Now someone using net_get_random_once does
not need to care from where it is called.
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/utils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/utils.c b/net/core/utils.c index bf09371..2f737bf 100644 --- a/net/core/utils.c +++ b/net/core/utils.c @@ -370,16 +370,17 @@ bool __net_get_random_once(void *buf, int nbytes, bool *done, struct static_key *done_key) { static DEFINE_SPINLOCK(lock); + unsigned long flags; - spin_lock_bh(&lock); + spin_lock_irqsave(&lock, flags); if (*done) { - spin_unlock_bh(&lock); + spin_unlock_irqrestore(&lock, flags); return false; } get_random_bytes(buf, nbytes); *done = true; - spin_unlock_bh(&lock); + spin_unlock_irqrestore(&lock, flags); __net_random_once_disable_jump(done_key); |