mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-09 20:32:04 +09:00
econet: Fix redeclaration of symbol len
commit 9e8342971d 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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
46e8f021c9
commit
8200a2e148
@@ -447,15 +447,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) */
|
||||
|
||||
Reference in New Issue
Block a user