jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

D-Bus: Fix memory leak when using array of array of bytes

Browse source 
When parsing a dict entry which is an array of an array of bytes the entry
representing the dict entry has DBUS_TYPE_ARRAY as its type and
WPAS_DBUS_TYPE_ARRAY as its array_type. The function freeing this parsed
data incorrectly tested the entry type for WPAS_DBUS_TYPE_ARRAY while doing
no testing of this value for array_type. This results in a memory leak
whenever a D-Bus message with this type of data is parsed.

Messages affected are:
fi.w1.wpa_supplicant1.Interface.P2PDevice
	using RequestedDeviceTypes with Find method
	using SecondaryDeviceTypes or VendorExtension with P2PDeviceProperties

fi.w1.wpa_supplicant1.Group
	using WPSVendorExtensions with Properties property

All of the above messages are parsed with the same function,
wpa_dbus_dict_get_entry, so the assignment of the entry's type and
array_type is consistent. The parsed data is also consistently freed with
the same function, wpa_dbus_dict_entry_clear, so we can use the same checks
to free the data correctly.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
This commit is contained in:
Reinette Chatre 2011-08-26 16:55:29 -07:00 committed by Jouni Malinen
parent 3a26a2c9df
commit af9d709019
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wpa_supplicant/dbus/dbus_dict_helpers.c
View file

@ -1095,14 +1095,14 @@ void wpa_dbus_dict_entry_clear(struct wpa_dbus_dict_entry *entry)
os_free(entry->strarray_value[i]); os_free(entry->strarray_value[i]);
os_free(entry->strarray_value); os_free(entry->strarray_value);
break; break;
}
break;
case WPAS_DBUS_TYPE_BINARRAY: case WPAS_DBUS_TYPE_BINARRAY:
for (i = 0; i < entry->array_len; i++) for (i = 0; i < entry->array_len; i++)
wpabuf_free(entry->binarray_value[i]); wpabuf_free(entry->binarray_value[i]);
os_free(entry->binarray_value); os_free(entry->binarray_value);
break; break;
} }
break;
}
memset(entry, 0, sizeof(struct wpa_dbus_dict_entry)); memset(entry, 0, sizeof(struct wpa_dbus_dict_entry));
} }