From patchwork Mon Mar 23 14:32:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: BALATON Zoltan X-Patchwork-Id: 1260072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=eik.bme.hu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48mH4D3lplz9sNg for ; Tue, 24 Mar 2020 01:35:56 +1100 (AEDT) Received: from localhost ([::1]:34610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGOBG-000837-CY for incoming@patchwork.ozlabs.org; Mon, 23 Mar 2020 10:35:54 -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> 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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; @@ -252,7 +253,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp) SiI3112PCIState *d = SII3112_PCI(dev); PCIIDEState *s = PCI_IDE(dev); MemoryRegion *mr; - qemu_irq *irq; int i; 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, 16); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, mr); - irq = qemu_allocate_irqs(sii3112_set_irq, d, 2); + d->irqs = qemu_allocate_irqs(sii3112_set_irq, d, 2); for (i = 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]); bmdma_init(&s->bus[i], &s->bmdma[i], s); s->bmdma[i].bus = &s->bus[i]; @@ -291,6 +291,13 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp) } } +static void sii3112_unrealize(DeviceState *dev, Error **errp) +{ + SiI3112PCIState *d = SII3112_PCI(dev); + + qemu_free_irqs(d->irqs, 2); +} + static void sii3112_pci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -301,6 +308,7 @@ static void sii3112_pci_class_init(ObjectClass *klass, void *data) pd->class_id = PCI_CLASS_STORAGE_RAID; pd->revision = 1; pd->realize = sii3112_pci_realize; + dc->unrealize = sii3112_unrealize; dc->reset = sii3112_reset; dc->desc = "SiI3112A SATA controller"; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);