korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 02:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

s390/pkey: use memdup_user() to simplify code

Browse Source 
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>
This commit is contained in:
Markus Elfring 2019-11-11 15:20:44 +01:00 committed by Vasily Gorbik
parent f9cac4fd88
commit 8b57e7c852
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/s390/crypto/pkey_api.c
View File

@ -715,38 +715,18 @@ out:
static void *_copy_key_from_user(void __user *ukey, size_t keylen) static void *_copy_key_from_user(void __user *ukey, size_t keylen)
{ {
void *kkey;
if (!ukey || keylen < MINKEYBLOBSIZE || keylen > KEYBLOBBUFSIZE) if (!ukey || keylen < MINKEYBLOBSIZE || keylen > KEYBLOBBUFSIZE)
return ERR_PTR(-EINVAL); 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) static void *_copy_apqns_from_user(void __user *uapqns, size_t nr_apqns)
{ {
void *kapqns = NULL; if (!uapqns || nr_apqns == 0)
size_t nbytes; return NULL;
if (uapqns && nr_apqns > 0) { return memdup_user(uapqns, nr_apqns * sizeof(struct pkey_apqn));
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);
}
}
return kapqns;
} }
static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd,