Skip to contentSkip to conversation

Patch "s390/crypto: unlock on error in prng_tdes_read()" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 9, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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.9-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.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 9e6e7c74315095fd40f41003850690c711e44420 Mon Sep 17 00:00:00 2001

From: Dan Carpenter <[email protected]>
Date: Fri, 18 Nov 2016 14:11:00 +0300
Subject: s390/crypto: unlock on error in prng_tdes_read()

From: Dan Carpenter <[email protected]>

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.")
---
 arch/s390/crypto/prng.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/s390/crypto/prng.c +4 -2
@@ -507,8 +507,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 [email protected] are

queue-4.9/staging-media-davinci_vpfe-unlock-on-error-in-vpfe_reqbufs.patch queue-4.9/mmc-mmc_test-uninitialized-return-value.patch queue-4.9/relay-check-array-offset-before-using-it.patch queue-4.9/target-iscsi-fix-double-free-in-lio_target_tiqn_addtpg.patch queue-4.9/s390-crypto-unlock-on-error-in-prng_tdes_read.patch queue-4.9/usb-xhci-mem-use-passed-in-gfp-flags-instead-of-gfp_kernel.patch queue-4.9/iommu-amd-missing-error-code-in-amd_iommu_init_device.patch queue-4.9/efi-efivar_ssdt_load-don-t-return-success-on-allocation-failure.patch queue-4.9/asoc-intel-skylake-fix-a-shift-wrapping-bug.patch queue-4.9/input-synaptics-rmi4-unlock-on-error.patch