diff mbox

i915: Don't leak in i915_gem_shmem_pread_slow()..

Message ID alpine.LNX.2.00.1106102336560.21722@swampdragon.chaosbits.net (mailing list archive)
State New, archived
Headers show

Commit Message

Jesper Juhl June 10, 2011, 9:40 p.m. UTC
It seems to me that we are leaking 'user_pages' in 
drivers/gpu/drm/i915/i915_gem.c::i915_gem_shmem_pread_slow() if 
read_cache_page_gfp() fails.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
 i915_gem.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

 Untested patch - user be warned.
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 12d3257..4df3272 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -465,8 +465,10 @@  i915_gem_shmem_pread_slow(struct drm_device *dev,
 
 		page = read_cache_page_gfp(mapping, offset >> PAGE_SHIFT,
 					   GFP_HIGHUSER | __GFP_RECLAIMABLE);
-		if (IS_ERR(page))
+		if (IS_ERR(page)) {
+			drm_free_large(user_pages);
 			return PTR_ERR(page);
+		}
 
 		if (do_bit17_swizzling) {
 			slow_shmem_bit17_copy(page,