From patchwork Sat Oct 1 17:06:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Kiarie X-Patchwork-Id: 9359321 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B2B97600C8 for ; Sat, 1 Oct 2016 17:07:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DE7A28AB0 for ; Sat, 1 Oct 2016 17:07:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91C9328B50; Sat, 1 Oct 2016 17:07:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3AAFA28AB0 for ; Sat, 1 Oct 2016 17:07:01 +0000 (UTC) Received: from localhost ([::1]:56590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bqNka-0007oH-AK for patchwork-qemu-devel@patchwork.kernel.org; Sat, 01 Oct 2016 13:07:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bqNkB-0007kJ-Ad for qemu-devel@nongnu.org; Sat, 01 Oct 2016 13:06:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bqNk9-0000kQ-95 for qemu-devel@nongnu.org; Sat, 01 Oct 2016 13:06:34 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bqNk9-0000kJ-2M for qemu-devel@nongnu.org; Sat, 01 Oct 2016 13:06:33 -0400 Received: by mail-wm0-x241.google.com with SMTP id f193so3286573wmg.2 for ; Sat, 01 Oct 2016 10:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Pm9vrd9QmChNRrXpWulZ0UNvmRJ0VBoqc1/Yq0P3Uv4=; b=fvEEVVZj/AYlOszzhN19RXtJUErXeSjviMhsCyQbLd7DC+Hto8mtRh1cji37iIAnig HE/W52XXPVcsx7MmUkw2Y3c8/zkXln1JrFrmxMvVpV8DGAmdWoDBlMfphFtGUh/1Qo/j 1cvuZ4lbWEUt1GdHp7HEhYsIGFjwM4HVHWMsDpVxyhjvtV8WGwtHJ3iHyUZnKg2dmd0j w45RT3vGwFgx93mlmNCHS/UMSnjax2StNzmX1vJS0R2EABJAh4RDtza81FKUijU3hzAD WEjPqJeNxabuaqYYXCKAssbuOFAU0RtlJSca0IPScXeJLakKm97Mv4c3AUnvgmydi8sG wFcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Pm9vrd9QmChNRrXpWulZ0UNvmRJ0VBoqc1/Yq0P3Uv4=; b=U46cEIAdf8U1ZZBevOIivO9PDLACP0xjfF0H3C3rHXBEKiwsCQaiu5QUDgQHqwN+da z4iPrcQmUe/XeV0Lo+7E09JFwNTudrTq0w9/bOLN5zkDT6D5Kkfk6vxHXBawYOV1gKOb ViO4BSUnD/YgfVHZrbwhqEc95l8DQc66DMd1CHCihwb8uAaIDrZb59ZT0IJyY7rSAiVY SFjS2bzkmlHkwFl3NZM/AXrdG5nHa8vgTcvh2kfSKRYY3fu2rm1YfWKbSayBIe37fIDH ovvmfzY/cvxaIjmiccx1kX8f153eiKrosZN+lRZp7nyYz63+PwFtkptmajugkr9lvYO3 osZg== X-Gm-Message-State: AA6/9RmTOVJcFSN0Cz5JeIn2Rezc5k3/YPFX8l6Px3hZ0kiPDQA59I37Hk4rfyl9q6liMA== X-Received: by 10.194.51.5 with SMTP id g5mr11294541wjo.68.1475341592435; Sat, 01 Oct 2016 10:06:32 -0700 (PDT) Received: from debian.ameoba ([154.122.36.255]) by smtp.googlemail.com with ESMTPSA id r2sm10000158wmf.14.2016.10.01.10.06.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 01 Oct 2016 10:06:32 -0700 (PDT) From: David Kiarie To: qemu-devel@nongnu.org Date: Sat, 1 Oct 2016 20:06:01 +0300 Message-Id: <1475341561-32440-2-git-send-email-davidkiarie4@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1475341561-32440-1-git-send-email-davidkiarie4@gmail.com> References: <1475341561-32440-1-git-send-email-davidkiarie4@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH V2] hw/iommu: Fix problems reported by Coverity scan 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: peter.maydell@linaro.org, mst@redhat.com, sw@weilnetz.de, peterx@redhat.com, jan.kiszka@web.de, pbonzini@redhat.com, David Kiarie Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: David Kiarie --- hw/i386/amd_iommu.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 023de52..886c72b 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -144,7 +144,7 @@ static void amdvi_assign_andq(AMDVIState *s, hwaddr addr, uint64_t val) static void amdvi_generate_msi_interrupt(AMDVIState *s) { MSIMessage msg; - MemTxAttrs attrs; + MemTxAttrs attrs = {0, 0}; attrs.requester_id = pci_requester_id(&s->pci.dev); @@ -185,7 +185,7 @@ static void amdvi_setevent_bits(uint64_t *buffer, uint64_t value, int start, int length) { int index = start / 64, bitpos = start % 64; - uint64_t mask = ((1 << length) - 1) << bitpos; + uint64_t mask = ((1UL << length) - 1) << bitpos; buffer[index] &= ~mask; buffer[index] |= (value << bitpos) & mask; } @@ -333,8 +333,8 @@ static void amdvi_update_iotlb(AMDVIState *s, uint16_t devid, uint64_t gpa, IOMMUTLBEntry to_cache, uint16_t domid) { - AMDVIIOTLBEntry *entry = g_malloc(sizeof(*entry)); - uint64_t *key = g_malloc(sizeof(key)); + AMDVIIOTLBEntry *entry = g_new(AMDVIIOTLBEntry, 1); + uint64_t *key = g_new(uint64_t, 1); uint64_t gfn = gpa >> AMDVI_PAGE_SHIFT_4K; /* don't cache erroneous translations */ @@ -1135,6 +1135,7 @@ static void amdvi_reset(DeviceState *dev) static void amdvi_realize(DeviceState *dev, Error **err) { + int ret = 0; AMDVIState *s = AMD_IOMMU_DEVICE(dev); X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev); PCIBus *bus = PC_MACHINE(qdev_get_machine())->bus; @@ -1147,8 +1148,11 @@ static void amdvi_realize(DeviceState *dev, Error **err) object_property_set_bool(OBJECT(&s->pci), true, "realized", err); s->capab_offset = pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC, 0, AMDVI_CAPAB_SIZE); - pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0, AMDVI_CAPAB_REG_SIZE); - pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0, AMDVI_CAPAB_REG_SIZE); + assert(s->capab_offset > 0); + ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0, AMDVI_CAPAB_REG_SIZE); + assert(ret > 0); + ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0, AMDVI_CAPAB_REG_SIZE); + assert(ret > 0); /* set up MMIO */ memory_region_init_io(&s->mmio, OBJECT(s), &mmio_mem_ops, s, "amdvi-mmio",