Fix fd (and mem) leak when intel_scrn_create fails
PATCH RESEND 1/1 Fix fd (and mem) leak when intel_scrn_create fails
The probe functions in intel_module.c call intel_open_device() before calling intel_scrn_create(), but if the later fails because of e.g. an unsupported (new) pci-id they were not cleaning up the resources claimed by intel_open_device(), esp. leaking the fd is a problem because this breaks the fallback to the modesetting driver.
This commit fixes this by adding a intel_close_device() cleanup function and calling that when intel_scrn_create() fails.
Signed-off-by Hans de Goede <[email protected]>
--- src/intel_device.c | 17 +++++++++++++++++ src/intel_driver.h | 1 + src/intel_module.c | 19 ++++++++++++++++--- 3 files changed, 34 insertions(+), 3 deletions(-)
src/intel_device.c +17 -0
@@ -643,6 +643,23 @@ err_path:return -1 ; } +void intel_close_device (int entity_num) +{ +struct intel_device *dev; + + dev =xf86GetEntityPrivate (entity_num, intel_device_key)->ptr; + +xf86GetEntityPrivate (entity_num, intel_device_key)->ptr =NULL ; + +if (dev->master_count ==0 )/* Don't close server-fds */ +close (dev->fd); + +if (dev->render_node != dev->master_node) +free (dev->render_node); +free (dev->master_node); +free (dev); +} +int __intel_peek_fd (ScrnInfoPtr scrn) {struct intel_device *dev;
src/intel_driver.h +1 -0
@@ -124,6 +124,7 @@ int intel_entity_get_devid(int index);int intel_open_device (int entity_num,const struct pci_device *pci,struct xf86_platform_device *dev); +void intel_close_device (int entity_num);int __intel_peek_fd (ScrnInfoPtr scrn);struct intel_device *intel_get_device (ScrnInfoPtr scrn,int *fd);int intel_has_render_node (struct intel_device *dev);
src/intel_module.c +16 -3
@@ -631,6 +631,8 @@ static Bool intel_pci_probe(DriverPtr driver, struct pci_device *pci, intptr_t match_data) { +Bool result; +if (intel_open_device (entity_num, pci,NULL ) ==-1 ) {#if UMS switch (pci->device_id) {
@@ -648,7 +650,11 @@ static Bool intel_pci_probe(DriverPtr driver,#endif } -return intel_scrn_create (driver, entity_num, match_data,0 ); + result =intel_scrn_create (driver, entity_num, match_data,0 ); +if (!result) +intel_close_device (entity_num); + +return result; }#ifdef XSERVER_PLATFORM_BUS
@@ -659,6 +665,7 @@ intel_platform_probe(DriverPtr driver, intptr_t match_data) {unsigned scrn_flags =0 ; +Bool result;if (intel_open_device (entity_num, dev->pdev, dev) ==-1 )return FALSE;
@@ -670,10 +677,16 @@ intel_platform_probe(DriverPtr driver, }/* if we get any flags we don't understand fail to probe for now */ -if (flags) +if (flags) { +intel_close_device (entity_num);return FALSE; + } + + result =intel_scrn_create (driver, entity_num, match_data, scrn_flags); +if (!result) +intel_close_device (entity_num); -return intel_scrn_create (driver, entity_num, match_data, scrn_flags); +return result; }#endif
Signature · 6 lines
2.7.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel