* [PATCH 1/2] iommu/io-pgfault: unlink partial faults before freeing them
[not found] <20261117015409.25492-1-q.h.hack.winter@gmail.com>
@ 2026-11-17 1:54 ` Qihang
2026-11-17 1:54 ` [PATCH 2/2] iommu/io-pgfault: reject partial faults after the device is removed Qihang
1 sibling, 0 replies; 2+ messages in thread
From: Qihang @ 2026-11-17 1:54 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon
Cc: Qihang, Robin Murphy, iommu, linux-kernel, stable
iopf_queue_remove_device() frees the pending partial faults without
unlinking them, so fault_param->partial keeps pointing into freed
memory. A report that is still in flight can then list_add() through
those dangling pointers. The unlink has been missing since
iopf_queue_remove_device() was first added, but the race only became
reachable with a74c077b9021, which made the fault parameter
refcounted and able to outlive the removal.
Unlink each entry before freeing it, matching
iopf_queue_discard_partial().
This fixes the dangling-list access only: a partial that arrives after
the drain now leaks, because the parameter is no longer on
queue->devices and its final put does not free partial faults. The
next patch gives such a partial a defined fate.
Fixes: a74c077b9021 ("iommu: Use refcount for fault data access")
Cc: stable@vger.kernel.org
Signed-off-by: Qihang <q.h.hack.winter@gmail.com>
---
iopf_queue_discard_partial() cannot be called directly from here: it
takes queue->lock, which iopf_queue_remove_device() already holds.
drivers/iommu/io-pgfault.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c
index c16ff1f..55a3c29 100644
--- a/drivers/iommu/io-pgfault.c
+++ b/drivers/iommu/io-pgfault.c
@@ -479,8 +479,10 @@ void iopf_queue_remove_device(struct iopf_queue *queue, struct device *dev)
goto unlock;
mutex_lock(&fault_param->lock);
- list_for_each_entry_safe(partial_iopf, next, &fault_param->partial, list)
+ list_for_each_entry_safe(partial_iopf, next, &fault_param->partial, list) {
+ list_del(&partial_iopf->list);
kfree(partial_iopf);
+ }
list_for_each_entry_safe(group, temp, &fault_param->faults, pending_node) {
struct iopf_fault *iopf = &group->last_fault;
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH 2/2] iommu/io-pgfault: reject partial faults after the device is removed
[not found] <20261117015409.25492-1-q.h.hack.winter@gmail.com>
2026-11-17 1:54 ` [PATCH 1/2] iommu/io-pgfault: unlink partial faults before freeing them Qihang
@ 2026-11-17 1:54 ` Qihang
1 sibling, 0 replies; 2+ messages in thread
From: Qihang @ 2026-11-17 1:54 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon
Cc: Qihang, Robin Murphy, iommu, linux-kernel, stable
A report that already holds a reference to the fault_param can still
reach report_partial_fault() after iopf_queue_remove_device() drained
the partial list. The node it queues there leaks: the parameter is no
longer on queue->devices and its final put does not free partial
faults.
Reject late partial insertions under fault_param->lock: add
fault_param->removing, set it in iopf_queue_remove_device() before
the drain, and test it in report_partial_fault() under the same lock
that the insertion takes, so "check" and "link" cannot be separated. A
partial is then either drained or rejected and freed by
report_partial_fault() itself, which returns -ENODEV; as for any
non-last request, no response is sent. removing is never cleared,
since IOPF re-enable allocates a new fault_param.
This only protects partial-list admission; callers must still quiesce
reports for the remaining lifetimes. It is not a general teardown
fix; the cover letter lists the paths it does not cover.
Fixes: a74c077b9021 ("iommu: Use refcount for fault data access")
Cc: stable@vger.kernel.org
Signed-off-by: Qihang <q.h.hack.winter@gmail.com>
---
This applies on top of "iommu/io-pgfault: unlink partial faults before
freeing them".
drivers/iommu/io-pgfault.c | 12 ++++++++++--
include/linux/iommu.h | 3 +++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c
index 55a3c29..51d0d1a 100644
--- a/drivers/iommu/io-pgfault.c
+++ b/drivers/iommu/io-pgfault.c
@@ -64,6 +64,7 @@ static int report_partial_fault(struct iommu_fault_param *fault_param,
struct iommu_fault *fault)
{
struct iopf_fault *iopf;
+ int ret = 0;
iopf = kzalloc_obj(*iopf);
if (!iopf)
@@ -72,10 +73,16 @@ static int report_partial_fault(struct iommu_fault_param *fault_param,
iopf->fault = *fault;
mutex_lock(&fault_param->lock);
- list_add(&iopf->list, &fault_param->partial);
+ if (fault_param->removing)
+ ret = -ENODEV;
+ else
+ list_add(&iopf->list, &fault_param->partial);
mutex_unlock(&fault_param->lock);
- return 0;
+ if (ret)
+ kfree(iopf);
+
+ return ret;
}
static struct iopf_group *iopf_group_alloc(struct iommu_fault_param *iopf_param,
@@ -479,6 +486,7 @@ void iopf_queue_remove_device(struct iopf_queue *queue, struct device *dev)
goto unlock;
mutex_lock(&fault_param->lock);
+ fault_param->removing = true;
list_for_each_entry_safe(partial_iopf, next, &fault_param->partial, list) {
list_del(&partial_iopf->list);
kfree(partial_iopf);
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index ef50437..5d56e66 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -846,6 +846,8 @@ struct iommu_device {
* @partial: faults that are part of a Page Request Group for which the last
* request hasn't been submitted yet.
* @faults: holds the pending faults which need response
+ * @removing: the device is being removed from the queue, no new partial
+ * faults may be queued
*/
struct iommu_fault_param {
struct mutex lock;
@@ -858,6 +860,7 @@ struct iommu_fault_param {
struct list_head partial;
struct list_head faults;
+ bool removing;
};
/**
^ permalink raw reply related [flat|nested] 2+ messages in thread