diff options
| author |   Lucas Stach <l.stach@pengutronix.de> | 2022-03-23 17:08:22 +0100 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2022-04-06 10:00:51 +0200 |
| commit | e168c25526cd0368af098095c2ded4a008007e1b (patch) | |
| tree | 37f2bcf8590839e47b8d588d6e7f0cd4030741bc | |
| parent | Linux 5.17 (diff) | |
| download | linux-dev-e168c25526cd0368af098095c2ded4a008007e1b.tar.xz linux-dev-e168c25526cd0368af098095c2ded4a008007e1b.zip | |
drm/etnaviv: check for reaped mapping in etnaviv_iommu_unmap_gem
When the mapping is already reaped the unmap must be a no-op, as we
would otherwise try to remove the mapping twice, corrupting the involved
data structures.
Cc: stable@vger.kernel.org # 5.4
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Guido Günther <agx@sigxcpu.org>
Acked-by: Guido Günther <agx@sigxcpu.org>
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c index 9fb1a2aadbcb..aabb997a74eb 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c @@ -286,6 +286,12 @@ void etnaviv_iommu_unmap_gem(struct etnaviv_iommu_context *context, mutex_lock(&context->lock); + /* Bail if the mapping has been reaped by another thread */ + if (!mapping->context) { + mutex_unlock(&context->lock); + return; + } + /* If the vram node is on the mm, unmap and remove the node */ if (mapping->vram_node.mm == &context->mm) etnaviv_iommu_remove_mapping(context, mapping); |