diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-29 12:51:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-29 12:51:17 -0500 |
| commit | 8a2cf062b27ef5511a7d8a7ce6662fbc04f671b8 (patch) | |
| tree | 31f32c0d9a548f0dbbe9f3a32aca5767093d98b4 /drivers/vhost | |
| parent | 3177bf6f922f62743133abbcbbbb5545f4133b2d (diff) | |
| parent | e9296e89b85604862bd9ec2d54dc43edad775c0d (diff) | |
| download | linux-next-8a2cf062b27ef5511a7d8a7ce6662fbc04f671b8.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vhost.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index ef8f5988f855..5a3d0f1eaf94 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1049,7 +1049,7 @@ static int translate_desc(struct vhost_dev *dev, u64 addr, u32 len, } _iov = iov + ret; size = reg->memory_size - addr + reg->guest_phys_addr; - _iov->iov_len = min((u64)len, size); + _iov->iov_len = min((u64)len - s, size); _iov->iov_base = (void __user *)(unsigned long) (reg->userspace_addr + addr - reg->guest_phys_addr); s += size; |