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

P2P: Fix the setter function for DBus group properties

Browse source 
The setter function uses the same hostapd_data structure as the getter
which causes it to crash if called on a P2P client. To overcome this
issue, the role is checked to ensure it is called on a group owner and
the pointer is examined for validity. The function will return an error
if called on a non-GO system.

Signed-hostap: Todd Previte <toddx.a.previte@intel.com>
Signed-hostap: Angie Chinchilla <angie.v.chinchilla@intel.com>
intended-for: hostap-1
This commit is contained in:
Todd Previte 2012-02-04 13:13:59 +02:00 committed by Jouni Malinen
parent aa89df5699
commit 4bb70bd80d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -1770,13 +1770,13 @@ dbus_bool_t wpas_dbus_setter_p2p_group_properties(DBusMessageIter *iter,
DBusMessageIter variant_iter, iter_dict;
struct wpa_dbus_dict_entry entry = { .type = DBUS_TYPE_STRING };
unsigned int i;
struct hostapd_data *hapd = wpa_s->ap_iface->bss[0];
struct hostapd_data *hapd = NULL;
if (!hapd) {
dbus_set_error_const(error, DBUS_ERROR_FAILED,
"internal error");
if (wpas_get_p2p_role(wpa_s) == WPAS_P2P_ROLE_GO &&
wpa_s->ap_iface != NULL)
hapd = wpa_s->ap_iface->bss[0];
else
return FALSE;
}
dbus_message_iter_recurse(iter, &variant_iter);
if (!wpa_dbus_dict_open_read(&variant_iter, &iter_dict, error))