Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-13 16:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACPI]

Browse source 
- Addendum to r69867: free device info pointer at the end of acpi_bus_add to avoid use after free.
Powered by Special Pool

svn path=/trunk/; revision=69899
This commit is contained in:
Thomas Faber 2015-11-16 14:20:25 +00:00
parent 352bcdb0e1
commit ad4ae38293
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/drivers/bus/acpi/busmgr/bus.c
View file

@ -1138,7 +1138,7 @@ acpi_bus_add (
struct acpi_device *device = NULL;
char bus_id[5] = {'?',0};
ACPI_BUFFER buffer;
ACPI_DEVICE_INFO *info;
ACPI_DEVICE_INFO *info = NULL;
char *hid = NULL;
char *uid = NULL;
ACPI_PNP_DEVICE_ID_LIST *cid_list = NULL;
@ -1248,6 +1248,7 @@ acpi_bus_add (
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Error reading device info\n"));
result = AE_NOT_FOUND;
info = NULL;
goto end;
}
if (info->Valid & ACPI_VALID_HID)
@ -1266,7 +1267,6 @@ acpi_bus_add (
device->pnp.bus_address = info->Address;
device->flags.bus_address = 1;
}
ACPI_FREE(info);
break;
case ACPI_BUS_TYPE_POWER:
hid = ACPI_POWER_HID;
@ -1427,6 +1427,8 @@ acpi_bus_add (
acpi_bus_find_driver(device);
end:
if (info != NULL)
ACPI_FREE(info);
if (result) {
if (device->pnp.cid_list) {
ExFreePoolWithTag(device->pnp.cid_list, 'DpcA');