| From 35e412f1a1f1d57612fdc316bea4f5b86209411d Mon Sep 17 00:00:00 2001 |
| From: Hagen Paul Pfeifer <hagen@jauu.net> |
| Date: Wed, 7 Oct 2009 14:43:04 -0700 |
| Subject: econet: Fix redeclaration of symbol len |
| |
| From: Hagen Paul Pfeifer <hagen@jauu.net> |
| |
| commit 9e8342971d44ce86d8567047f5366fc1c06a75ed upstream. |
| |
| Function argument len was redeclarated within the |
| function. This patch fix the redeclaration of symbol 'len'. |
| |
| Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| [Adjusted to apply to 2.6.32 by dann frazier <dannf@debian.org>] |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| net/econet/af_econet.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/net/econet/af_econet.c |
| +++ b/net/econet/af_econet.c |
| @@ -447,15 +447,15 @@ static int econet_sendmsg(struct kiocb * |
| iov[0].iov_len = size; |
| for (i = 0; i < msg->msg_iovlen; i++) { |
| void __user *base = msg->msg_iov[i].iov_base; |
| - size_t len = msg->msg_iov[i].iov_len; |
| + size_t iov_len = msg->msg_iov[i].iov_len; |
| /* Check it now since we switch to KERNEL_DS later. */ |
| - if (!access_ok(VERIFY_READ, base, len)) { |
| + if (!access_ok(VERIFY_READ, base, iov_len)) { |
| mutex_unlock(&econet_mutex); |
| return -EFAULT; |
| } |
| iov[i+1].iov_base = base; |
| - iov[i+1].iov_len = len; |
| - size += len; |
| + iov[i+1].iov_len = iov_len; |
| + size += iov_len; |
| } |
| |
| /* Get a skbuff (no data, just holds our cb information) */ |