From 5d982ab58270743552947d61d7f00397798869bd Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Tue, 18 Jul 2017 16:43:09 +0200
Message-Id: <20170718144320.8354-4-tiwai@suse.de>
Subject: [PATCH 03/14] drm/mgag200: Fix memleak in error path in
mgag200_bo_create()
Patch-mainline: Submitted, dri-devel ML
References: bnc#806990
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 <eich@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
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 3e7e1cd31395..4082eb275b1e 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -324,10 +324,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->bo.bdev = &mdev->ttm.bdev;
@@ -341,10 +339,13 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align,
align >> PAGE_SHIFT, false, NULL, acc_size,
NULL, 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)
--
2.13.2