From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755337AbcHSSaE (ORCPT ); Fri, 19 Aug 2016 14:30:04 -0400 Received: from mout.web.de ([217.72.192.78]:57029 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753952AbcHSSaA (ORCPT ); Fri, 19 Aug 2016 14:30:00 -0400 Subject: [PATCH 1/2] misc/mic/vop: Use memdup_user() rather than duplicating its implementation To: Ashutosh Dixit , Sudeep Dutt References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Greg Kroah-Hartman From: SF Markus Elfring Message-ID: Date: Fri, 19 Aug 2016 20:28:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:0D3bWO2RwWimBGOo18ayuJj1VpgZfkTI6tIwf7NiMEkFAt/qXQE Osyn5PBQb+SPztad6OSIKrkH/Tg2z2LMTJ6yKw6yOQO9++U/Ak7/dKpYWvAdnGCkbsZchLf Ic1KXvqJoqM/Nmte7OkurOyPQ4hJ6vTQPViysqzID6EZXsGcPdRZTJwZS0oIvMS5l5Y2kJs gZLMqNS1gF23n8zPm8gkw== X-UI-Out-Filterresults: notjunk:1;V01:K0:OuU7cahfjJQ=:raTqZ6kffvejSMvcKeURFf Z0UsL0rkYwFNy1d6bhF73z5au6oBLXS/zLKHFAwxIAfc5uHI33ZZFzzNwzFXLo/5Zlxyvdm7d b/mzKUWAhVItR9vfLP69b60J6sb22fL5++cXBdcznK+W5UOlcY2u1APmcvYAhmTuAPDUiAtRz qYOhOFlmnGCAnps50dEcyNgGqgCl5Tu5FaaMSxKMokhSBpmCNcnCaz3iJjd5iqFqNRHR9BOyv DVagNniJJaAT4mQA4MfTmR4/+tghpnhN/lKoi79wEloPH8WYo4jpeeZTX8BIIi6BaW2JwUr5X XDEIvYATbWo1SOAibIFdhDLQzns3ymfrri63PDo6PZiAn37MmTe6TiAiBwdg1oWIdqlSGXTwQ yPe859yjTB0IlMwgueAtSnsMSS60wcPLlMieqmaMX6+tkiPMcAtEsk4pEqnIXrUV1iHChCoRa 65r5/Ws36/q/CnQskBDssvhVG+9LIhm033FjSKCW827gF/kHH030oZXEXaQP6iW/qOELIIRyh qPpp05hwaWAXoDpb++cZHM9m5GHXFd/p/+gAtIyrMcpHifn6a5TJDt/hLDTG8SbGBukisfYDU a0RfjskPbFC5VhNOVcV9CmAsV0TufTzJ1/novfeZUUKziE1aYVp0sX87xSLn1BaWtaofZcSAW fDq2VDbqSgD+N1wjASCpBd9nYafuH/lWf7pksnNWfDEfwcPQJ5amm4512xvz43dy0euDNficK 4ne1m2DssGgmGjwsQpB3tR6n9hMfyJMRlD/+qSfEBFkb480UaMiRQAfAnC7Er9Qbf87m5BsMw 4fYMp6K Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 19 Aug 2016 19:48:45 +0200 Reuse existing functionality from memdup_user() instead of keeping duplicate source code. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/misc/mic/vop/vop_vringh.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c index 88e4523..84c95fe 100644 --- a/drivers/misc/mic/vop/vop_vringh.c +++ b/drivers/misc/mic/vop/vop_vringh.c @@ -938,13 +938,9 @@ static long vop_ioctl(struct file *f, unsigned int cmd, unsigned long arg) dd.num_vq > MIC_MAX_VRINGS) return -EINVAL; - dd_config = kzalloc(mic_desc_size(&dd), GFP_KERNEL); - if (!dd_config) - return -ENOMEM; - if (copy_from_user(dd_config, argp, mic_desc_size(&dd))) { - ret = -EFAULT; - goto free_ret; - } + dd_config = memdup_user(argp, mic_desc_size(&dd)); + if (IS_ERR(dd_config)) + return PTR_ERR(dd_config); /* Ensure desc has not changed between the two reads */ if (memcmp(&dd, dd_config, sizeof(dd))) { ret = -EINVAL; @@ -996,17 +992,12 @@ _unlock_ret: ret = vop_vdev_inited(vdev); if (ret) goto __unlock_ret; - buf = kzalloc(vdev->dd->config_len, GFP_KERNEL); - if (!buf) { - ret = -ENOMEM; + buf = memdup_user(argp, vdev->dd->config_len); + if (IS_ERR(buf)) { + ret = PTR_ERR(buf); goto __unlock_ret; } - if (copy_from_user(buf, argp, vdev->dd->config_len)) { - ret = -EFAULT; - goto done; - } ret = vop_virtio_config_change(vdev, buf); -done: kfree(buf); __unlock_ret: mutex_unlock(&vdev->vdev_mutex); -- 2.9.3