From patchwork Fri Nov 16 03:26:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: net/ethernet/intel/ixgbe/ixgbe_debugfs.c: fix error handling in ixgbe_dbg_reg_ops_read(). Date: Thu, 15 Nov 2012 17:26:50 -0000 From: Cyril Roelandt X-Patchwork-Id: 199482 Message-Id: <1353036410-14439-1-git-send-email-tipecaml@gmail.com> To: jeffrey.t.kirsher@intel.com Cc: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Cyril Roelandt copy_to_user() cannot return a negative value: it returns the number of bytes that could not be copied. Return -EFAULT on failure rather than the number of bytes that could not be copied, as this seems more standard. Signed-off-by: Cyril Roelandt Reported-by: Dan Carpenter Signed-off-by: Josh Hay --- drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c index 8d3a218..77a3598 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c @@ -62,7 +62,6 @@ static ssize_t ixgbe_dbg_reg_ops_read(struct file *filp, char __user *buffer, { struct ixgbe_adapter *adapter = filp->private_data; char buf[256]; - int bytes_not_copied; int len; /* don't allow partial reads */ @@ -73,9 +72,8 @@ static ssize_t ixgbe_dbg_reg_ops_read(struct file *filp, char __user *buffer, adapter->netdev->name, ixgbe_dbg_reg_ops_buf); if (count < len) return -ENOSPC; - bytes_not_copied = copy_to_user(buffer, buf, len); - if (bytes_not_copied < 0) - return bytes_not_copied; + if (copy_to_user(buffer, buf, len) > 0) + return -EFAULT; *ppos = len; return len;