]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
hw/i386/amd_iommu.c: Fix corruption of log events passed to guest
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Mar 2020 10:53:49 +0000 (10:53 +0000)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 10 Jun 2020 02:00:52 +0000 (21:00 -0500)
In the function amdvi_log_event(), we write an event log buffer
entry into guest ram, whose contents are passed to the function
via the "uint64_t *evt" argument. Unfortunately, a spurious
'&' in the call to dma_memory_write() meant that instead of
writing the event to the guest we would write the literal value
of the pointer, plus whatever was in the following 8 bytes
on the stack. This error was spotted by Coverity.

Fix the bug by removing the '&'.

Fixes: CID 1421945
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200326105349.24588-1-peter.maydell@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 32a2d6b1f6b4405f0fc20c031e61d5d48e3d9cd1)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/i386/amd_iommu.c

index d55dbf07fc151ea2f06c499e244112f4b09df04d..ac5f2fddc5463e4c8776ac2f5036e7d1f7ccf2d0 100644 (file)
@@ -181,7 +181,7 @@ static void amdvi_log_event(AMDVIState *s, uint64_t *evt)
     }
 
     if (dma_memory_write(&address_space_memory, s->evtlog + s->evtlog_tail,
-        &evt, AMDVI_EVENT_LEN)) {
+                         evt, AMDVI_EVENT_LEN)) {
         trace_amdvi_evntlog_fail(s->evtlog, s->evtlog_tail);
     }