[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] spice-qemu-char: vmc_write: Don't write more by
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 9/9] spice-qemu-char: vmc_write: Don't write more bytes then we're asked too |
Date: |
Tue, 16 Apr 2013 11:56:34 +0200 |
From: Hans de Goede <address@hidden>
This one took me eons to debug, but I've finally found it now, oh well.
The usage of the MIN macro in this line:
last_out = MIN(len, qemu_chr_be_can_write(scd->chr));
Causes qemu_chr_be_can_write to be called *twice*, since the MIN macro
evaluates its arguments twice (bad MIN macro, bad!). And the result of
the call can change between the 2 calls since the guest may have consumed
some data from the virtio ringbuffer between the calls!
When this happens it is possible for qemu_chr_be_can_write to return less
then len in the call made for the comparision, and then to return more then
len in the actual call for the return-value of MIN, after which we will end
up writing len data + some extra garbage, not good.
This patch fixes this by only calling qemu_chr_be_can_write once.
Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
spice-qemu-char.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index ff95fcb..f10970c 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -35,7 +35,8 @@ static int vmc_write(SpiceCharDeviceInstance *sin, const
uint8_t *buf, int len)
uint8_t* p = (uint8_t*)buf;
while (len > 0) {
- last_out = MIN(len, qemu_chr_be_can_write(scd->chr));
+ int can_write = qemu_chr_be_can_write(scd->chr);
+ last_out = MIN(len, can_write);
if (last_out <= 0) {
break;
}
--
1.7.9.7
- [Qemu-devel] [PULL 0/9] spice patch queue, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 1/9] qxl: add 4k + 8k resolutions, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 2/9] qxl: add 2000x2000 and 2048x2048 video modes, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 3/9] spice: (32 bit only) fix surface cmd tracking destruction, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 5/9] virtio-console: Remove any pending watches on close, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 6/9] spice-qemu-char: Remove #ifdef-ed code for old spice-server compat, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 8/9] spice-qemu-char: Remove intermediate buffer, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 4/9] virtio-console: Also throttle when less was written then requested, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 7/9] spice-qemu-char: Add watch support, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 9/9] spice-qemu-char: vmc_write: Don't write more bytes then we're asked too,
Gerd Hoffmann <=