summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorStephan Mueller <smueller@chronox.de>2014-07-31 21:47:33 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2014-08-01 22:36:14 +0800
commitce5481d01f67ad304908ec2113515440c0fa86eb (patch)
treeeb6d591256bcfaec0febc7edcf603566544a1210 /crypto
parent6391723293bb55f05b43973bbbc7a06822b50555 (diff)
downloadlinux-stable-ce5481d01f67ad304908ec2113515440c0fa86eb.tar.gz
linux-stable-ce5481d01f67ad304908ec2113515440c0fa86eb.tar.bz2
linux-stable-ce5481d01f67ad304908ec2113515440c0fa86eb.zip
crypto: drbg - fix failure of generating multiple of 2**16 bytes
The function drbg_generate_long slices the request into 2**16 byte or smaller chunks. However, the loop, however invokes the random number generation function with zero bytes when the request size is a multiple of 2**16 bytes. The fix prevents zero bytes requests. Signed-off-by: Stephan Mueller <smueller@chronox.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/drbg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/drbg.c b/crypto/drbg.c
index ff975d9e0c2a..7894db9ca90b 100644
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -1500,7 +1500,7 @@ static int drbg_generate_long(struct drbg_state *drbg,
if (0 >= tmplen)
return tmplen;
len += tmplen;
- } while (slice > 0);
+ } while (slice > 0 && (len < buflen));
return len;
}