* [PATCH v1] iommu: Avoid use of NULL after WARN_ON_ONCE
@ 2024-11-15 18:46 Kees Bakker
2024-12-18 8:34 ` Joerg Roedel
0 siblings, 1 reply; 2+ messages in thread
From: Kees Bakker @ 2024-11-15 18:46 UTC (permalink / raw)
To: Baolu Lu, iommu, Tian Kevin, Joerg Roedel, Will Deacon,
Robin Murphy
Cc: linux-kernel
There is a WARN_ON_ONCE to catch an unlikely situation when
domain_remove_dev_pasid can't find the `pasid`. In case it nevertheless
happens we must avoid using a NULL pointer.
Signed-off-by: Kees Bakker <kees@ijzerbout.nl>
---
drivers/iommu/intel/iommu.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 527f6f89d8a1..204873976ef3 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -4096,13 +4096,14 @@ void domain_remove_dev_pasid(struct iommu_domain *domain,
break;
}
}
- WARN_ON_ONCE(!dev_pasid);
spin_unlock_irqrestore(&dmar_domain->lock, flags);
cache_tag_unassign_domain(dmar_domain, dev, pasid);
domain_detach_iommu(dmar_domain, iommu);
- intel_iommu_debugfs_remove_dev_pasid(dev_pasid);
- kfree(dev_pasid);
+ if (!WARN_ON_ONCE(!dev_pasid)) {
+ intel_iommu_debugfs_remove_dev_pasid(dev_pasid);
+ kfree(dev_pasid);
+ }
}
static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid,
--
2.47.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v1] iommu: Avoid use of NULL after WARN_ON_ONCE
2024-11-15 18:46 [PATCH v1] iommu: Avoid use of NULL after WARN_ON_ONCE Kees Bakker
@ 2024-12-18 8:34 ` Joerg Roedel
0 siblings, 0 replies; 2+ messages in thread
From: Joerg Roedel @ 2024-12-18 8:34 UTC (permalink / raw)
To: Kees Bakker
Cc: Baolu Lu, iommu, Tian Kevin, Will Deacon, Robin Murphy,
linux-kernel
On Fri, Nov 15, 2024 at 07:46:25PM +0100, Kees Bakker wrote:
> There is a WARN_ON_ONCE to catch an unlikely situation when
> domain_remove_dev_pasid can't find the `pasid`. In case it nevertheless
> happens we must avoid using a NULL pointer.
>
> Signed-off-by: Kees Bakker <kees@ijzerbout.nl>
> ---
> drivers/iommu/intel/iommu.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
This patch is Intel VT-d specific, please use the 'iommu/vt-d:' prefix
in the subject line.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-18 8:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-15 18:46 [PATCH v1] iommu: Avoid use of NULL after WARN_ON_ONCE Kees Bakker
2024-12-18 8:34 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox