From: Lynn Liu <liulynn@google.com>
To: joro@8bytes.org, will@kernel.org, robin.murphy@arm.com
Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
Lynn Liu <liulynn@google.com>
Subject: [PATCH v3] iommu/iova: Add NULL check in iova_magazine_free()
Date: Mon, 9 Mar 2026 18:41:04 +0000 [thread overview]
Message-ID: <20260309184104.2321071-1-liulynn@google.com> (raw)
In-Reply-To: <116b79a2-fadb-4796-8cb7-9c2dfde54999@arm.com>
In iova_domain_init_rcaches(), when an iova_magazine allocation fails,
the code jumps to the error path and calls free_iova_rcaches().
In free_iova_rcaches(), the code iterates through all possible CPUs to
free both cpu_rcache->loaded and cpu_rcache->prev. However, if the
original allocation failed mid-way through the CPU loop, the pointers
for the remaining CPUs remain NULL. free_iova_rcaches() then blindly
attempts to free these NULL pointers, which causes a kernel paging
request fault in kmem_cache_free().
The crash can be observed when fault injection triggers a failure in
iova_magazine_alloc():
pc : _compound_head include/linux/page-flags.h:251 [inline]
pc : virt_to_folio include/linux/mm.h:1395 [inline]
pc : virt_to_slab mm/slab.h:215 [inline]
pc : kmem_cache_free+0x90/0x5c4 mm/slub.c:4769
...
Call trace:
trace_kmem_cache_free include/trace/events/kmem.h:114 [inline]
kmem_cache_free+0x90/0x5c4 mm/slub.c:4768
iova_magazine_free drivers/iommu/iova.c:623 [inline]
free_iova_rcaches+0x114/0x344 drivers/iommu/iova.c:894
iova_domain_init_rcaches drivers/iommu/iova.c:762 [inline]
iova_domain_init_rcaches+0x3d0/0x528 drivers/iommu/iova.c:717
These changes update iova_domain_init_rcaches() to check for allocation
failure immediately after each individual magazine allocation.
Correspondingly, update free_iova_rcaches() to break the cleanup loop
when it encounters a NULL pointer, ensuring only successfully allocated
resources are processed.
Fixes: 84e6f56be9c6 ("iommu/iova: use named kmem_cache for iova magazines")
Signed-off-by: Lynn Liu <liulynn@google.com>
---
v3:
- Split magazine allocation checks in iova_domain_init_rcaches().
- Add early breaks in free_iova_rcaches() to safely handle partial allocations as suggested.
Link to v2: https://lore.kernel.org/linux-iommu/116b79a2-fadb-4796-8cb7-9c2dfde54999@arm.com/T/#t
v2:
- Update author name to full name.
- Add Fixes tag.
- Include the Call trace from the kernel crash.
Link to v1: https://lore.kernel.org/linux-iommu/20260214080919.390846-1-liulynn@google.com/T/#u
drivers/iommu/iova.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
index 18f839721813..cf6cd9f23b97 100644
--- a/drivers/iommu/iova.c
+++ b/drivers/iommu/iova.c
@@ -740,8 +740,12 @@ int iova_domain_init_rcaches(struct iova_domain *iovad)
spin_lock_init(&cpu_rcache->lock);
cpu_rcache->loaded = iova_magazine_alloc(GFP_KERNEL);
+ if (!cpu_rcache->loaded) {
+ ret = -ENOMEM;
+ goto out_err;
+ }
cpu_rcache->prev = iova_magazine_alloc(GFP_KERNEL);
- if (!cpu_rcache->loaded || !cpu_rcache->prev) {
+ if (!cpu_rcache->prev) {
ret = -ENOMEM;
goto out_err;
}
@@ -886,7 +890,11 @@ static void free_iova_rcaches(struct iova_domain *iovad)
break;
for_each_possible_cpu(cpu) {
cpu_rcache = per_cpu_ptr(rcache->cpu_rcaches, cpu);
+ if (!cpu_rcache->loaded)
+ break;
iova_magazine_free(cpu_rcache->loaded);
+ if (!cpu_rcache->prev)
+ break;
iova_magazine_free(cpu_rcache->prev);
}
free_percpu(rcache->cpu_rcaches);
--
2.53.0.473.g4a7958ca14-goog
prev parent reply other threads:[~2026-03-09 18:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-04 8:06 [PATCH v2] iommu/iova: Add NULL check in iova_magazine_free() Lynn Liu
2026-03-04 18:41 ` Robin Murphy
2026-03-09 18:41 ` Lynn Liu [this message]
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=20260309184104.2321071-1-liulynn@google.com \
--to=liulynn@google.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.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