Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934932AbcCOTxj (ORCPT ); Tue, 15 Mar 2016 15:53:39 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:34241 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934911AbcCOTxg (ORCPT ); Tue, 15 Mar 2016 15:53:36 -0400 From: Claudiu Beznea To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Claudiu Beznea Subject: [PATCH] Staging: wlan-ng: moved memset() calls after copy_from_user() call Date: Tue, 15 Mar 2016 21:53:15 +0200 Message-Id: <1458071595-22365-1-git-send-email-claudiu.beznea@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1000 Lines: 31 This patch moves memset() calls from p80211netdev_ethtool() after copy_from_user() call in order to avoid unnecessary instruction in case copy_from_user() fails. Signed-off-by: Claudiu Beznea --- drivers/staging/wlan-ng/p80211netdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index 88255ce..3723b8c 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -465,12 +465,12 @@ static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr) struct ethtool_drvinfo info; struct ethtool_value edata; - memset(&info, 0, sizeof(info)); - memset(&edata, 0, sizeof(edata)); - if (copy_from_user(ðcmd, useraddr, sizeof(ethcmd))) return -EFAULT; + memset(&info, 0, sizeof(info)); + memset(&edata, 0, sizeof(edata)); + switch (ethcmd) { case ETHTOOL_GDRVINFO: info.cmd = ethcmd; -- 1.9.1