From: Xiaotian Feng <dfeng@redhat.com>
To: airlied@linux.ie, dri-devel@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org, Xiaotian Feng <dfeng@redhat.com>
Subject: [PATCH 4/4] gpu/drm: fix memory leak if dev->driver->load fails
Date: Fri, 31 Jul 2009 16:55:58 +0800 [thread overview]
Message-ID: <1249030558-24143-5-git-send-email-dfeng@redhat.com> (raw)
In-Reply-To: <1249030558-24143-4-git-send-email-dfeng@redhat.com>
Noticed a bundle of memory leaks after radeon_driver_load_kms fails.
After dev->driver->load failes, drm_get_dev doesn't free memories
allocated from drm_fill_in_dev.
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
---
drivers/gpu/drm/drm_stub.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index fe7f5c4..db9057c 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -448,23 +448,23 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
pci_set_drvdata(pdev, dev);
ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);
if (ret)
- goto err_g2;
+ goto err_g3;
}
if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY)))
- goto err_g3;
+ goto err_g4;
if (dev->driver->load) {
ret = dev->driver->load(dev, ent->driver_data);
if (ret)
- goto err_g4;
+ goto err_g5;
}
/* setup the grouping for the legacy output */
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group);
if (ret)
- goto err_g4;
+ goto err_g5;
}
list_add_tail(&dev->driver_item, &driver->device_list);
@@ -475,11 +475,13 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
return 0;
-err_g4:
+err_g5:
drm_put_minor(&dev->primary);
-err_g3:
+err_g4:
if (drm_core_check_feature(dev, DRIVER_MODESET))
drm_put_minor(&dev->control);
+err_g3:
+ drm_cleanup_dev(dev);
err_g2:
pci_disable_device(pdev);
err_g1:
--
1.6.2.5
prev parent reply other threads:[~2009-07-31 8:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-31 8:55 [PATCH 0/4] gpu/drm: fix memory leak when radeon_driver_load_kms fails Xiaotian Feng
2009-07-31 8:55 ` [PATCH 1/4] gpu/drm/radeon: fix memory leak in radeon_driver_load_kms Xiaotian Feng
2009-07-31 8:55 ` [PATCH 2/4] gpu/drm: fix memory leak in drm_fill_in_dev fail path Xiaotian Feng
2009-07-31 8:55 ` [PATCH 3/4] gpu/drm: introduce drm_cleanup_dev to cleanup memories allocated from drm_fill_in_dev Xiaotian Feng
2009-07-31 8:55 ` Xiaotian Feng [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1249030558-24143-5-git-send-email-dfeng@redhat.com \
--to=dfeng@redhat.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome