From nobody Fri Nov 7 04:10:43 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 1545473685456838.9636144186449; Sat, 22 Dec 2018 02:14:45 -0800 (PST) Received: from localhost ([::1]:39235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaeIt-0007rt-Rm for importer@patchew.org; Sat, 22 Dec 2018 05:14:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gadwO-0006a3-45 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-0006lE-3x for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:28 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:55946) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gadwM-0006ij-Tf for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:27 -0500 Received: by mail-wm1-x343.google.com with SMTP id y139so7337109wmc.5 for ; Sat, 22 Dec 2018 01:51:24 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id s3sm9557371wmj.23.2018.12.22.01.51.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Dec 2018 01:51:23 -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=DeVlDfn3JZJQSiz2sMJdc5hnvsGaQvcfATyU/wmu9dU=; b=eJd4mRECnHUBI1Fa6L14gJPYJO8oDB4vMSqOeQ1Sb7S7mB/WRGoGvr8vaL0BS9RI9r 1p+v/FOLy5LzRaFMJz7gSUAJl1sgj0fXfmkF7riyHJnyl6ajOY2QBzzOSCCUgqJ5xZd/ GMt97E4MMwf3bqE0BIdCbJiUc96/n2vUv/1+jfFS8GmhzsxtHSh+XkrNgfjPOg12l/4G MLTmSCC5QyPR3Wnp+1ijEpWGFL08EMThEY6Bj4OmNTaxPtfF6+P2y+eh21zYvaMEtXzI 035Y8PUjK9IuJmL6uy3jz8pByuyDanFajtN5FnCcJiYdEKeu/1WLpp+yPJDLBXlfQhZM PXag== 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=DeVlDfn3JZJQSiz2sMJdc5hnvsGaQvcfATyU/wmu9dU=; b=LGv24+zBeySZHzKqwRXpFjHT5YCkJ6gNsQIlUrNRJ48qHwUVEiRq4cQKf2RsXX/M91 edD8rcRcjXDa55GXrWyWMqs71CPgqvvdFT+6nZ0MahnQG+Sae3P5O9n+VzvJyGh15qww OFPAb8pdzixOqlKOuTNKov0d/m7j9kXuu/xGUBGqCFFjil7BWJdiV63OxG+ZxiH94q5j EHGNznM8PUOmzTq2dXT2lBicPejUA6FoNDohxkmVd+V8iM2u5Voh+0v0n01Ozsfundsx UOugUsz8ZP7srRhLYQMh0e64wPzStYAVTXarMFLjgdCpkBDhaULrvKDthkBbxyScWy6C nsNg== X-Gm-Message-State: AJcUukcy0ZGgAfEw0GkDCPTRLRXFHEQZowN5nMBG+xLeu1UgNyjpndkR t6I9Bb3fsb+tO9K19ci1j740+uWG X-Google-Smtp-Source: ALg8bN6dwxdawntc0SXXwUXCa5mJnVuuRyU+wQHJZ1RTAdB4sjwsPC+/SmbpAcFJr+SflMHJLnLLbA== X-Received: by 2002:a1c:8d49:: with SMTP id p70mr6329354wmd.68.1545472283683; Sat, 22 Dec 2018 01:51:23 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 22 Dec 2018 11:50:36 +0200 Message-Id: <20181222095036.29743-32-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::343 Subject: [Qemu-devel] [PATCH PULL 31/31] pvrdma: check return value from pvrdma_idx_ring_has_ routines 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit pvrdma_idx_ring_has_[data/space] routines also return invalid index PVRDMA_INVALID_IDX[=3D-1], if ring has no data/space. Check return value from these routines to avoid plausible infinite loops. Reported-by: Li Qiang Signed-off-by: Prasad J Pandit Reviewed-by: Yuval Shaia Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma_dev_ring.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/hw/rdma/vmw/pvrdma_dev_ring.c b/hw/rdma/vmw/pvrdma_dev_ring.c index 01247fc041..e8e5b502f6 100644 --- a/hw/rdma/vmw/pvrdma_dev_ring.c +++ b/hw/rdma/vmw/pvrdma_dev_ring.c @@ -73,23 +73,16 @@ out: =20 void *pvrdma_ring_next_elem_read(PvrdmaRing *ring) { + int e; unsigned int idx =3D 0, offset; =20 - /* - pr_dbg("%s: t=3D%d, h=3D%d\n", ring->name, ring->ring_state->prod_tail, - ring->ring_state->cons_head); - */ - - if (!pvrdma_idx_ring_has_data(ring->ring_state, ring->max_elems, &idx)= ) { + e =3D pvrdma_idx_ring_has_data(ring->ring_state, ring->max_elems, &idx= ); + if (e <=3D 0) { pr_dbg("No more data in ring\n"); return NULL; } =20 offset =3D idx * ring->elem_sz; - /* - pr_dbg("idx=3D%d\n", idx); - pr_dbg("offset=3D%d\n", offset); - */ return ring->pages[offset / TARGET_PAGE_SIZE] + (offset % TARGET_PAGE_= SIZE); } =20 @@ -105,20 +98,20 @@ void pvrdma_ring_read_inc(PvrdmaRing *ring) =20 void *pvrdma_ring_next_elem_write(PvrdmaRing *ring) { - unsigned int idx, offset, tail; + int idx; + unsigned int offset, tail; =20 - /* - pr_dbg("%s: t=3D%d, h=3D%d\n", ring->name, ring->ring_state->prod_tail, - ring->ring_state->cons_head); - */ - - if (!pvrdma_idx_ring_has_space(ring->ring_state, ring->max_elems, &tai= l)) { + idx =3D pvrdma_idx_ring_has_space(ring->ring_state, ring->max_elems, &= tail); + if (idx <=3D 0) { pr_dbg("CQ is full\n"); return NULL; } =20 idx =3D pvrdma_idx(&ring->ring_state->prod_tail, ring->max_elems); - /* TODO: tail =3D=3D idx */ + if (idx < 0 || tail !=3D idx) { + pr_dbg("invalid idx\n"); + return NULL; + } =20 offset =3D idx * ring->elem_sz; return ring->pages[offset / TARGET_PAGE_SIZE] + (offset % TARGET_PAGE_= SIZE); --=20 2.17.1