From patchwork Wed Feb 21 12:22:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 129056 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp561655ljc; Wed, 21 Feb 2018 04:24:04 -0800 (PST) X-Google-Smtp-Source: AH8x227X2ixerfNoZP3Ujz0+vGTuDeJjkGbbDhEwfCNeEo/+vZBL1K286mtgFf+/1VBWjDsDaXlM X-Received: by 2002:a17:902:6c42:: with SMTP id h2-v6mr3052395pln.123.1519215844385; Wed, 21 Feb 2018 04:24:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519215844; cv=none; d=google.com; s=arc-20160816; b=hc7cgv0skVHTV84b/bbOUrqKABT2vQNpuLZJVDj9iwPCFDjaLAsZ07MvVwzUO6+MJe 2aP32w2N/b65lyeAVIyKwES8rtaylK4on6mezz80aQjOzWkp2nZq18yC84UzjiNN0aTv VrHccCrJFYnEVFdzGlkm+EdPepzsOIKW9X6Khf/iC4DE48enPUrX3vHlYcHRc/ieZf3I 53Noh/rfLxcWNRIJKIh9GriTHJEHEVIqv84v4JMZtECvfSuI9sA2KD+G87gm9kORNXNv Y2W1jtINUvwKo2EtSqwiF9oqaIrVyqlM0haBVaHnpnpsQRxC5T9rl/1JfrRJCYUkFzl6 9JKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=B4TbYMWouUpPNhPvS2T775D/7RO2IKBxc7zfA2upqDM=; b=UGPSDR1MauuUxsjviWIgfi+bi4EWa9O8veym3aEv+eY89YJPmkwfrHylS7kQRvpiWH hAqHfWlIVdCA7J0d/vpKXiY242vHb1u5jPCX4GnlCCeAlxnNzr7muDKQlzSKuNx84dQd xJ2j5ycMolhnj0/jpyreQiZToley7AkHE7du4BdIm4MSAC9E1bZ7Ycd4jZ6AAizDoP71 XD4YubxUER2CQEFskGLmXSLhxBEheAt9T7LAZSpqvBLryLCFKKRmituqmM7moLIAlXK3 Y1loZdPb4o0K097nN0f/eszD+WjI3nVpdHhCyuDXopdlJLNymTri284iRc1U25aeQdBD WkiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s196si376254pgc.129.2018.02.21.04.24.04; Wed, 21 Feb 2018 04:24:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754166AbeBUMXq (ORCPT + 28 others); Wed, 21 Feb 2018 07:23:46 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:5657 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754124AbeBUMXj (ORCPT ); Wed, 21 Feb 2018 07:23:39 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 8DC3B1518CE04; Wed, 21 Feb 2018 20:23:25 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.361.1; Wed, 21 Feb 2018 20:23:19 +0800 From: Shameer Kolothum To: , , CC: , , , , , Shameer Kolothum Subject: [PATCH v4 4/6] vfio/type1: check dma map request is within a valid iova range Date: Wed, 21 Feb 2018 12:22:07 +0000 Message-ID: <20180221122209.9292-5-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20180221122209.9292-1-shameerali.kolothum.thodi@huawei.com> References: <20180221122209.9292-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.237] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This checks and rejects any dma map request outside valid iova range. Signed-off-by: Shameer Kolothum --- drivers/vfio/vfio_iommu_type1.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.7.4 diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index a80884e..3049393 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -970,6 +970,23 @@ static int vfio_pin_map_dma(struct vfio_iommu *iommu, struct vfio_dma *dma, return ret; } +/* + * Check dma map request is within a valid iova range + */ +static bool vfio_iommu_iova_dma_valid(struct vfio_iommu *iommu, + dma_addr_t start, dma_addr_t end) +{ + struct list_head *iova = &iommu->iova_list; + struct vfio_iova *node; + + list_for_each_entry(node, iova, list) { + if ((start >= node->start) && (end <= node->end)) + return true; + } + + return false; +} + static int vfio_dma_do_map(struct vfio_iommu *iommu, struct vfio_iommu_type1_dma_map *map) { @@ -1008,6 +1025,11 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, goto out_unlock; } + if (!vfio_iommu_iova_dma_valid(iommu, iova, iova + size - 1)) { + ret = -EINVAL; + goto out_unlock; + } + dma = kzalloc(sizeof(*dma), GFP_KERNEL); if (!dma) { ret = -ENOMEM;