diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2015-01-07 10:51:00 +0200 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2015-01-07 12:22:00 +0200 |
commit | 99975cc6ada0d5f2675e83abecae05aba5f437d2 (patch) | |
tree | cd2c592b0eb4a69108029bfe64f79f657c4ef835 /drivers/vhost/net.c | |
parent | a1eb03f546d651a8f39c7d0692b1f7f5b4e7e3cd (diff) | |
download | talos-obmc-linux-99975cc6ada0d5f2675e83abecae05aba5f437d2.tar.gz talos-obmc-linux-99975cc6ada0d5f2675e83abecae05aba5f437d2.zip |
vhost/net: length miscalculation
commit 8b38694a2dc8b18374310df50174f1e4376d6824
vhost/net: virtio 1.0 byte swap
had this chunk:
- heads[headcount - 1].len += datalen;
+ heads[headcount - 1].len = cpu_to_vhost32(vq, len - datalen);
This adds datalen with the wrong sign, causing guest panics.
Fixes: 8b38694a2dc8b18374310df50174f1e4376d6824
Reported-by: Alex Williamson <alex.williamson@redhat.com>
Suggested-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost/net.c')
-rw-r--r-- | drivers/vhost/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 14419a8ccbb6..d415d69dc237 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -538,7 +538,7 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, ++headcount; seg += in; } - heads[headcount - 1].len = cpu_to_vhost32(vq, len - datalen); + heads[headcount - 1].len = cpu_to_vhost32(vq, len + datalen); *iovcount = seg; if (unlikely(log)) *log_num = nlogs; |