Message ID | 20161118105451.GA26523@mwanda (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Herbert Xu |
Headers | show |
On Fri, 18 Nov 2016 14:11:00 +0300 Dan Carpenter <dan.carpenter@oracle.com> wrote: > 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> > > diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c > index 9cc050f..1113389 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; > Nice spotting, I will add this to my fixes tree. Thank you..
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c index 9cc050f..1113389 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;
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> -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html