* Patch "s390/crypto: unlock on error in prng_tdes_read()" has been added to the 4.4-stable tree
@ 2017-01-09 15:04 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2017-01-09 15:04 UTC (permalink / raw)
To: dan.carpenter, gregkh, schwidefsky; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
s390/crypto: unlock on error in prng_tdes_read()
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
s390-crypto-unlock-on-error-in-prng_tdes_read.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 9e6e7c74315095fd40f41003850690c711e44420 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 18 Nov 2016 14:11:00 +0300
Subject: s390/crypto: unlock on error in prng_tdes_read()
From: Dan Carpenter <dan.carpenter@oracle.com>
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>
---
arch/s390/crypto/prng.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -565,8 +565,10 @@ static ssize_t prng_tdes_read(struct fil
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;
Patches currently in stable-queue which might be from dan.carpenter@oracle.com are
queue-4.4/mmc-mmc_test-uninitialized-return-value.patch
queue-4.4/target-iscsi-fix-double-free-in-lio_target_tiqn_addtpg.patch
queue-4.4/s390-crypto-unlock-on-error-in-prng_tdes_read.patch
queue-4.4/usb-xhci-mem-use-passed-in-gfp-flags-instead-of-gfp_kernel.patch
queue-4.4/iommu-amd-missing-error-code-in-amd_iommu_init_device.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-01-09 15:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-09 15:04 Patch "s390/crypto: unlock on error in prng_tdes_read()" has been added to the 4.4-stable tree gregkh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).