* [Qemu-devel] [PATCH v3] vhost: fix log base address
@ 2015-04-17 14:56 Michael S. Tsirkin
2015-04-17 15:04 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Michael S. Tsirkin @ 2015-04-17 14:56 UTC (permalink / raw)
To: qemu-devel
VHOST_SET_LOG_BASE got an incorrect address, causing
migration errors and potentially even memory corruption.
Reported-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
Built only.
Will test and report next week.
Wen Congyang, can you pls confirm as well?
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..e4cf9d7 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)hdev->log;
+ r = hdev->vhost_ops->vhost_call(hdev, VHOST_SET_LOG_BASE, &log_base);
if (r < 0) {
r = -errno;
goto fail_log;
--
MST
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH v3] vhost: fix log base address
2015-04-17 14:56 [Qemu-devel] [PATCH v3] vhost: fix log base address Michael S. Tsirkin
@ 2015-04-17 15:04 ` Peter Maydell
2015-04-17 15:13 ` Michael S. Tsirkin
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2015-04-17 15:04 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: QEMU Developers
On 17 April 2015 at 15:56, Michael S. Tsirkin <mst@redhat.com> wrote:
> VHOST_SET_LOG_BASE got an incorrect address, causing
> migration errors and potentially even memory corruption.
>
> Reported-by: Wen Congyang <wency@cn.fujitsu.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>
> Built only.
> Will test and report next week.
> Wen Congyang, can you pls confirm as well?
>
> 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..e4cf9d7 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)hdev->log;
Paolo asked you to make this cast just be a single (uintptr_t).
thanks
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH v3] vhost: fix log base address
2015-04-17 15:04 ` Peter Maydell
@ 2015-04-17 15:13 ` Michael S. Tsirkin
0 siblings, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2015-04-17 15:13 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On Fri, Apr 17, 2015 at 04:04:38PM +0100, Peter Maydell wrote:
> On 17 April 2015 at 15:56, Michael S. Tsirkin <mst@redhat.com> wrote:
> > VHOST_SET_LOG_BASE got an incorrect address, causing
> > migration errors and potentially even memory corruption.
> >
> > Reported-by: Wen Congyang <wency@cn.fujitsu.com>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >
> > Built only.
> > Will test and report next week.
> > Wen Congyang, can you pls confirm as well?
> >
> > 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..e4cf9d7 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)hdev->log;
>
> Paolo asked you to make this cast just be a single (uintptr_t).
>
> thanks
> -- PMM
done.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-17 15:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-17 14:56 [Qemu-devel] [PATCH v3] vhost: fix log base address Michael S. Tsirkin
2015-04-17 15:04 ` Peter Maydell
2015-04-17 15:13 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).