| From aab95baee6f5e64a36a6616186515fc5b9d7919e Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Fri, 18 Nov 2016 14:11:00 +0300 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c |
| index 41527b113f5a..88a66972086e 100644 |
| --- a/arch/s390/crypto/prng.c |
| +++ b/arch/s390/crypto/prng.c |
| @@ -556,8 +556,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; |
| -- |
| 2.10.1 |
| |
