virtio-gpu: fix unmap in error path
PATCH 1/1 virtio-gpu: fix unmap in error path
We land here in case not everything we've asked for could be mapped. So unmap only the bytes which have actually been mapped.
Also we didn't access anything, so acces_len can be 0.
--- hw/display/virtio-gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/display/virtio-gpu.c +2 -2
@@ -1048,9 +1048,9 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,if (res->iov[i].iov_base) {dma_memory_unmap (VIRTIO_DEVICE (g)->dma_as, res->iov[i].iov_base, - res->iov[i].iov_len, + len,DMA_DIRECTION_TO_DEVICE , - res->iov[i].iov_len); +0 ); }/* ...and the mappings for previous loop iterations */ res->iov_cnt = i;
Signature · 1 line
2.18.1
Quoted 4 lines · Gerd Hoffmann
We land here in case not everything we've asked for could be mapped. So unmap only the bytes which have actually been mapped.
Also we didn't access anything, so
acces_lencan be 0.
s/acces_len/access_len/
With that:
Thank you!
Laszlo
Quoted 24 lines
Reported-by Laszlo Ersek <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- hw/display/virtio-gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/display/virtio-gpu.c +2
-2@@ -1048,9 +1048,9 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,if (res->iov[i].iov_base) {dma_memory_unmap (VIRTIO_DEVICE (g)->dma_as, res->iov[i].iov_base, - res->iov[i].iov_len, + len,DMA_DIRECTION_TO_DEVICE , - res->iov[i].iov_len); +0 ); }/* ...and the mappings for previous loop iterations */ res->iov_cnt = i;
Quoted 8 lines · Gerd Hoffmann <[email protected]> 于2019年6月28日周五 下午3:24写道:
We land here in case not everything we've asked for could be mapped. So unmap only the bytes which have actually been mapped.
Also we didn't access anything, so
acces_lencan be 0.Reported-by Laszlo Ersek <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>
It is reasonable, so
btw: Does it break something before this patch?
AFAICS, the 'len' is not used for the unmap, only the 'access_len' is used.
Thanks,
Li Qiang
Quoted 26 lines
--- hw/display/virtio-gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/display/virtio-gpu.c +2
-2@@ -1048,9 +1048,9 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size, if (res->iov[i].iov_base) {dma_memory_unmap (VIRTIO_DEVICE (g)->dma_as, res->iov[i].iov_base, - res->iov[i].iov_len, + len,DMA_DIRECTION_TO_DEVICE , - res->iov[i].iov_len); +0 ); }/* ...and the mappings for previous loop iterations */ res->iov_cnt = i;--
2.18.1