From patchwork Thu Jun 3 10:05:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 54474 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43F15B7D30 for ; Thu, 3 Jun 2010 20:06:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758671Ab0FCKGE (ORCPT ); Thu, 3 Jun 2010 06:06:04 -0400 Received: from ey-out-2122.google.com ([74.125.78.27]:54867 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933439Ab0FCKGA (ORCPT ); Thu, 3 Jun 2010 06:06:00 -0400 Received: by ey-out-2122.google.com with SMTP id 25so48452eya.19 for ; Thu, 03 Jun 2010 03:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=hqcE4LK8lZhhf/5FWWpL2uwRewJNwOszYU6O20DXcAU=; b=oJV7yyVo5bfEqkLv9P8sdNw1cBSY44JBf4mDGQLGEWGlJ/pteecYx6LiX92KvBCyrt KjS+AKLXGwjVR14prFAzZqoDLE6qR9k2qjjbaR4seCgAuWWmu0gaFjdsEpyJEnVbBVbu Cy1x6xP7HYoa23kRbCGWIMqH+iFa7zm8OSb9Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=DjF3ZNUDhc4kB2aPL7g8ubuQIcmxUa9FPY/HPK5srZ6Pf7XwNBlQLCo6bTSfZA9Z4K 1BbSxN7WNKL4GGCb7akhxyPNmawOqXNan6tNlp+nFLHN3POxeGAVQI/14yXp3tikH5/4 kUh4x00bPNCKkjU6GV6zkAY41pMjMHqGyVKog= Received: by 10.213.4.207 with SMTP id 15mr6375080ebs.72.1275559558034; Thu, 03 Jun 2010 03:05:58 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id 13sm5028164ewy.5.2010.06.03.03.05.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Jun 2010 03:05:56 -0700 (PDT) Date: Thu, 3 Jun 2010 12:05:35 +0200 From: Dan Carpenter To: Alexander Indenbaum Cc: Andy Gospodarek , "David S. Miller" , Jiri Pirko , Stephen Hemminger , Eric Dumazet , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] tehuti: return -EFAULT on copy_to_user errors Message-ID: <20100603100535.GT5483@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org copy_to_user() returns the number of bytes remaining but we want to return a negative error code here. Signed-off-by: Dan Carpenter --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 20ab161..737df60 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c @@ -646,7 +646,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) error = copy_from_user(data, ifr->ifr_data, sizeof(data)); if (error) { pr_err("cant copy from user\n"); - RET(error); + RET(-EFAULT); } DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]); } @@ -665,7 +665,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) data[2]); error = copy_to_user(ifr->ifr_data, data, sizeof(data)); if (error) - RET(error); + RET(-EFAULT); break; case BDX_OP_WRITE: