s390/pkey: fix memory leak within _copy_apqns_from_user()
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Tue, 12 Nov 2019 08:19:26 +0000 (09:19 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Jan 2020 09:01:01 +0000 (10:01 +0100)
commit f9cac4fd8878929c6ebff0bd272317905d77c38a upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/s390/crypto/pkey_api.c

index 9de3d46..e17fac2 100644 (file)
@@ -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;