From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiJlZ-0007cl-Li for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:37:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiJlV-0005Ay-IM for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:37:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35996) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiJlV-0005Ap-EH for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:37:49 -0400 Date: Wed, 15 Apr 2015 11:37:46 +0200 From: "Michael S. Tsirkin" Message-ID: <1429090543-4736-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] vhost: fix log base address List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell VHOST_SET_LOG_BASE got an incorrect address, causing migration errors and potentially even memory corruption. Cc: Peter Maydell Reported-by: Wen Congyang Signed-off-by: Michael S. Tsirkin --- Could you please confirm this fixes the problem for you? hw/virtio/vhost.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 8dd2f59..02c5604 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1016,10 +1016,13 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) } if (hdev->log_enabled) { + uint64_t log_base; + hdev->log_size = vhost_get_log_size(hdev); hdev->log = hdev->log_size ? g_malloc0(hdev->log_size * sizeof *hdev->log) : NULL; - r = hdev->vhost_ops->vhost_call(hdev, VHOST_SET_LOG_BASE, hdev->log); + log_base = (uint64_t)(unsigned long)log_base; + r = hdev->vhost_ops->vhost_call(hdev, VHOST_SET_LOG_BASE, &log_base); if (r < 0) { r = -errno; goto fail_log; -- MST