From c3b4da4b7e62b4d86a909551a81ec3c2d588247e Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Mon, 26 Nov 2012 05:57:27 +0000 Subject: [PATCH] --- yaml --- r: 336081 b: refs/heads/master c: bd97120fc3d1a11f3124c7c9ba1d91f51829eb85 h: refs/heads/master i: 336079: 38222bad714e11bdc5a1fee3c8c3d903df6be380 v: v3 --- [refs] | 2 +- trunk/drivers/vhost/vhost.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5f79f2261e3f..033d29ac2206 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3b2c2581988d304127c2aa218430b5fca88ce56 +refs/heads/master: bd97120fc3d1a11f3124c7c9ba1d91f51829eb85 diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c index 99ac2cb08b43..dedaf81d8f36 100644 --- a/trunk/drivers/vhost/vhost.c +++ b/trunk/drivers/vhost/vhost.c @@ -1076,7 +1076,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;