From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.web.de ([212.227.17.12]:34323 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727732AbfKGKGQ (ORCPT ); Thu, 7 Nov 2019 05:06:16 -0500 Subject: [PATCH v2] s390/pkey: Use memdup_user() rather than duplicating its implementation References: <08422b7e-2071-ee52-049e-c3ac55bc67a9@web.de> <6137855bb4170c438c7436cbdb7dfd21639a8855.camel@perches.com> From: Markus Elfring Message-ID: Date: Thu, 7 Nov 2019 11:06:04 +0100 MIME-Version: 1.0 In-Reply-To: <6137855bb4170c438c7436cbdb7dfd21639a8855.camel@perches.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Sender: linux-s390-owner@vger.kernel.org List-ID: To: linux-s390@vger.kernel.org, Joe Perches , =?UTF-8?Q?Christian_Borntr=c3=a4ger?= , Harald Freudenberger , Heiko Carstens , Ingo Franzki , Vasily Gorbik Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Thu, 7 Nov 2019 10:40:18 +0100 Reuse existing functionality from memdup_user() instead of keeping duplicate source code. Generated by: scripts/coccinelle/api/memdup_user.cocci Delete local variables which became unnecessary with this refactoring in two function implementations. Fixes: f2bbc96e7cfad3891b7bf9bd3e566b9b7ab4553d ("s390/pkey: add CCA AES c= ipher key support") Signed-off-by: Markus Elfring =2D-- v2: Further changes were requested by Joe Perches. https://lore.kernel.org/r/6137855bb4170c438c7436cbdb7dfd21639a8855.camel@p= erches.com/ * The proposed usage of two conditional operators was replaced by an other code structure. * A sanity check was adjusted for the function =E2=80=9C_copy_apqns_from_u= ser=E2=80=9D. drivers/s390/crypto/pkey_api.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api= .c index 9de3d46b3253..ac99fd97569d 100644 =2D-- a/drivers/s390/crypto/pkey_api.c +++ b/drivers/s390/crypto/pkey_api.c @@ -715,36 +715,18 @@ static int pkey_apqns4keytype(enum pkey_key_type kty= pe, 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 =3D 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 =3D NULL; - size_t nbytes; - - if (uapqns && nr_apqns > 0) { - nbytes =3D nr_apqns * sizeof(struct pkey_apqn); - kapqns =3D kmalloc(nbytes, GFP_KERNEL); - if (!kapqns) - return ERR_PTR(-ENOMEM); - if (copy_from_user(kapqns, uapqns, nbytes)) - return ERR_PTR(-EFAULT); - } + if (!uapqns || nr_apqns <=3D 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, =2D- 2.24.0