From mboxrd@z Thu Jan 1 00:00:00 1970 From: Egbert Eich Subject: [PATCH 02/16] drm/mgag200: Fix memleak in error path in mgag200_bo_create() Date: Wed, 17 Jul 2013 15:07:15 +0200 Message-ID: <1374066449-21714-3-git-send-email-eich@suse.com> References: <1374066449-21714-1-git-send-email-eich@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by gabe.freedesktop.org (Postfix) with ESMTP id CAA7CE670D for ; Wed, 17 Jul 2013 06:07:55 -0700 (PDT) In-Reply-To: <1374066449-21714-1-git-send-email-eich@suse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: Egbert Eich , Egbert Eich , Mathieu Larouche , Dave Airlie , Christopher Harvey List-Id: dri-devel@lists.freedesktop.org The allocated struct mgag200_bo was not freed in all error paths. This patch consolidates error handling and fixes this. Signed-off-by: Egbert Eich --- drivers/gpu/drm/mgag200/mgag200_ttm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c index 3acb2b0..6461fd2 100644 --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c @@ -316,10 +316,8 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align, return -ENOMEM; ret = drm_gem_object_init(dev, &mgabo->gem, size); - if (ret) { - kfree(mgabo); - return ret; - } + if (ret) + goto err; mgabo->gem.driver_private = NULL; mgabo->bo.bdev = &mdev->ttm.bdev; @@ -334,10 +332,13 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align, align >> PAGE_SHIFT, false, NULL, acc_size, NULL, mgag200_bo_ttm_destroy); if (ret) - return ret; + goto err; *pmgabo = mgabo; return 0; +err: + kfree(mgabo); + return ret; } static inline u64 mgag200_bo_gpu_offset(struct mgag200_bo *bo) -- 1.8.1.4