From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752791AbcHTHfY (ORCPT ); Sat, 20 Aug 2016 03:35:24 -0400 Received: from mout.web.de ([212.227.15.3]:49641 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175AbcHTHfW (ORCPT ); Sat, 20 Aug 2016 03:35:22 -0400 Subject: [PATCH 1/2] tun: Use memdup_user() rather than duplicating its implementation To: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jason Wang , "Michael S. Tsirkin" , Mike Rapoport , Paolo Abeni , Soheil Hassas Yeganeh References: <566ABCD9.1060404@users.sourceforge.net> <9cf06275-924d-6c22-d8a8-f733a03cca23@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Sat, 20 Aug 2016 09:34:56 +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: <9cf06275-924d-6c22-d8a8-f733a03cca23@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:PBoJ6uI6NNtrXpTSB+ZK6G01TpSbu93HXFiG6Zbm4bVqi6ccElU apn0vXt95BjAAs2OFN/rGiArOYleZC0u13SdaUjndlHKDguGsgMJnJehw+ShRTaRhdb8/yV 8+ydyJl1FvlJ+KJi4vgL6crJG5eUQASgS0tmmd//xRiZbfFJd6yBSDlb5MKWZNX70brQCCW e3tzJnmG0J2dB7TAtvS0w== X-UI-Out-Filterresults: notjunk:1;V01:K0:wJ7tbr32sp0=:kWUHwqKYOVkaEnpCZYabtZ 3Oz/ACfLc3sWCsqF2Zu4zpN4MoRkDp9TAtpZVf1BB6LrL6kbi4A7dY8fYSzOO4LGXVPv2du7u i+dXvdyGORhc0Jg+/jrbzE+j+UIUjIWS6BjfAA3SJy16IiCBgiJLR032vmUFjxNGMvYR/Yfc/ LVtA5ziUkY+pxtUv4X4I+NdnJNRKlItaR1N8w8Gmw9YPARHKwH6wzc4ghtuiIpqIgx0gdUPgJ Ufa1hFLjMi4dtNVUIrwrVsW5TfIn4VXgP8aLTB4R3XQF7QUkMoNvk4IfxyssZr2PmBKx0JJ1R M0tvQQcyZmvDU3Jc6Mc7RDEYXBHVG2LHEIAawQm9plASA7DmXGVXB36EYpup5iWwcQ+ugFOq/ VLFZTC/dGHf0TPZnCpOsE6Axajo+KRjkkzD24/7Tr7bz4enTQn9WOCHCzGJ7nqlocNNzxg8N7 2n4APgG70qAZMolbu/2EcQKlK/aOZb404Ppy5CMqgXUnlIMwipGdRY2O+w6eb9iaNu3mlOXlO 1pjTg5b7vfrmezhpwVXrztg6Gm0Smmxbx6YBLMwVPbXX4xfSq5BvGdFNUjylvVzN8YFgkeksp R+2wvk3G7XgCGIhmJ8htBGrN2WPgmzY10AeVSVxdcTHnvwfCMuCdI1b08e7MCmgZLTWDutKMA uMVQ89NqgR5eXrccPsPw/af70/N3w/AfIAYdCZplVXKkeg6SFzheOLHgCCwWwwNWPrfXnktLE aa+3CLhMUGvMYRqdvRvlUC7cF6FXTFsRl6k3ZuHYvCijTk+z5rifaUIUkIWgA2MK8smyvNEAW JDd5NI5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 20 Aug 2016 08:54:15 +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/net/tun.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 9c8b5bc..a1aeccb 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -731,14 +731,9 @@ static int update_filter(struct tap_filter *filter, void __user *arg) } alen = ETH_ALEN * uf.count; - addr = kmalloc(alen, GFP_KERNEL); - if (!addr) - return -ENOMEM; - - if (copy_from_user(addr, arg + sizeof(uf), alen)) { - err = -EFAULT; - goto done; - } + addr = memdup_user(arg + sizeof(uf), alen); + if (IS_ERR(addr)) + return PTR_ERR(addr); /* The filter is updated without holding any locks. Which is * perfectly safe. We disable it first and in the worst -- 2.9.3