From patchwork Sun Dec 13 12:23:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Igor V. Kovalenko" X-Patchwork-Id: 41029 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 291AFB6F05 for ; Sun, 13 Dec 2009 23:25:19 +1100 (EST) Received: from localhost ([127.0.0.1]:47961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJnVj-0005Gz-Su for incoming@patchwork.ozlabs.org; Sun, 13 Dec 2009 07:25:15 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NJnUb-0005GS-Re for qemu-devel@nongnu.org; Sun, 13 Dec 2009 07:24:06 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NJnUX-0005Fo-TZ for qemu-devel@nongnu.org; Sun, 13 Dec 2009 07:24:05 -0500 Received: from [199.232.76.173] (port=35831 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJnUX-0005Fl-L9 for qemu-devel@nongnu.org; Sun, 13 Dec 2009 07:24:01 -0500 Received: from mail-fx0-f219.google.com ([209.85.220.219]:41574) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NJnUX-0006OD-CQ for qemu-devel@nongnu.org; Sun, 13 Dec 2009 07:24:01 -0500 Received: by fxm19 with SMTP id 19so2314154fxm.17 for ; Sun, 13 Dec 2009 04:23:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:subject:to:from:date :message-id:user-agent:mime-version:content-type :content-transfer-encoding; bh=55u1PC9Earyfiri/fOYFXbABv7hBEgiP5m4r/+LHACk=; b=Snet+q2WHU5Oom8hZ8BpDlE0Pme9PUmKi07N02/pGseOzWBIFzAesPJoksXyxegDY6 LPGbgx56GzDIqSEIdUICuYFRzLiz4NgDqO9xBrLTkMuhsWYy0PR14+2lgmBH31JBWYvY Fudnkj4IZTYDGIWLiW6mANTiPZAmZ1Isi95dM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:to:from:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; b=NNr8F9rb1eq516XMnjaql36pifhLFHiV+dFX0LrsHc2gXWbnIL/bSpRYDsDG0TIUfV bSoyo23YPgmMOPc6nZuTYITNeJf7SdD+WkmPuxR0eijOEGziglodLbrvZ8nrYjr2f/GT D8ViEUW+B2jec8f5QGifhfufWYP/rWCVGsSf0= Received: by 10.223.4.216 with SMTP id 24mr3953097fas.67.1260707039649; Sun, 13 Dec 2009 04:23:59 -0800 (PST) Received: from skyserv (host-87-255-14-75.bigtelecom.ru [87.255.14.75]) by mx.google.com with ESMTPS id 16sm1220620fxm.12.2009.12.13.04.23.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 13 Dec 2009 04:23:59 -0800 (PST) Received: from localhost ([127.0.0.1] helo=[192.168.1.2]) by skyserv with esmtp (Exim 4.71) (envelope-from ) id 1NJnUU-0002n9-Dz for qemu-devel@nongnu.org; Sun, 13 Dec 2009 15:23:58 +0300 To: qemu-devel@nongnu.org From: "Igor V. Kovalenko" Date: Sun, 13 Dec 2009 15:23:58 +0300 Message-ID: <20091213122358.10712.96713.stgit@skyserv> User-Agent: StGit/0.15 MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] workaround for cmd646 bmdma register access while no dma is active X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Igor V. Kovalenko 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. Signed-off-by: Igor V. Kovalenko --- hw/ide/cmd646.c | 2 ++ hw/ide/internal.h | 1 + hw/ide/piix.c | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) 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);