XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-03-23 17:19:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

intel: Fix fd (and mem) leak when intel_scrn_create fails

Browse Source 
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 allocation failure 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 <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede
2016-07-12 11:02:15 +02:00
committed by Chris Wilson
parent 6d8a19910a
commit df0b2ce823
3 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/intel_device.c
View File

@@ -643,6 +643,27 @@ err_path:
return -1;
}
void intel_close_device(int entity_num)
{
struct intel_device *dev;
if (intel_device_key == -1)
return;
dev = xf86GetEntityPrivate(entity_num, intel_device_key)->ptr;
xf86GetEntityPrivate(entity_num, intel_device_key)->ptr = NULL;
if (!dev)
return;
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;

1
src/intel_driver.h
View File

@@ -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);

19
src/intel_module.c
View File

@@ -631,6 +631,8 @@ static Bool intel_pci_probe(DriverPtr driver,
struct pci_device *pci,
intptr_t match_data)
{
Bool ret;
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);
ret = intel_scrn_create(driver, entity_num, match_data, 0);
if (!ret)
intel_close_device(entity_num);
return ret;
}
#ifdef XSERVER_PLATFORM_BUS
@@ -671,9 +677,16 @@ intel_platform_probe(DriverPtr driver,
/* if we get any flags we don't understand fail to probe for now */
if (flags)
return FALSE;
goto err;
return intel_scrn_create(driver, entity_num, match_data, scrn_flags);
if (!intel_scrn_create(driver, entity_num, match_data, scrn_flags))
goto err;
return TRUE;
err:
intel_close_device(entity_num);
return FALSE;
}
#endif