summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2019-11-12 09:19:26 +0100
committerVasily Gorbik <gor@linux.ibm.com>2019-11-12 12:50:28 +0100
commitf9cac4fd8878929c6ebff0bd272317905d77c38a (patch)
treebed56377c6fe1ec745004fab6f7d3bb4eeb7a516
parent4ff4ba153ab35710c81046b4a71b2eda0cc798f0 (diff)
s390/pkey: fix memory leak within _copy_apqns_from_user()
Fixes: f2bbc96e7cfad ("s390/pkey: add CCA AES cipher key support") Reported-by: Markus Elfring <Markus.Elfring@web.de> Reported-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
-rw-r--r--drivers/s390/crypto/pkey_api.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c
index 9de3d46b3253..e17fac20127e 100644
--- a/drivers/s390/crypto/pkey_api.c
+++ b/drivers/s390/crypto/pkey_api.c
@@ -740,8 +740,10 @@ static void *_copy_apqns_from_user(void __user *uapqns, size_t nr_apqns)
kapqns = kmalloc(nbytes, GFP_KERNEL);
if (!kapqns)
return ERR_PTR(-ENOMEM);
- if (copy_from_user(kapqns, uapqns, nbytes))
+ if (copy_from_user(kapqns, uapqns, nbytes)) {
+ kfree(kapqns);
return ERR_PTR(-EFAULT);
+ }
}
return kapqns;