diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2012-11-26 05:57:27 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-04 06:09:05 +0800 |
| commit | 603b86549a4d6928d1059b19df2dfc5d61070533 (patch) | |
| tree | 5625bc309beed5f00ffd91685eff22ea1364f693 /drivers/vhost | |
| parent | 4bf6d0956ad678f3ef59362cb41dae05a2259f78 (diff) | |
| download | kernel_samsung_smdk4412-603b86549a4d6928d1059b19df2dfc5d61070533.zip kernel_samsung_smdk4412-603b86549a4d6928d1059b19df2dfc5d61070533.tar.gz kernel_samsung_smdk4412-603b86549a4d6928d1059b19df2dfc5d61070533.tar.bz2 | |
vhost: fix length for cross region descriptor
commit bd97120fc3d1a11f3124c7c9ba1d91f51829eb85 upstream.
If a single descriptor crosses a region, the
second chunk length should be decremented
by size translated so far, instead it includes
the full descriptor length.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 61047fe..e3fac28 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -986,7 +986,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; |