[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] megasas: do not call pci_dma_unmap after having
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 1/6] megasas: do not call pci_dma_unmap after having freed the frame once |
Date: |
Mon, 28 Nov 2016 23:40:32 +0100 |
Commit 8cc4678 ("megasas: remove useless check for cmd->frame", 2016-07-17) was
wrong because I trusted Coverity too much. It turns out that there _is_ a
path through which cmd->frame can become NULL. After megasas_handle_frame's
switch (md->frame->header.frame_cmd), megasas_init_firmware can be called.
>From there, megasas_reset_frames will call megasas_unmap_frame which resets
cmd->frame = NULL.
However, there is another bug to fix in there, because megasas_unmap_frame
is called again after setting the command status. In this case QEMU should
not do anything, instead it calls pci_dma_unmap again. Harmless, but
better fix it.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/megasas.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 52a4123..ca62952 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -461,9 +461,12 @@ static void megasas_unmap_frame(MegasasState *s,
MegasasCmd *cmd)
{
PCIDevice *p = PCI_DEVICE(s);
- pci_dma_unmap(p, cmd->frame, cmd->pa_size, 0, 0);
+ if (cmd->pa_size) {
+ pci_dma_unmap(p, cmd->frame, cmd->pa_size, 0, 0);
+ }
cmd->frame = NULL;
cmd->pa = 0;
+ cmd->pa_size = 0;
clear_bit(cmd->index, s->frame_map);
}
--
1.8.3.1
- [Qemu-devel] [PULL 0/6] More patches for QEMU 2.8-rc2, Paolo Bonzini, 2016/11/28
- [Qemu-devel] [PULL 1/6] megasas: do not call pci_dma_unmap after having freed the frame once,
Paolo Bonzini <=
- [Qemu-devel] [PULL 2/6] megasas: clean up and fix request completion/cancellation, Paolo Bonzini, 2016/11/28
- [Qemu-devel] [PULL 3/6] pci-assign: sync MSI/MSI-X cap and table with PCIDevice, Paolo Bonzini, 2016/11/28
- [Qemu-devel] [PULL 4/6] migration/pcspk: Add a property to state if pcspk is migrated, Paolo Bonzini, 2016/11/28
- [Qemu-devel] [PULL 5/6] migration/pcspk: Turn migration of pcspk off for 2.7 and older, Paolo Bonzini, 2016/11/28
- [Qemu-devel] [PULL 6/6] rules.mak: Use -r instead of -Wl, -r to fix building when PIE is default, Paolo Bonzini, 2016/11/28
- Re: [Qemu-devel] [PULL 0/6] More patches for QEMU 2.8-rc2, Stefan Hajnoczi, 2016/11/29
- Re: [Qemu-devel] [PULL 0/6] More patches for QEMU 2.8-rc2, Stefan Hajnoczi, 2016/11/29