drm:drm_pci: fix resource leak in drm_get_pci_dev
Subsystems (2)
PATCH 2/5 drm:drm_pci: fix resource leak in drm_get_pci_dev
We should call drm_cleanup_in_dev in error handle
code path after drm_fill_in_dev had been called,
or it will cause resource leak heavily, vmalloc
leak etc.
This patch also add call to dev->unload in error
handle code path.
Signed-off-by Wang YanQing <[email protected]>
--- drivers/gpu/drm/drm_pci.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_pci.c +11 -7
@@ -345,16 +345,16 @@ int drm_get_pci_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 */
@@ -362,7 +362,7 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, ret =drm_mode_group_init_legacy_group (dev, &dev->primary->mode_group);if (ret) - goto err_g4; + goto err_g6; }list_add_tail (&dev->driver_item, &driver->device_list);
@@ -373,12 +373,16 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,mutex_unlock (&drm_global_mutex);return 0 ; - -err_g4: +err_g6: +if (dev->driver->unload) + dev->driver->unload (dev); +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_in_dev (dev); err_g2:pci_disable_device (pdev); err_g1:
Signature · 1 line
1.7.12.4.dirty