From nobody Thu Oct 30 05:35:10 2025 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=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525371785422943.5620486483034; Thu, 3 May 2018 11:23:05 -0700 (PDT) Received: from localhost ([::1]:58174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEIsf-0003e3-Cn for importer@patchew.org; Thu, 03 May 2018 14:23:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEIqb-00028D-PV for qemu-devel@nongnu.org; Thu, 03 May 2018 14:20:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEIqa-0008JJ-Pb for qemu-devel@nongnu.org; Thu, 03 May 2018 14:20:53 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:55292) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEIqa-0008Iu-Iz for qemu-devel@nongnu.org; Thu, 03 May 2018 14:20:52 -0400 Received: by mail-wm0-x243.google.com with SMTP id f6so431202wmc.4 for ; Thu, 03 May 2018 11:20:52 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id w40-v6sm24388801wrc.69.2018.05.03.11.20.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 11:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nl42Fpgf0JP+jqqL0RsIBabn/rZBnrruv2uDA+OsVIw=; b=f969otJ39OTjl7RRfwkeEE8FVMZ4y6ppzIxlH71l+Z/XNy7iFAW0CVRPvUnopjf7YF N/uYQYRJtVTn633jpVjmIFAxsjtK+DwdbXQK3/69nqCQmsH7/8CpnQy5tIwGmI2EyGQ3 j+O8Dr1+ZNLlwlGp/2jGMhkqJFR+A0CR3v80nx3+7xSfyZ4141tbNMdVRmd4mHBU/ZwM kXhLWFifk99DS6oEUb9Fate7acsNZvXmEaobbTw7mepTmwXYhddB0e/AbqhXfhCfLkRx cqSf7k2aXTWDZTpjC9dthGbCQjUzzS9SrzE95SXxcr75a0a/6T14Wc4ZLCQgN9b76QbZ XreQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nl42Fpgf0JP+jqqL0RsIBabn/rZBnrruv2uDA+OsVIw=; b=C4g7Poy9WkE9pKypxN+CG4fqj5tRim7r/OrqwgoC+qkAUA05nO2BauL4A4w12Xp40X tKwrrFAUUvKQWtKJd+88tvfHAKwJl4Op3QIBpciHx0y8k6qtUCk+YP4dGe+oR73ZJJmh a/QTFCnQ7wynk2wlBvy/St4jOxl3c6mr4a7miE4KrtPITth1lr9a0gry3iAd0RiQDON7 TQZX5JpeYEvzXnISNWJHubpBxfB4oZcVnXIws9p5zBFcGBEGtDmgSfBmnMcAtOVEWCoX Fx0W/FftICsAC2vUzZOEoYSkkEI17IHxthyksW/BV40+BUhMlmO9PPG1ncdXjRmJL2jU HvlA== X-Gm-Message-State: ALQs6tDpqhwo/X2cBdJ/qDNYERr35uo9m/dAHtVMnkZ4OfDj9/QN7h0G Dt9ZjdO6p9H3n8zom5A0gWMB9w== X-Google-Smtp-Source: AB8JxZrrl1sgOAEWcWJWaASshn7ycrwfH2m1UnilI6P0kdAreA2D2L9zgckdYkdnFr8Hq9SyKhUS4g== X-Received: by 10.28.132.68 with SMTP id g65mr17760474wmd.114.1525371651343; Thu, 03 May 2018 11:20:51 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 3 May 2018 21:21:22 +0300 Message-Id: <20180503182125.20310-6-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180503182125.20310-1-marcel.apfelbaum@gmail.com> References: <20180503182125.20310-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 5/8] hw/rdma: Fix possible out of bounds access to regs array 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, yuval.shaia@oracle.com, f4bug@amsat.org 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: Yuval Shaia Coverity (CID1390589, CID1390608). Array size is RDMA_BAR1_REGS_SIZE, let's make sure the given address is in range. While there also: 1. Adjust the size of this bar to reasonable size 2. Report the size of the array with sizeof(array) Reported-by: Peter Maydell Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180430200223.4119-6-marcel.apfelbaum@gmail.com> --- hw/rdma/vmw/pvrdma.h | 6 +++--- hw/rdma/vmw/pvrdma_main.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/rdma/vmw/pvrdma.h b/hw/rdma/vmw/pvrdma.h index 8c173cb824..0b46dc5a9b 100644 --- a/hw/rdma/vmw/pvrdma.h +++ b/hw/rdma/vmw/pvrdma.h @@ -31,7 +31,7 @@ #define RDMA_REG_BAR_IDX 1 #define RDMA_UAR_BAR_IDX 2 #define RDMA_BAR0_MSIX_SIZE (16 * 1024) -#define RDMA_BAR1_REGS_SIZE 256 +#define RDMA_BAR1_REGS_SIZE 64 #define RDMA_BAR2_UAR_SIZE (0x1000 * MAX_UCS) /* each uc gets page */ =20 /* MSIX */ @@ -86,7 +86,7 @@ static inline int get_reg_val(PVRDMADev *dev, hwaddr addr= , uint32_t *val) { int idx =3D addr >> 2; =20 - if (idx > RDMA_BAR1_REGS_SIZE) { + if (idx >=3D RDMA_BAR1_REGS_SIZE) { return -EINVAL; } =20 @@ -99,7 +99,7 @@ static inline int set_reg_val(PVRDMADev *dev, hwaddr addr= , uint32_t val) { int idx =3D addr >> 2; =20 - if (idx > RDMA_BAR1_REGS_SIZE) { + if (idx >=3D RDMA_BAR1_REGS_SIZE) { return -EINVAL; } =20 diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 994220b58e..3ed7409763 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -449,14 +449,14 @@ static void init_bars(PCIDevice *pdev) /* BAR 1 - Registers */ memset(&dev->regs_data, 0, sizeof(dev->regs_data)); memory_region_init_io(&dev->regs, OBJECT(dev), ®s_ops, dev, - "pvrdma-regs", RDMA_BAR1_REGS_SIZE); + "pvrdma-regs", sizeof(dev->regs_data)); pci_register_bar(pdev, RDMA_REG_BAR_IDX, PCI_BASE_ADDRESS_SPACE_MEMORY, &dev->regs); =20 /* BAR 2 - UAR */ memset(&dev->uar_data, 0, sizeof(dev->uar_data)); memory_region_init_io(&dev->uar, OBJECT(dev), &uar_ops, dev, "rdma-uar= ", - RDMA_BAR2_UAR_SIZE); + sizeof(dev->uar_data)); pci_register_bar(pdev, RDMA_UAR_BAR_IDX, PCI_BASE_ADDRESS_SPACE_MEMORY, &dev->uar); } --=20 2.14.3