From nobody Mon Apr 29 07:51:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1584974191; cv=none; d=zohomail.com; s=zohoarc; b=cTn/8EbAsfVuNML5BD7rE6B6oplRClrlstnfMAPebm8lTLlJlg4wViNl1cWzfyjPzJwlUYQAIql/umI1L1sLb9E9BSGE7wqeTbsAxURqRR+fpV8kUFiTK/8YYVxxqDy5HA6hTVnTH5k8LlFVGgIXy/fxyP7N+PjCZCCepeITWhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584974191; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=p+JyGQQ7UJQ25hRlvoHCmoTV9CJrz6T6VYsftZ52BTM=; b=dLam2TRNOsRKUgJjAYKngZxkSXZ+AWKX9EXWfWYgThFX2rw1EGjIEk2MS2RKukqczFNmUAGVzHiFL0VoBQCc4g123GsYDuXOTiQ/Hm5dYIRWZd1HBWR99rfP1wP+tXbEVuoWJFsVDUVvf56Fx8CStaaZd3jnUBe3c3wcHbA/pnE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584974191480784.4831259184659; Mon, 23 Mar 2020 07:36:31 -0700 (PDT) Received: from localhost ([::1]:34650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGOBp-0001Jt-T9 for importer@patchew.org; Mon, 23 Mar 2020 10:36:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41270) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGOAj-0007yi-VO for qemu-devel@nongnu.org; Mon, 23 Mar 2020 10:35:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGOAi-0005mC-Mn for qemu-devel@nongnu.org; Mon, 23 Mar 2020 10:35:21 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:10310) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGOAe-0005lP-R1; Mon, 23 Mar 2020 10:35:17 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 05C06747E06; Mon, 23 Mar 2020 15:35:15 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id DB3B4747E04; Mon, 23 Mar 2020 15:35:14 +0100 (CET) From: BALATON Zoltan Subject: [PATCH] ide/sii3112: Avoid leaking irqs array Date: Mon, 23 Mar 2020 15:32:25 +0100 MIME-Version: 1.0 To: qemu-devel@nongnu.org, qemu-block@nongnu.org Message-Id: <20200323143514.DB3B4747E04@zero.eik.bme.hu> Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 152.66.115.2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , philmd@redhat.com, John Snow , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Coverity CID 1421984 reports a leak in allocated irqs, this patch attempts to plug that. Signed-off-by: BALATON Zoltan --- hw/ide/sii3112.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 06605d7af2..c886916873 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -31,6 +31,7 @@ typedef struct SiI3112Regs { typedef struct SiI3112PCIState { PCIIDEState i; MemoryRegion mmio; + qemu_irq *irqs; SiI3112Regs regs[2]; } SiI3112PCIState; =20 @@ -252,7 +253,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error *= *errp) SiI3112PCIState *d =3D SII3112_PCI(dev); PCIIDEState *s =3D PCI_IDE(dev); MemoryRegion *mr; - qemu_irq *irq; int i; =20 pci_config_set_interrupt_pin(dev->config, 1); @@ -280,10 +280,10 @@ static void sii3112_pci_realize(PCIDevice *dev, Error= **errp) memory_region_init_alias(mr, OBJECT(d), "sii3112.bar4", &d->mmio, 0, 1= 6); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, mr); =20 - irq =3D qemu_allocate_irqs(sii3112_set_irq, d, 2); + d->irqs =3D qemu_allocate_irqs(sii3112_set_irq, d, 2); for (i =3D 0; i < 2; i++) { ide_bus_new(&s->bus[i], sizeof(s->bus[i]), DEVICE(dev), i, 1); - ide_init2(&s->bus[i], irq[i]); + ide_init2(&s->bus[i], d->irqs[i]); =20 bmdma_init(&s->bus[i], &s->bmdma[i], s); s->bmdma[i].bus =3D &s->bus[i]; @@ -291,6 +291,13 @@ static void sii3112_pci_realize(PCIDevice *dev, Error = **errp) } } =20 +static void sii3112_unrealize(DeviceState *dev, Error **errp) +{ + SiI3112PCIState *d =3D SII3112_PCI(dev); + + qemu_free_irqs(d->irqs, 2); +} + static void sii3112_pci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -301,6 +308,7 @@ static void sii3112_pci_class_init(ObjectClass *klass, = void *data) pd->class_id =3D PCI_CLASS_STORAGE_RAID; pd->revision =3D 1; pd->realize =3D sii3112_pci_realize; + dc->unrealize =3D sii3112_unrealize; dc->reset =3D sii3112_reset; dc->desc =3D "SiI3112A SATA controller"; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); --=20 2.21.1