From patchwork Fri Jan 12 16:45:29 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: 124374 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2270722qgn; Fri, 12 Jan 2018 08:48:52 -0800 (PST) X-Google-Smtp-Source: ACJfBou9lxVk5d+ll6WdxacPw53uU9gHCkS/uqM+1Q4K6TEUpXEEA8hCO0/6e7mSOsSs23MZnKBv X-Received: by 10.98.157.211 with SMTP id a80mr14244019pfk.242.1515775732720; Fri, 12 Jan 2018 08:48:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515775732; cv=none; d=google.com; s=arc-20160816; b=UiS7OH9YgMUEFNybF6+Vh0EzL1G27wwjYFILo//rPP46wM0C9KEKoZMlbf6kEUZkpB aIPHu5PPD/Bl/o5NIIHkifo6dSPiDczJccO3s5ls8AzTtczt1CRjWfHpTEMK84itOe27 Edr6MFDQ+V4yHSROf169XXesJjHS8PhLxl+JvhmWqPwMDdy1wGGWZnYSjvDP0E9j2fzW q2DwDoDIlDAdcIuxT8eYezIv2J8c/TEraaMQmZA2fbRNRlNALOoYTXWKJF+USwLL2fag XfcwPe73VvdpG1X6qblJLG5jtpC5ESqu1VNlYbPfp0lbq3wwJp5RhP0ZAjCORmbds2WX 1f+A== 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=kaCkxPGw4scAKQY3QqzzIHMZcdUh1WNCAm2ziInWafk=; b=BVjuV9kxdknTMJ3KIBVxABG+4s3uaLXd67JXZRv7YK73vKOk4mG52dsJcHROAM6ZR+ pkcXId4zEVtFy5LwtoU4ov3Mmz9ifUByd2ampCJGst19KqN9WLgcpVbNueI/1b41uGZd pMA1BiOTVyU2gqyd7E3iECvMskzrnCbkkSWD4HEsvbVAz0/ybXGDunFMBcgKeYC7RdOj cLhTcJruAXCt6HNOKkp7Sl8peqF3lNqjDclNEN6HBASJPD4bhOmxJmhtvZXYeEomF650 lWybk9WUjn4mfqwO1plRg7l0ACF7vpSPg/XvCnXNWMo3X2SqYyqYbvFTXaU5hC2DS4tt royg== 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 m10si8520400pll.714.2018.01.12.08.48.52; Fri, 12 Jan 2018 08:48:52 -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 S965036AbeALQsu (ORCPT + 28 others); Fri, 12 Jan 2018 11:48:50 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:48536 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S964828AbeALQsq (ORCPT ); Fri, 12 Jan 2018 11:48:46 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 3EBD37303D566; Sat, 13 Jan 2018 00:48:24 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.361.1; Sat, 13 Jan 2018 00:48:15 +0800 From: Shameer Kolothum To: , , CC: , , , , , Shameer Kolothum Subject: [RFC v2 3/5] vfio/type1: check dma map request is within a valid iova range Date: Fri, 12 Jan 2018 16:45:29 +0000 Message-ID: <20180112164531.93712-4-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20180112164531.93712-1-shameerali.kolothum.thodi@huawei.com> References: <20180112164531.93712-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(+) -- 1.9.1 diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 7609070..47ea490 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -971,6 +971,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, + phys_addr_t start, phys_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) { @@ -1009,6 +1026,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;