diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-05-11 22:54:30 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-11 22:54:30 +0200 |
| commit | 2f4c547d24c0bc67f1486ec20ca8bd34cf7e4560 (patch) | |
| tree | 121aa12245bacdb9c5c203ab59ca371407b95617 /crypto/rng.c | |
| parent | 577ef62b7c7c672f6632626daa2e83fc2018aa26 (diff) | |
| parent | 3278a1722acf54316ac94db3f3a83aed32857edc (diff) | |
| download | linux-crypto-2f4c547d24c0bc67f1486ec20ca8bd34cf7e4560.tar.gz linux-crypto-2f4c547d24c0bc67f1486ec20ca8bd34cf7e4560.zip | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul McKenney:
1. Miscellaneous fixes.
2. kfree_rcu() updates.
3. Remove scheduler locking restriction
4. RCU-tasks update, including addition of RCU Tasks Trace for
BPF use and RCU Tasks Rude. (This branch is on top of #3 due
to overlap of changed code.)
5. RCU CPU stall warning updates.
6. Torture-test updates.
Diffstat (limited to '')
| -rw-r--r-- | crypto/rng.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/rng.c b/crypto/rng.c index 1e21231f..1490d210 100644 --- a/crypto/rng.c +++ b/crypto/rng.c @@ -37,12 +37,16 @@ int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, unsigned int slen) crypto_stats_get(alg); if (!seed && slen) { buf = kmalloc(slen, GFP_KERNEL); - if (!buf) + if (!buf) { + crypto_alg_put(alg); return -ENOMEM; + } err = get_random_bytes_wait(buf, slen); - if (err) + if (err) { + crypto_alg_put(alg); goto out; + } seed = buf; } |