| Message ID | 20091213122358.10712.96713.stgit@skyserv |
|---|---|
| State | New |
| Headers | show |
On Sun, Dec 13, 2009 at 12:23 PM, Igor V. Kovalenko <igor.v.kovalenko@gmail.com> wrote: > From: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> > > This is a workaround only, and is a partial revert > of a few changes to BMDMAState which removed pci_dev > field on the way. > > - cmd646 pci_from_bm() expects bm->unit value to > correspond with bm data being passed to callback > as opaque pointer. This breaks when write to dma > control register of second channel happens when no > dma operation is in progress, so bm->unit is zero > for second channel, and pci_from_bm() returns garbage > pointer. Crash happens shortly after that while > dereferencing that pointer. > static PCIIDEState *pci_from_bm(BMDMAState *bm) > { > + return bm->pci_dev; > if (bm->unit == 0) { > return container_of(bm, PCIIDEState, bmdma[0]); > } else { I think you should delete the rest of the function, unused code is useless and if someone decides to fix and restore the old code, they can fetch it from git.
On Sun, Dec 13, 2009 at 6:50 PM, Blue Swirl <blauwirbel@gmail.com> wrote: > On Sun, Dec 13, 2009 at 12:23 PM, Igor V. Kovalenko > <igor.v.kovalenko@gmail.com> wrote: >> From: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> >> >> This is a workaround only, and is a partial revert >> of a few changes to BMDMAState which removed pci_dev >> field on the way. >> >> - cmd646 pci_from_bm() expects bm->unit value to >> correspond with bm data being passed to callback >> as opaque pointer. This breaks when write to dma >> control register of second channel happens when no >> dma operation is in progress, so bm->unit is zero >> for second channel, and pci_from_bm() returns garbage >> pointer. Crash happens shortly after that while >> dereferencing that pointer. > >> static PCIIDEState *pci_from_bm(BMDMAState *bm) >> { >> + return bm->pci_dev; >> if (bm->unit == 0) { >> return container_of(bm, PCIIDEState, bmdma[0]); >> } else { > > I think you should delete the rest of the function, unused code is > useless and if someone decides to fix and restore the old code, they > can fetch it from git. Thanks, resent with this change.
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index e1e626e..eafa118 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -70,6 +70,7 @@ static void ide_map(PCIDevice *pci_dev, int region_num, static PCIIDEState *pci_from_bm(BMDMAState *bm) { + return bm->pci_dev; if (bm->unit == 0) { return container_of(bm, PCIIDEState, bmdma[0]); } else { @@ -145,6 +146,7 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num, BMDMAState *bm = &d->bmdma[i]; d->bus[i].bmdma = bm; bm->bus = d->bus+i; + bm->pci_dev = d; qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm); register_ioport_write(addr, 1, 1, bmdma_cmd_writeb, bm); diff --git a/hw/ide/internal.h b/hw/ide/internal.h index f937daa..eb5b404 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -474,6 +474,7 @@ struct BMDMAState { uint8_t status; uint32_t addr; + struct PCIIDEState *pci_dev; IDEBus *bus; /* current transfer state */ uint32_t cur_addr; diff --git a/hw/ide/piix.c b/hw/ide/piix.c index de36480..2776ac3 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -78,6 +78,7 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num, BMDMAState *bm = &d->bmdma[i]; d->bus[i].bmdma = bm; bm->bus = d->bus+i; + bm->pci_dev = d; qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm); register_ioport_write(addr, 1, 1, bmdma_cmd_writeb, bm);