From: Niklas Schnelle <schnelle@linux.ibm.com>
To: iommu@lists.linux.dev, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Jason Gunthorpe <jgg@nvidia.com>
Cc: Matthew Rosato <mjrosato@linux.ibm.com>,
Gerd Bayer <gbayer@linux.ibm.com>,
Pierre Morel <pmorel@linux.ibm.com>,
linux-s390@vger.kernel.org, borntraeger@linux.ibm.com,
hca@linux.ibm.com, gor@linux.ibm.com,
gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com,
svens@linux.ibm.com, linux-kernel@vger.kernel.org
Subject: [PATCH v7 4/6] iommu/s390: Fix incorrect aperture check
Date: Mon, 17 Oct 2022 14:45:56 +0200 [thread overview]
Message-ID: <20221017124558.1386337-5-schnelle@linux.ibm.com> (raw)
In-Reply-To: <20221017124558.1386337-1-schnelle@linux.ibm.com>
The domain->geometry.aperture_end specifies the last valid address treat
it as such when checking if a DMA address is valid.
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
---
v3->v4:
- Make check robust against overflow (Jason)
drivers/iommu/s390-iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c
index c4203a37faa4..fa8cb97bfc88 100644
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
@@ -213,7 +213,7 @@ static int s390_iommu_update_trans(struct s390_domain *s390_domain,
int rc = 0;
if (dma_addr < s390_domain->domain.geometry.aperture_start ||
- dma_addr + size > s390_domain->domain.geometry.aperture_end)
+ (dma_addr + size - 1) > s390_domain->domain.geometry.aperture_end)
return -EINVAL;
nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
--
2.34.1
next prev parent reply other threads:[~2022-10-17 12:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-17 12:45 [PATCH v7 0/6] iommu/s390: Fixes related to attach and aperture handling Niklas Schnelle
2022-10-17 12:45 ` [PATCH v7 1/6] iommu/s390: Fix duplicate domain attachments Niklas Schnelle
2022-10-24 16:52 ` Jason Gunthorpe
2022-10-17 12:45 ` [PATCH v7 2/6] iommu/s390: Get rid of s390_domain_device Niklas Schnelle
2022-10-24 16:52 ` Jason Gunthorpe
2022-10-17 12:45 ` [PATCH v7 3/6] iommu/s390: Fix potential s390_domain aperture shrinking Niklas Schnelle
2022-10-24 15:02 ` Niklas Schnelle
2022-10-24 16:53 ` Jason Gunthorpe
2022-10-17 12:45 ` Niklas Schnelle [this message]
2022-10-24 16:54 ` [PATCH v7 4/6] iommu/s390: Fix incorrect aperture check Jason Gunthorpe
2022-10-17 12:45 ` [PATCH v7 5/6] iommu/s390: Fix incorrect pgsize_bitmap Niklas Schnelle
2022-10-17 12:45 ` [PATCH v7 6/6] iommu/s390: Implement map_pages()/unmap_pages() instead of map()/unmap() Niklas Schnelle
2022-10-24 16:59 ` Jason Gunthorpe
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=20221017124558.1386337-5-schnelle@linux.ibm.com \
--to=schnelle@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=gbayer@linux.ibm.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=pmorel@linux.ibm.com \
--cc=robin.murphy@arm.com \
--cc=svens@linux.ibm.com \
--cc=will@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox