s390/pkey: use memdup_user() to simplify code

Generated by: scripts/coccinelle/api/memdup_user.cocci

Link: http://lkml.kernel.org/r/aca044e8-e4b2-eda8-d724-b08772a44ed9@web.de
[borntraeger@de.ibm.com: use ==0 instead of <=0 for a size_t variable]
[heiko.carstens@de.ibm.com: split bugfix into separate patch; shorten changelog]
Signed-off-by: Markus Elfring <Markus.Elfring@web.de>
Signed-off-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>

diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c
index e17fac20127e8593c9eb34156d3fb4f69d2b33f1..d78d77686d7bc3b49c302705912824809198f1be 100644 (file)
--- a/drivers/s390/crypto/pkey_api.c
+++ b/drivers/s390/crypto/pkey_api.c
@@ -715,38 +715,18 @@ static int pkey_apqns4keytype(enum pkey_key_type ktype,
 
 static void *_copy_key_from_user(void __user *ukey, size_t keylen)
 {
-       void *kkey;
-
        if (!ukey || keylen < MINKEYBLOBSIZE || keylen > KEYBLOBBUFSIZE)
                return ERR_PTR(-EINVAL);
-       kkey = kmalloc(keylen, GFP_KERNEL);
-       if (!kkey)
-               return ERR_PTR(-ENOMEM);
-       if (copy_from_user(kkey, ukey, keylen)) {
-               kfree(kkey);
-               return ERR_PTR(-EFAULT);
-       }
 
-       return kkey;
+       return memdup_user(ukey, keylen);
 }
 
 static void *_copy_apqns_from_user(void __user *uapqns, size_t nr_apqns)
 {
-       void *kapqns = NULL;
-       size_t nbytes;
-
-       if (uapqns && nr_apqns > 0) {
-               nbytes = nr_apqns * sizeof(struct pkey_apqn);
-               kapqns = kmalloc(nbytes, GFP_KERNEL);
-               if (!kapqns)
-                       return ERR_PTR(-ENOMEM);
-               if (copy_from_user(kapqns, uapqns, nbytes)) {
-                       kfree(kapqns);
-                       return ERR_PTR(-EFAULT);
-               }
-       }
+       if (!uapqns || nr_apqns == 0)
+               return NULL;
 
-       return kapqns;
+       return memdup_user(uapqns, nr_apqns * sizeof(struct pkey_apqn));
 }
 
 static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd,