Re: [PATCH 05/21] drm/i915/gtt: Don't leak scratch page on mapping error

From: Daniel Vetter <daniel@ffwll.ch>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org, miku@iki.fi
Subject: Re: [PATCH 05/21] drm/i915/gtt: Don't leak scratch page on mapping error
Date: Mon, 15 Jun 2015 12:13:57 +0200	[thread overview]
Message-ID: <20150615101357.GP8341@phenom.ffwll.local> (raw)
In-Reply-To: <1433170972.21546.11.camel@jlahtine-mobl1>

On Mon, Jun 01, 2015 at 06:02:52PM +0300, Joonas Lahtinen wrote:
> On pe, 2015-05-22 at 20:04 +0300, Mika Kuoppala wrote:
> > Free the scratch page if dma mapping fails.
> > 
> > Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
> 
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel

> 
> > ---
> >  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 c61de4a..a608b1b 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > @@ -2191,8 +2191,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
> 
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx