From nobody Mon Feb 9 17:25:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522071766130530.8211177200357; Mon, 26 Mar 2018 06:42:46 -0700 (PDT) Received: from localhost ([::1]:56825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0SOb-000377-6T for importer@patchew.org; Mon, 26 Mar 2018 09:42:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0SJ0-0006Xu-5N for qemu-devel@nongnu.org; Mon, 26 Mar 2018 09:36:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0SIy-0006x4-Rk for qemu-devel@nongnu.org; Mon, 26 Mar 2018 09:36:58 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:43527) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0SIy-0006wg-Ha for qemu-devel@nongnu.org; Mon, 26 Mar 2018 09:36:56 -0400 Received: by mail-wr0-x243.google.com with SMTP id p53so11428468wrc.10 for ; Mon, 26 Mar 2018 06:36:56 -0700 (PDT) Received: from 640k.lan (94-36-194-48.adsl-ull.clienti.tiscali.it. [94.36.194.48]) by smtp.gmail.com with ESMTPSA id g186sm6710105wmd.41.2018.03.26.06.36.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 06:36:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TIQFbuBHF9W+q4sdZrhh18lOuYxxO6Y/bpkZr26XGiE=; b=Wvt8QfwHQUFtkqphyEKQ8xpbcRJPlyDEMdpAQ9Eh/SanNNOKvCrvcrJ3A/rfPvV/Ih l1I955qMkVWnrzG5A8m2HdqM3UDRyXTHjWkVdAF9Zc/9l/5aewUiAspnflMuhQltw2gB DmpJXG7jfue9Mcl6Z6RbzrtvbJ1eKCBa04BqsNEc7H/aWHGeWERYL8yLrJjcmuUXdm3N cEHhVzDTXTVOhlWG/DJ0arXL2mdUBREAno0htw4X085nNiV6k9rlaEjQUqtpdGKRAclL rLE9OTq+feVG/LmUuDbJT81DVF8dOqtfKtL+cZSJPpoHpirBznrxZJAQ0vsNQJdL+6V3 7KQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=TIQFbuBHF9W+q4sdZrhh18lOuYxxO6Y/bpkZr26XGiE=; b=t1HZBEWAPRT4MQOXN6S7mvJH9eLLD8WPPlLREf8Il4dSg/WQCkBdqTqwmRkIodu9h7 jZbD27KAf+I7XE5HTnumXGCvP4Jd11kQu7DeATjkbZPW3pVQIYW7GzU9hFYkyItK5gPK hbhtbBqBudK2u/cnJGSI2+XzldvPW1lYFPpa6kaedccZNdjDTodwkZjmjeAKHGz8hw6S yuIqhcjqSFhLExvCQZyVOc6YuZz/807m5YVDUjtvGCOzR1NRD0+dwmw7aIv3NoJttB8k JHKwd0ZEGUk9zlXU9czvfx0tEo6SQuSKGnqiEPjbEWvEzkZlbrVXtAuXJKxcJCuinEjz GNMA== X-Gm-Message-State: AElRT7FiteAqWKuvN2I6F/fw/Q1HLEPv/ILqs9IRVOU8CdT/bHBV2cLe xl84gez2zsJ0QFecAN14DkqcO+Av X-Google-Smtp-Source: AG47ELtm8R+Y4rdS46TSQuVgEcp0NPXtY3MXTTZNp57s6ohZaS3KrMclVrM1j2glqhbkyVBKK21MHw== X-Received: by 10.223.128.98 with SMTP id 89mr30719515wrk.141.1522071415097; Mon, 26 Mar 2018 06:36:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2018 15:36:34 +0200 Message-Id: <1522071403-52486-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1522071403-52486-1-git-send-email-pbonzini@redhat.com> References: <1522071403-52486-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 07/16] hw/audio: Fix crashes when devices are used on ISA bus without DMA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The cs4231a, gus and sb16 sound cards crash QEMU when the user tries to instantiate them on a machine with DMA-less ISA bus (for example with "qemu-system-mips64el -M mips -device sb16"). Add proper checks to the realize functions to avoid the crashes. Signed-off-by: Thomas Huth Message-Id: <1521193892-15552-4-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- hw/audio/cs4231a.c | 8 +++++++- hw/audio/gus.c | 7 ++++++- hw/audio/sb16.c | 9 +++++++-- scripts/device-crash-test | 3 --- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 096e8e9..aaebec1 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -28,6 +28,7 @@ #include "hw/isa/isa.h" #include "hw/qdev.h" #include "qemu/timer.h" +#include "qapi/error.h" =20 /* Missing features: @@ -663,8 +664,13 @@ static void cs4231a_realizefn (DeviceState *dev, Error= **errp) CSState *s =3D CS4231A (dev); IsaDmaClass *k; =20 - isa_init_irq (d, &s->pic, s->irq); s->isa_dma =3D isa_get_dma(isa_bus_from_device(d), s->dma); + if (!s->isa_dma) { + error_setg(errp, "ISA controller does not support DMA"); + return; + } + + isa_init_irq(d, &s->pic, s->irq); k =3D ISADMA_GET_CLASS(s->isa_dma); k->register_channel(s->isa_dma, s->dma, cs_dma_read, s); =20 diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 3e864cd..8e0b27e 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -241,6 +241,12 @@ static void gus_realizefn (DeviceState *dev, Error **e= rrp) IsaDmaClass *k; struct audsettings as; =20 + s->isa_dma =3D isa_get_dma(isa_bus_from_device(d), s->emu.gusdma); + if (!s->isa_dma) { + error_setg(errp, "ISA controller does not support DMA"); + return; + } + AUD_register_card ("gus", &s->card); =20 as.freq =3D s->freq; @@ -272,7 +278,6 @@ static void gus_realizefn (DeviceState *dev, Error **er= rp) isa_register_portio_list(d, &s->portio_list2, (s->port + 0x100) & 0xf0= 0, gus_portio_list2, s, "gus"); =20 - s->isa_dma =3D isa_get_dma(isa_bus_from_device(d), s->emu.gusdma); k =3D ISADMA_GET_CLASS(s->isa_dma); k->register_channel(s->isa_dma, s->emu.gusdma, GUS_read_DMA, s); s->emu.himemaddr =3D s->himem; diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 31de264..5a4d323 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -1371,6 +1371,13 @@ static void sb16_realizefn (DeviceState *dev, Error = **errp) SB16State *s =3D SB16 (dev); IsaDmaClass *k; =20 + s->isa_hdma =3D isa_get_dma(isa_bus_from_device(isadev), s->hdma); + s->isa_dma =3D isa_get_dma(isa_bus_from_device(isadev), s->dma); + if (!s->isa_dma || !s->isa_hdma) { + error_setg(errp, "ISA controller does not support DMA"); + return; + } + isa_init_irq (isadev, &s->pic, s->irq); =20 s->mixer_regs[0x80] =3D magic_of_irq (s->irq); @@ -1389,11 +1396,9 @@ static void sb16_realizefn (DeviceState *dev, Error = **errp) isa_register_portio_list(isadev, &s->portio_list, s->port, sb16_ioport_list, s, "sb16"); =20 - s->isa_hdma =3D isa_get_dma(isa_bus_from_device(isadev), s->hdma); k =3D ISADMA_GET_CLASS(s->isa_hdma); k->register_channel(s->isa_hdma, s->hdma, SB_read_DMA, s); =20 - s->isa_dma =3D isa_get_dma(isa_bus_from_device(isadev), s->dma); k =3D ISADMA_GET_CLASS(s->isa_dma); k->register_channel(s->isa_dma, s->dma, SB_read_DMA, s); =20 diff --git a/scripts/device-crash-test b/scripts/device-crash-test index f04f349..c1b2c78 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -218,10 +218,7 @@ ERROR_WHITELIST =3D [ {'exitcode':-6, 'log':r"Object .* is not an instance of type e500-ccsr= ", 'loglevel':logging.ERROR}, {'exitcode':-6, 'log':r"vmstate_register_with_alias_id: Assertion `!se= ->compat \|\| se->instance_id =3D=3D 0' failed", 'loglevel':logging.ERROR}, {'exitcode':-6, 'device':'isa-fdc', 'loglevel':logging.ERROR, 'expecte= d':True}, - {'exitcode':-11, 'device':'gus', 'loglevel':logging.ERROR, 'expected':= True}, {'exitcode':-11, 'device':'isa-serial', 'loglevel':logging.ERROR, 'exp= ected':True}, - {'exitcode':-11, 'device':'sb16', 'loglevel':logging.ERROR, 'expected'= :True}, - {'exitcode':-11, 'device':'cs4231a', 'loglevel':logging.ERROR, 'expect= ed':True}, {'exitcode':-11, 'machine':'isapc', 'device':'.*-iommu', 'loglevel':lo= gging.ERROR, 'expected':True}, {'exitcode':-11, 'device':'mioe3680_pci', 'loglevel':logging.ERROR, 'e= xpected':True}, {'exitcode':-11, 'device':'pcm3680_pci', 'loglevel':logging.ERROR, 'ex= pected':True}, --=20 1.8.3.1