From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754001AbcHSJXf (ORCPT ); Fri, 19 Aug 2016 05:23:35 -0400 Received: from mout.web.de ([212.227.15.3]:56183 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752581AbcHSJXd (ORCPT ); Fri, 19 Aug 2016 05:23:33 -0400 Subject: [PATCH 1/2] uvc_v4l2: Use memdup_user() rather than duplicating its implementation To: linux-media@vger.kernel.org, Laurent Pinchart , Mauro Carvalho Chehab References: <566ABCD9.1060404@users.sourceforge.net> <95aa5fcd-8610-debc-70b0-30b2ed3302d2@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <4181a4b7-3527-4ddf-4c7f-42fcd47977ca@users.sourceforge.net> Date: Fri, 19 Aug 2016 11:23:18 +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: <95aa5fcd-8610-debc-70b0-30b2ed3302d2@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:jBE+y0vSwSSyiJcPS68Af+wjG2Rz3YUx5o6s6JBpWAgLVtEWdSR p1ogZCPsK3dFlSOXppybqcPqC86FQTEkp8Jb/2QDUhfq1NNyKzN+T6uV+xl7LYi6rqamf+3 qYhdEfv+KIVK+SUaAahPtnhDnF+Oxs0rsgmPTTqTHntihsmbUSiuAIgE4j0bB14paxBNNDK 3SqEgbIu6+gTJGzkFA/aA== X-UI-Out-Filterresults: notjunk:1;V01:K0:4uurvDvaaPw=:eE6FD6Kea8BDxi8OSREg+x 9XquAcbLrL5IBx88jmpOdDoIq7dVksqtaR/8tdLJw4KxXc/ueBjI5AqF6BGreJArDJH+iCdiT 3cejI3thldPktYooeDE9OzGZEzORD1aL5UkxfWnHuupjKVS38bLWWrLZXOvHqw7ql3wo76EEQ xnKPEOfWlZHu7c12vM8Ph/fmGWAmhBAP+Tdg5z88FD1w02zeGUYfmVdxuBspsKD1sawDYr+ru KX2qyFS/r4FX8GxipxqcK4dxBp35lkaWChUMcAjvMntPYwEdjPfuJRbsspNXMDNQRsNyw43QR YstizL7QgzssZqctM/bXZXjz0MmrIlwn0wMIdvqCZFFe70WLsM7tZzOeMS/7KM8eRTgJeVRZg H81JQi+9N3sX6qnxhRgS1rxwGcZtici96Vb16HneQzvHIfX7sVeIDnhmVPjP6TO6rtrj+oHs9 uF3VDgAXCaCKDoOztBCH9Hqu6nGKIdnZwqOVE5Fm1Rg8e9NsTyeRS6RNOpSIRrN+g0t1qfpP0 JOnn8smrbH1fk7T5jayb+KNWoML0WQ/kWX+29sorNr0p1mNo2PFMx5Htof/r7IGCVALlo8qoU UvsGjmB3W9VfC3rLnwdBSTIdwNs3pG8fmL69VlroPBSdB3sv8F14IcGS8WOAY+Sr3UAydVUdt pzV36EGnh5LDyeJPQ6mV9T6dlWqLx0EWCx8r5ttHFgmR+GUTblGTGSN8BmHYpPu4bif1uo0bi WjgWJsS7tVNFHoWt4hFd7n9t8o4NbdXK1y6gg41dHYLTISidMuR1Q6CdAf3taXb0k2GU7PsmF RGaKXo/ 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 10:50:05 +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/media/usb/uvc/uvc_v4l2.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 05eed4b..a7e12fd 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -70,14 +70,9 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain, } size = xmap->menu_count * sizeof(*map->menu_info); - map->menu_info = kmalloc(size, GFP_KERNEL); - if (map->menu_info == NULL) { - ret = -ENOMEM; - goto done; - } - - if (copy_from_user(map->menu_info, xmap->menu_info, size)) { - ret = -EFAULT; + map->menu_info = memdup_user(xmap->menu_info, size); + if (IS_ERR(map->menu_info)) { + ret = PTR_ERR(map->menu_info); goto done; } -- 2.9.3