aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-09-06 09:01:31 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-09-06 11:00:00 +0200
commit6512391a30f6b158488e941214541e84473b6bf9 (patch)
treee9b559bdd5c9ef52136334c54f38c6c45e7d51d7 /arch/s390
parents390: Remove deprecated create_singlethread_workqueue (diff)
downloadlinux-dev-6512391a30f6b158488e941214541e84473b6bf9.tar.xz
linux-dev-6512391a30f6b158488e941214541e84473b6bf9.zip
s390/crypto: avoid returning garbage value
Static analysis with cppcheck detected that ret is not initialized and hence garbage is potentially being returned in the case where prng_data->ppnows.reseed_counter <= prng_reseed_limit. Thanks to Martin Schwidefsky for spotting a mistake in my original fix. Fixes: 0177db01adf26cf9 ("s390/crypto: simplify return code handling") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/crypto/prng.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index 79e3a1f6313a..9cc050f9536c 100644
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -434,7 +434,7 @@ static int prng_sha512_generate(u8 *buf, size_t nbytes)
memcpy(prng_data->prev, buf, nbytes);
}
- return ret;
+ return nbytes;
}