From: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> To: <alex.williamson@redhat.com>, <eric.auger@redhat.com>, <pmorel@linux.vnet.ibm.com> Cc: <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <iommu@lists.linux-foundation.org>, <linuxarm@huawei.com>, <john.garry@huawei.com>, <xuwei5@hisilicon.com>, Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> Subject: [PATCH v6 5/7] vfio/type1: check dma map request is within a valid iova range Date: Wed, 18 Apr 2018 12:40:43 +0100 [thread overview] Message-ID: <20180418114045.7968-6-shameerali.kolothum.thodi@huawei.com> (raw) In-Reply-To: <20180418114045.7968-1-shameerali.kolothum.thodi@huawei.com> This checks and rejects any dma map request outside valid iova range. Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> --- drivers/vfio/vfio_iommu_type1.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 6fd6841..bf33281 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -1091,6 +1091,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) { @@ -1129,6 +1146,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; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> To: alex.williamson@redhat.com, eric.auger@redhat.com, pmorel@linux.vnet.ibm.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linuxarm@huawei.com, john.garry@huawei.com, xuwei5@hisilicon.com, Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> Subject: [PATCH v6 5/7] vfio/type1: check dma map request is within a valid iova range Date: Wed, 18 Apr 2018 12:40:43 +0100 [thread overview] Message-ID: <20180418114045.7968-6-shameerali.kolothum.thodi@huawei.com> (raw) In-Reply-To: <20180418114045.7968-1-shameerali.kolothum.thodi@huawei.com> This checks and rejects any dma map request outside valid iova range. Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> --- drivers/vfio/vfio_iommu_type1.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 6fd6841..bf33281 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -1091,6 +1091,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) { @@ -1129,6 +1146,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; -- 2.7.4
next prev parent reply other threads:[~2018-04-18 11:44 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-18 11:40 [PATCH v6 0/7] vfio/type1: Add support for valid iova list management Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` [PATCH v6 1/7] vfio/type1: Introduce iova list and add iommu aperture validity check Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` [PATCH v6 2/7] vfio/type1: Check reserve region conflict and update iova list Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` [PATCH v6 3/7] vfio/type1: Update iova list on detach Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` [PATCH v6 4/7] iommu/dma: Move PCI window region reservation back into dma specific path Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-24 13:16 ` Shameerali Kolothum Thodi 2018-04-24 13:16 ` Shameerali Kolothum Thodi 2018-04-24 13:16 ` Shameerali Kolothum Thodi 2018-04-30 16:10 ` Alex Williamson 2018-04-30 16:10 ` Alex Williamson 2018-04-30 16:10 ` Alex Williamson 2018-05-03 13:16 ` Joerg Roedel 2018-05-03 13:16 ` Joerg Roedel 2018-04-18 11:40 ` Shameer Kolothum [this message] 2018-04-18 11:40 ` [PATCH v6 5/7] vfio/type1: check dma map request is within a valid iova range Shameer Kolothum 2018-04-18 11:40 ` [PATCH v6 6/7] vfio/type1: Add IOVA range capability support Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` [PATCH v6 7/7] vfio/type1: remove duplicate retrieval of reserved regions Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-04-18 11:40 ` Shameer Kolothum 2018-05-24 18:20 ` [PATCH v6 0/7] vfio/type1: Add support for valid iova list management Alex Williamson 2018-05-24 18:20 ` Alex Williamson 2018-05-25 8:45 ` Shameerali Kolothum Thodi 2018-05-25 20:54 ` Alex Williamson 2018-05-25 20:54 ` Alex Williamson 2018-05-25 20:54 ` Alex Williamson 2018-06-05 17:03 ` Alex Williamson 2018-06-06 6:52 ` Shameerali Kolothum Thodi 2018-06-07 15:05 ` Alex Williamson 2018-06-07 15:05 ` Alex Williamson 2018-06-07 15:05 ` Alex Williamson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180418114045.7968-6-shameerali.kolothum.thodi@huawei.com \ --to=shameerali.kolothum.thodi@huawei.com \ --cc=alex.williamson@redhat.com \ --cc=eric.auger@redhat.com \ --cc=iommu@lists.linux-foundation.org \ --cc=john.garry@huawei.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxarm@huawei.com \ --cc=pmorel@linux.vnet.ibm.com \ --cc=xuwei5@hisilicon.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.