lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 033/563] iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure
    Date
    From: Yunfei Wang <yf.wang@mediatek.com>

    commit a556cfe4cabc6d79cbb7733f118bbb420b376fe6 upstream.

    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: 29859aeb8a6e ("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.*
    Acked-by: Robin Murphy <robin.murphy@arm.com>
    Link: https://lore.kernel.org/r/20211207113315.29109-1-yf.wang@mediatek.com
    Signed-off-by: Will Deacon <will@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/iommu/io-pgtable-arm-v7s.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/iommu/io-pgtable-arm-v7s.c
    +++ b/drivers/iommu/io-pgtable-arm-v7s.c
    @@ -242,13 +242,17 @@ static void *__arm_v7s_alloc_table(int l
    __GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size));
    else if (lvl == 2)
    table = kmem_cache_zalloc(data->l2_tables, gfp);
    +
    + if (!table)
    + return NULL;
    +
    phys = virt_to_phys(table);
    if (phys != (arm_v7s_iopte)phys) {
    /* Doesn't fit in PTE */
    dev_err(dev, "Page table does not fit in PTE: %pa", &phys);
    goto out_free;
    }
    - if (table && !cfg->coherent_walk) {
    + if (!cfg->coherent_walk) {
    dma = dma_map_single(dev, table, size, DMA_TO_DEVICE);
    if (dma_mapping_error(dev, dma))
    goto out_free;

    \
     
     \ /
      Last update: 2022-01-25 01:09    [W:2.029 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site