From patchwork Thu Feb 18 20:05:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 584894 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 34C0614031D for ; Fri, 19 Feb 2016 07:06:20 +1100 (AEDT) Received: from localhost ([::1]:45023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWUqA-0000as-5E for incoming@patchwork.ozlabs.org; Thu, 18 Feb 2016 15:06:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWUpm-0008Tc-Gf for qemu-devel@nongnu.org; Thu, 18 Feb 2016 15:05:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWUpl-0007xb-6e for qemu-devel@nongnu.org; Thu, 18 Feb 2016 15:05:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWUpl-0007xN-0h for qemu-devel@nongnu.org; Thu, 18 Feb 2016 15:05:53 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id AEA4DC0C3706; Thu, 18 Feb 2016 20:05:52 +0000 (UTC) Received: from gimli.home (ovpn-113-102.phx2.redhat.com [10.3.113.102]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1IK5qgi002338; Thu, 18 Feb 2016 15:05:52 -0500 From: Alex Williamson To: qemu-devel@nongnu.org Date: Thu, 18 Feb 2016 13:05:52 -0700 Message-ID: <20160218200551.29220.21091.stgit@gimli.home> In-Reply-To: <20160218200419.29220.39836.stgit@gimli.home> References: <20160218200419.29220.39836.stgit@gimli.home> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Chen Fan , Marcel Apfelbaum , "Michael S. Tsirkin" Subject: [Qemu-devel] [PULL 01/13] pcie: modify the capability size assert X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chen Fan Device's Offset and size can reach PCIE_CONFIG_SPACE_SIZE, fix the corresponding assert. Signed-off-by: Chen Fan Reviewed-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Alex Williamson --- hw/pci/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 435a6cf..4aca0c5 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -608,7 +608,7 @@ void pcie_add_capability(PCIDevice *dev, assert(offset >= PCI_CONFIG_SPACE_SIZE); assert(offset < offset + size); - assert(offset + size < PCIE_CONFIG_SPACE_SIZE); + assert(offset + size <= PCIE_CONFIG_SPACE_SIZE); assert(size >= 8); assert(pci_is_express(dev));