From patchwork Mon Jan 23 07:44:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 9531859 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 C1DC260434 for ; Mon, 23 Jan 2017 07:44:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3DB727F82 for ; Mon, 23 Jan 2017 07:44:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8C1427F93; Mon, 23 Jan 2017 07:44:22 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6018627F82 for ; Mon, 23 Jan 2017 07:44:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750773AbdAWHoU (ORCPT ); Mon, 23 Jan 2017 02:44:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33126 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750748AbdAWHoS (ORCPT ); Mon, 23 Jan 2017 02:44:18 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BDC8781247 for ; Mon, 23 Jan 2017 07:44:18 +0000 (UTC) Received: from dhcp-27-118.brq.redhat.com (dhcp-27-122.brq.redhat.com [10.34.27.122]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0N7iD3c019474; Mon, 23 Jan 2017 02:44:17 -0500 From: Alexander Gordeev To: kvm@vger.kernel.org Cc: Alexander Gordeev , Thomas Huth , Andrew Jones Subject: [kvm-unit-tests PATCH v2 3/4] pci: Ensure BAR validity for public functions Date: Mon, 23 Jan 2017 08:44:09 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 23 Jan 2017 07:44:18 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: Thomas Huth Cc: Andrew Jones Signed-off-by: Alexander Gordeev --- lib/pci.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/pci.c b/lib/pci.c index 7a3e505ab314..144bec755c8d 100644 --- a/lib/pci.c +++ b/lib/pci.c @@ -35,6 +35,8 @@ uint32_t pci_bar_mask(uint32_t bar) uint32_t pci_bar_get(pcidevaddr_t dev, int bar_num) { + assert(bar_num >= 0 && bar_num < 6); + return pci_config_readl(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); } @@ -45,6 +47,9 @@ phys_addr_t pci_bar_get_addr(pcidevaddr_t dev, int bar_num) uint64_t addr = bar & mask; phys_addr_t phys_addr; + if (!pci_bar_exists(dev, bar_num)) + return INVALID_PHYS_ADDR; + if (pci_bar_is64(dev, bar_num)) addr |= (uint64_t)pci_bar_get(dev, bar_num + 1) << 32; @@ -58,6 +63,8 @@ void pci_bar_set_addr(pcidevaddr_t dev, int bar_num, phys_addr_t addr) { int off = PCI_BASE_ADDRESS_0 + bar_num * 4; + assert(pci_bar_exists(dev, bar_num)); + pci_config_writel(dev, off, (uint32_t)addr); if (pci_bar_is64(dev, bar_num)) @@ -91,6 +98,8 @@ phys_addr_t pci_bar_size(pcidevaddr_t dev, int bar_num) { uint32_t bar, size; + assert(pci_bar_is_valid(dev, bar_num)); + size = pci_bar_size_helper(dev, bar_num); if (!size) return 0;