From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rakib Mullick Subject: [PATCH] drm, i915: Fix memory leak in i915_gem_busy_ioctl(). Date: Wed, 16 Nov 2011 00:49:28 +0600 Message-ID: <1321382968.8791.4.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Sender: linux-kernel-owner@vger.kernel.org To: dri-devel , linux-kernel@vger.kernel.org Cc: David Airlie , Keith Packard , akpm@linux-foundation.org List-Id: dri-devel@lists.freedesktop.org A call to i915_add_request() has been made in function i915_gem_busy_ioctl(). i915_add_request can fail, so in it's exit path previously allocated memory needs to be freed. Signed-off-by: Rakib Mullick --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d18b07a..2dc24ab 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3512,9 +3512,11 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, * so emit a request to do so. */ request = kzalloc(sizeof(*request), GFP_KERNEL); - if (request) + if (request) { ret = i915_add_request(obj->ring, NULL, request); - else + if (ret) + kfree(request); + } else ret = -ENOMEM; }