From ff31b9ce1890eb1a49c8409ce31e59ae1521244b Mon Sep 17 00:00:00 2001
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed, 7 Oct 2009 14:43:04 -0700
Subject: [PATCH] --- yaml --- r: 170478 b: refs/heads/master c:
 9e8342971d44ce86d8567047f5366fc1c06a75ed h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/econet/af_econet.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d552b2179d44..5abe36bab016 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49b4ad92d1a5bb9909deb3216ffec6f0febc7b71
+refs/heads/master: 9e8342971d44ce86d8567047f5366fc1c06a75ed
diff --git a/trunk/net/econet/af_econet.c b/trunk/net/econet/af_econet.c
index 6529be3a18b7..5e9426a11c3e 100644
--- a/trunk/net/econet/af_econet.c
+++ b/trunk/net/econet/af_econet.c
@@ -457,15 +457,15 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
 	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) */