openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: omap3isp: fix unbalanced dma_iommu_mapping 

The OMAP3 ISP driver manages its MMU mappings through the IOMMU-aware
ARM DMA backend. The current code creates a dma_iommu_mapping and
attaches this to the ISP device, but never detaches the mapping in
either the probe failure paths or the driver remove path resulting
in an unbalanced mapping refcount and a memory leak. Fix this properly.

Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Suman Anna <s-anna@ti.com>
Tested-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Suman Anna 2018-03-14 11:41:36 -04:00 committed by Mauro Carvalho Chehab
parent 1d338b86e1
commit b7e1e6859f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/omap3isp/isp.c
View File

@ -1938,6 +1938,7 @@ static int isp_initialize_modules(struct isp_device *isp)
static void isp_detach_iommu(struct isp_device *isp) static void isp_detach_iommu(struct isp_device *isp)
{ {
arm_iommu_detach_device(isp->dev);
arm_iommu_release_mapping(isp->mapping); arm_iommu_release_mapping(isp->mapping);
isp->mapping = NULL; isp->mapping = NULL;
} }
@ -1954,8 +1955,7 @@ static int isp_attach_iommu(struct isp_device *isp)
mapping = arm_iommu_create_mapping(&platform_bus_type, SZ_1G, SZ_2G); mapping = arm_iommu_create_mapping(&platform_bus_type, SZ_1G, SZ_2G);
if (IS_ERR(mapping)) { if (IS_ERR(mapping)) {
dev_err(isp->dev, "failed to create ARM IOMMU mapping\n"); dev_err(isp->dev, "failed to create ARM IOMMU mapping\n");
ret = PTR_ERR(mapping); return PTR_ERR(mapping);
goto error;
} }
isp->mapping = mapping; isp->mapping = mapping;
@ -1970,7 +1970,8 @@ static int isp_attach_iommu(struct isp_device *isp)
return 0; return 0;
error: error:
isp_detach_iommu(isp); arm_iommu_release_mapping(isp->mapping);
isp->mapping = NULL;
return ret; return ret;
} }