summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-11-25 12:06:22 +0100
committerKevin Wolf <kwolf@redhat.com>2011-12-15 12:40:33 +0100
commitbd83b3620517ef9f2079cfda465953e60263f623 (patch)
treef9b07a82ad4e56215f022dc5a6142c32f87bd6d6
parent16d2fc002a01cdd77e696ecc69de54db6720476a (diff)
downloadfocaccia-qemu-bd83b3620517ef9f2079cfda465953e60263f623.tar.gz
focaccia-qemu-bd83b3620517ef9f2079cfda465953e60263f623.zip
qiov: prevent double free or use-after-free
qemu_iovec_destroy does not clear the QEMUIOVector fully, and the data
could thus be used after free or freed again.  While I do not know any
example in the tree, I observed this using virtio-scsi (and SCSI
scatter/gather) when canceling DMA requests.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--cutils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/cutils.c b/cutils.c
index 6db6304bb4..24b3fe355b 100644
--- a/cutils.c
+++ b/cutils.c
@@ -217,7 +217,10 @@ void qemu_iovec_destroy(QEMUIOVector *qiov)
 {
     assert(qiov->nalloc != -1);
 
+    qemu_iovec_reset(qiov);
     g_free(qiov->iov);
+    qiov->nalloc = 0;
+    qiov->iov = NULL;
 }
 
 void qemu_iovec_reset(QEMUIOVector *qiov)