raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

iommu: Switch gather->end to the inclusive end

Browse Source 
[ Upstream commit 862c3715de ]

Currently gather->end is "unsigned long" which may be overflow in
arch32 in the corner case: 0xfff00000 + 0x100000(iova + size).
Although it doesn't affect the size(end - start), it affects the checking
"gather->end < end"

This patch changes this "end" to the real end address
(end = start + size - 1). Correspondingly, update the length to
"end - start + 1".

Fixes: a7d20dc19d ("iommu: Introduce struct iommu_iotlb_gather for batching TLB flushes")
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210107122909.16317-5-yong.wu@mediatek.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yong Wu
2021-01-07 20:29:06 +08:00
committed by Greg Kroah-Hartman
parent 2dbc0ea1d1
commit 48e6713713
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
View File

@@ -2267,7 +2267,7 @@ static void arm_smmu_iotlb_sync(struct iommu_domain *domain,
{ {
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
arm_smmu_tlb_inv_range(gather->start, gather->end - gather->start, arm_smmu_tlb_inv_range(gather->start, gather->end - gather->start + 1,
gather->pgsize, true, smmu_domain); gather->pgsize, true, smmu_domain);
} }

2
drivers/iommu/mtk_iommu.c
View File

@@ -445,7 +445,7 @@ static void mtk_iommu_iotlb_sync(struct iommu_domain *domain,
struct iommu_iotlb_gather *gather) struct iommu_iotlb_gather *gather)
{ {
struct mtk_iommu_data *data = mtk_iommu_get_m4u_data(); struct mtk_iommu_data *data = mtk_iommu_get_m4u_data();
size_t length = gather->end - gather->start; size_t length = gather->end - gather->start + 1;
if (gather->start == ULONG_MAX) if (gather->start == ULONG_MAX)
return; return;

4
include/linux/iommu.h
View File

@@ -169,7 +169,7 @@ enum iommu_dev_features {
* struct iommu_iotlb_gather - Range information for a pending IOTLB flush * struct iommu_iotlb_gather - Range information for a pending IOTLB flush
* *
* @start: IOVA representing the start of the range to be flushed * @start: IOVA representing the start of the range to be flushed
* @end: IOVA representing the end of the range to be flushed (exclusive) * @end: IOVA representing the end of the range to be flushed (inclusive)
* @pgsize: The interval at which to perform the flush * @pgsize: The interval at which to perform the flush
* *
* This structure is intended to be updated by multiple calls to the * This structure is intended to be updated by multiple calls to the
@@ -536,7 +536,7 @@ static inline void iommu_iotlb_gather_add_page(struct iommu_domain *domain,
struct iommu_iotlb_gather *gather, struct iommu_iotlb_gather *gather,
unsigned long iova, size_t size) unsigned long iova, size_t size)
{ {
unsigned long start = iova, end = start + size; unsigned long start = iova, end = start + size - 1;
/* /*
* If the new page is disjoint from the current range or is mapped at * If the new page is disjoint from the current range or is mapped at