* [PATCH v2] iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure
@ 2021-12-07 4:31 ` yf.wang
0 siblings, 0 replies; 3+ messages in thread
From: yf.wang @ 2021-12-07 4:31 UTC (permalink / raw)
To: Will Deacon, Robin Murphy, Joerg Roedel, Matthias Brugger,
Jean-Philippe Brucker, moderated list:ARM SMMU DRIVERS,
open list:IOMMU DRIVERS, open list,
moderated list:ARM/Mediatek SoC support
Cc: wsd_upstream, Libo Kang, Yong Wu, Guangming Cao, Yunfei Wang, stable
From: Yunfei Wang <yf.wang@mediatek.com>
In __arm_v7s_alloc_table function:
iommu call kmem_cache_alloc to allocate page table, this function
allocate memory may fail, when kmem_cache_alloc fails to allocate
table, call virt_to_phys will be abnomal and return unexpected phys
and goto out_free, then call kmem_cache_free to release table will
trigger KE, __get_free_pages and free_pages have similar problem,
so add error handle for page table allocation failure.
Fixes: 29859aeb8a6ea ("iommu/io-pgtable-arm-v7s: Abort allocation when table address overflows the PTE")
Signed-off-by: Yunfei Wang <yf.wang@mediatek.com>
Cc: <stable@vger.kernel.org> # 5.10.*
---
V2: Cc stable@vger.kernel.org
1. This patch needs to be merged stable branch, add stable@vger.kernel.org
in mail list.
2. There is No new code change in V2.
---
drivers/iommu/io-pgtable-arm-v7s.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index bfb6acb651e5..d84240308f4b 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -246,6 +246,12 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
__GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size));
else if (lvl == 2)
table = kmem_cache_zalloc(data->l2_tables, gfp);
+
+ if (!table) {
+ dev_err(dev, "Page table allocation failure lvl:%d\n", lvl);
+ return NULL;
+ }
+
phys = virt_to_phys(table);
if (phys != (arm_v7s_iopte)phys) {
/* Doesn't fit in PTE */
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure
@ 2021-12-07 4:31 ` yf.wang
0 siblings, 0 replies; 3+ messages in thread
From: yf.wang @ 2021-12-07 4:31 UTC (permalink / raw)
To: Will Deacon, Robin Murphy, Joerg Roedel, Matthias Brugger,
Jean-Philippe Brucker, moderated list:ARM SMMU DRIVERS,
open list:IOMMU DRIVERS, open list,
moderated list:ARM/Mediatek SoC support
Cc: Guangming Cao, wsd_upstream, Yunfei Wang, stable, Libo Kang
[-- Attachment #1.1: Type: text/html, Size: 2555 bytes --]
[-- Attachment #1.2: Type: text/plain, Size: 1587 bytes --]
From: Yunfei Wang <yf.wang@mediatek.com>
In __arm_v7s_alloc_table function:
iommu call kmem_cache_alloc to allocate page table, this function
allocate memory may fail, when kmem_cache_alloc fails to allocate
table, call virt_to_phys will be abnomal and return unexpected phys
and goto out_free, then call kmem_cache_free to release table will
trigger KE, __get_free_pages and free_pages have similar problem,
so add error handle for page table allocation failure.
Fixes: 29859aeb8a6ea ("iommu/io-pgtable-arm-v7s: Abort allocation when table address overflows the PTE")
Signed-off-by: Yunfei Wang <yf.wang@mediatek.com>
Cc: <stable@vger.kernel.org> # 5.10.*
---
V2: Cc stable@vger.kernel.org
1. This patch needs to be merged stable branch, add stable@vger.kernel.org
in mail list.
2. There is No new code change in V2.
---
drivers/iommu/io-pgtable-arm-v7s.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index bfb6acb651e5..d84240308f4b 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -246,6 +246,12 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
__GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size));
else if (lvl == 2)
table = kmem_cache_zalloc(data->l2_tables, gfp);
+
+ if (!table) {
+ dev_err(dev, "Page table allocation failure lvl:%d\n", lvl);
+ return NULL;
+ }
+
phys = virt_to_phys(table);
if (phys != (arm_v7s_iopte)phys) {
/* Doesn't fit in PTE */
--
2.18.0
[-- Attachment #2: Type: text/plain, Size: 156 bytes --]
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure
@ 2021-12-07 4:29 yf.wang
0 siblings, 0 replies; 3+ messages in thread
From: yf.wang @ 2021-12-07 4:29 UTC (permalink / raw)
To: Guangming Cao; +Cc: wsd_upstream, Yunfei Wang, stable
From: Yunfei Wang <yf.wang@mediatek.com>
In __arm_v7s_alloc_table function:
iommu call kmem_cache_alloc to allocate page table, this function
allocate memory may fail, when kmem_cache_alloc fails to allocate
table, call virt_to_phys will be abnomal and return unexpected phys
and goto out_free, then call kmem_cache_free to release table will
trigger KE, __get_free_pages and free_pages have similar problem,
so add error handle for page table allocation failure.
Fixes: 29859aeb8a6ea ("iommu/io-pgtable-arm-v7s: Abort allocation when table address overflows the PTE")
Signed-off-by: Yunfei Wang <yf.wang@mediatek.com>
Cc: <stable@vger.kernel.org> # 5.10.*
---
V2: Cc stable@vger.kernel.org
1. This patch needs to be merged stable branch, add stable@vger.kernel.org
in mail list.
2. There is No new code change in V2.
---
drivers/iommu/io-pgtable-arm-v7s.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index bfb6acb651e5..d84240308f4b 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -246,6 +246,12 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
__GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size));
else if (lvl == 2)
table = kmem_cache_zalloc(data->l2_tables, gfp);
+
+ if (!table) {
+ dev_err(dev, "Page table allocation failure lvl:%d\n", lvl);
+ return NULL;
+ }
+
phys = virt_to_phys(table);
if (phys != (arm_v7s_iopte)phys) {
/* Doesn't fit in PTE */
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-07 4:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-07 4:31 [PATCH v2] iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure yf.wang
2021-12-07 4:31 ` yf.wang
-- strict thread matches above, loose matches on Subject: below --
2021-12-07 4:29 yf.wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.