[Intel-gfx] [PATCH 05/20] drm/i915/gtt: Don't leak scratch page on mapping error
Mika Kuoppala
mika.kuoppala at linux.intel.com
Thu May 21 07:37:33 PDT 2015
Free the scratch page if dma mapping fails.
Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 0ff381e..e4775d8 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2141,8 +2141,10 @@ static int setup_scratch_page(struct drm_device *dev)
#ifdef CONFIG_INTEL_IOMMU
dma_addr = pci_map_page(dev->pdev, page, 0, PAGE_SIZE,
PCI_DMA_BIDIRECTIONAL);
- if (pci_dma_mapping_error(dev->pdev, dma_addr))
+ if (pci_dma_mapping_error(dev->pdev, dma_addr)) {
+ __free_page(page);
return -EINVAL;
+ }
#else
dma_addr = page_to_phys(page);
#endif
--
1.9.1
More information about the Intel-gfx
mailing list