From patchwork Sat Dec 22 09:50:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1017830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::12; helo=lists.nongnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sl85Z5Uh"; dkim-atps=neutral Received: from lists.nongnu.org (lists.nongnu.org [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43MLt55dndz9sPd for ; Sat, 22 Dec 2018 21:13:17 +1100 (AEDT) Received: from localhost ([::1]:37108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaeHS-0006eJ-89 for incoming@patchwork.ozlabs.org; Sat, 22 Dec 2018 05:13:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gadwN-0006Zn-Ts for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gadwN-0006l4-2V for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:27 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gadwM-0006g9-RZ for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:26 -0500 Received: by mail-wr1-x442.google.com with SMTP id 96so7530930wrb.2 for ; Sat, 22 Dec 2018 01:51:20 -0800 (PST) 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=uItoruqcg46l1s+nPMTY7KVp/vApUca1inUPnVc3+6Q=; b=Sl85Z5UhQEgAvANsn8lf0qGzoMtdCgM6RmjUpzoWn4HN5W95vHXf6PSS57LLbKinFM OCYbN6eeJWTLoW3lmOHF8uMlWYUK2xiY/xCFMt35P2TOjEMxc3W4ouGP25jFv6iugJH1 r9DeAJuKS2NQaDL4VH5bfNN7spW1Pgwv02UzlZj+VAg9dolriSgEig1+Ffj6miUuStRX VZzZKpmzX5p/H9ydFRs4XoZ3m/HZYwoBVZFQSTGrdSqQijxc+6fmYUg7WIQcAs6H/7Rc OmFZmNCkyZdSTdE7X3V6eYorsXNTryF+rLzIMpQGYVVq1UNR3P573eloxfTgAL1czzqS a4GQ== 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=uItoruqcg46l1s+nPMTY7KVp/vApUca1inUPnVc3+6Q=; b=gm/zKwAvwonvb5soRy5p5elSehBS1Vod3jXlYXV8fS9rsxjs6b97bmE7slq2ByysoH yCdqP3sti7cTcDZHJoJXniun9a7kI0mkjn6xHwMq1Kk3sb546G9/DvwT37zmJiojYcNf z7YYWxDlOKG3DR0r3bIcv66olD94Iq73EuwBEs5HPhdnhKX/MUoNIRjj8q7YTDgDb+dL R1T8By7gs+L8eL26u1ndO8klVL2A/IXjyoXURsKuqADLqSTtQ/B33FgeUH1ocsgQe41w CrDniqlIwuEjaiZpySF2HV1tg8o89NbjSyz/pWIpLIusbsUeIZPlO+UdjUvHAcmKChJU CEVg== X-Gm-Message-State: AJcUuke3iLdBHlCu5zl+RCMtOpwIEA/Ba6XpqL6ul/QhxLNZRE1YnT+f b6eCAzWnO9Z5MVpy/skyxcSnxtKB X-Google-Smtp-Source: ALg8bN4R6+e62vb7Twj32pyHhhcnMnXJDNB0Sfglre5xqmluO2WHkLnb6Z9nhXb/sg9dClkLVGG4TA== X-Received: by 2002:adf:92c7:: with SMTP id 65mr5383016wrn.228.1545472279570; Sat, 22 Dec 2018 01:51:19 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id s3sm9557371wmj.23.2018.12.22.01.51.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Dec 2018 01:51:19 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 22 Dec 2018 11:50:33 +0200 Message-Id: <20181222095036.29743-29-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181222095036.29743-1-marcel.apfelbaum@gmail.com> References: <20181222095036.29743-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH PULL 28/31] pvrdma: check number of pages when creating rings 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: yuval.shaia@oracle.com, pjp@fedoraproject.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Prasad J Pandit When creating CQ/QP rings, an object can have up to PVRDMA_MAX_FAST_REG_PAGES 8 pages. Check 'npages' parameter to avoid excessive memory allocation or a null dereference. Reported-by: Li Qiang Signed-off-by: Prasad J Pandit Reviewed-by: Yuval Shaia Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma_cmd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index 3b94545761..f236ac4795 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -259,6 +259,11 @@ static int create_cq_ring(PCIDevice *pci_dev , PvrdmaRing **ring, int rc = -EINVAL; char ring_name[MAX_RING_NAME_SZ]; + if (!nchunks || nchunks > PVRDMA_MAX_FAST_REG_PAGES) { + pr_dbg("invalid nchunks: %d\n", nchunks); + return rc; + } + pr_dbg("pdir_dma=0x%llx\n", (long long unsigned int)pdir_dma); dir = rdma_pci_dma_map(pci_dev, pdir_dma, TARGET_PAGE_SIZE); if (!dir) { @@ -372,6 +377,12 @@ static int create_qp_rings(PCIDevice *pci_dev, uint64_t pdir_dma, char ring_name[MAX_RING_NAME_SZ]; uint32_t wqe_sz; + if (!spages || spages > PVRDMA_MAX_FAST_REG_PAGES + || !rpages || rpages > PVRDMA_MAX_FAST_REG_PAGES) { + pr_dbg("invalid pages: %d, %d\n", spages, rpages); + return rc; + } + pr_dbg("pdir_dma=0x%llx\n", (long long unsigned int)pdir_dma); dir = rdma_pci_dma_map(pci_dev, pdir_dma, TARGET_PAGE_SIZE); if (!dir) {