diff options
| author | Juergen Gross <jgross@suse.com> | 2017-11-13 10:24:50 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2017-11-13 10:24:50 +0100 |
| commit | 40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b (patch) | |
| tree | b443b237fa80f2cc8ca8510b63aaa4861ba3ea7a /crypto/rng.c | |
| parent | 4f673910a79f5cb0e7dd87bf807eebb24834cea3 (diff) | |
| parent | 37d98457e3c414a1673bf5dce97eb4c79b5cff25 (diff) | |
| download | linux-crypto-40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b.tar.gz linux-crypto-40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b.zip | |
Merge tag 'v4.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Linux 4.14
Diffstat (limited to 'crypto/rng.c')
| -rw-r--r-- | crypto/rng.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/rng.c b/crypto/rng.c index 5e846924..b4a61866 100644 --- a/crypto/rng.c +++ b/crypto/rng.c @@ -43,12 +43,14 @@ int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, unsigned int slen) if (!buf) return -ENOMEM; - get_random_bytes(buf, slen); + err = get_random_bytes_wait(buf, slen); + if (err) + goto out; seed = buf; } err = crypto_rng_alg(tfm)->seed(tfm, seed, slen); - +out: kzfree(buf); return err; } |