summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-11-18 14:11:00 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-12 11:39:33 +0100
commita05aa258b237535df67926204b359b1dacc03ed1 (patch)
tree0d17675c2335f6b0949676b616a9d04dc270d951 /arch/s390
parent5d7d362abc408e69ee229459fba21f833f2f5bf1 (diff)
downloadblackbird-op-linux-a05aa258b237535df67926204b359b1dacc03ed1.tar.gz
blackbird-op-linux-a05aa258b237535df67926204b359b1dacc03ed1.zip
s390/crypto: unlock on error in prng_tdes_read()
commit 9e6e7c74315095fd40f41003850690c711e44420 upstream. We added some new locking but forgot to unlock on error. Fixes: 57127645d79d ("s390/zcrypt: Introduce new SHA-512 based Pseudo Random Generator.") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/crypto/prng.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index 9cc050f9536c..1113389d0a39 100644
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -507,8 +507,10 @@ static ssize_t prng_tdes_read(struct file *file, char __user *ubuf,
prng_data->prngws.byte_counter += n;
prng_data->prngws.reseed_counter += n;
- if (copy_to_user(ubuf, prng_data->buf, chunk))
- return -EFAULT;
+ if (copy_to_user(ubuf, prng_data->buf, chunk)) {
+ ret = -EFAULT;
+ break;
+ }
nbytes -= chunk;
ret += chunk;
OpenPOWER on IntegriCloud