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

D-Bus: Fix memory leaks on AddService/DeleteService error paths

Browse source 
The query and service parameters need to be freed on all paths to avoid
memory leaks in error cases.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-12-31 00:36:19 +02:00
parent b07f1ebe0f
commit 9c4694ce7c
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -2361,6 +2361,7 @@ DBusMessage * wpas_dbus_handler_p2p_add_service(DBusMessage *message,
version = entry.uint32_value; version = entry.uint32_value;
} else if (!os_strcmp(entry.key, "service") && } else if (!os_strcmp(entry.key, "service") &&
(entry.type == DBUS_TYPE_STRING)) { (entry.type == DBUS_TYPE_STRING)) {
os_free(service);
service = os_strdup(entry.str_value); service = os_strdup(entry.str_value);
} else if (!os_strcmp(entry.key, "query")) { } else if (!os_strcmp(entry.key, "query")) {
if ((entry.type != DBUS_TYPE_ARRAY) || if ((entry.type != DBUS_TYPE_ARRAY) ||
@ -2386,8 +2387,6 @@ DBusMessage * wpas_dbus_handler_p2p_add_service(DBusMessage *message,
if (wpas_p2p_service_add_upnp(wpa_s, version, service) != 0) if (wpas_p2p_service_add_upnp(wpa_s, version, service) != 0)
goto error; goto error;
os_free(service);
service = NULL;
} else if (bonjour == 1) { } else if (bonjour == 1) {
if (query == NULL || resp == NULL) if (query == NULL || resp == NULL)
goto error; goto error;
@ -2399,6 +2398,7 @@ DBusMessage * wpas_dbus_handler_p2p_add_service(DBusMessage *message,
} else } else
goto error; goto error;
os_free(service);
return reply; return reply;
error_clear: error_clear:
wpa_dbus_dict_entry_clear(&entry); wpa_dbus_dict_entry_clear(&entry);
@ -2452,9 +2452,10 @@ DBusMessage * wpas_dbus_handler_p2p_delete_service(
entry.type == DBUS_TYPE_INT32) entry.type == DBUS_TYPE_INT32)
version = entry.uint32_value; version = entry.uint32_value;
else if (!os_strcmp(entry.key, "service") && else if (!os_strcmp(entry.key, "service") &&
entry.type == DBUS_TYPE_STRING) entry.type == DBUS_TYPE_STRING) {
os_free(service);
service = os_strdup(entry.str_value); service = os_strdup(entry.str_value);
else } else
goto error_clear; goto error_clear;
wpa_dbus_dict_entry_clear(&entry); wpa_dbus_dict_entry_clear(&entry);
@ -2464,7 +2465,6 @@ DBusMessage * wpas_dbus_handler_p2p_delete_service(
goto error; goto error;
ret = wpas_p2p_service_del_upnp(wpa_s, version, service); ret = wpas_p2p_service_del_upnp(wpa_s, version, service);
os_free(service);
if (ret != 0) if (ret != 0)
goto error; goto error;
} else if (bonjour == 1) { } else if (bonjour == 1) {
@ -2476,6 +2476,7 @@ DBusMessage * wpas_dbus_handler_p2p_delete_service(
if ((entry.type != DBUS_TYPE_ARRAY) || if ((entry.type != DBUS_TYPE_ARRAY) ||
(entry.array_type != DBUS_TYPE_BYTE)) (entry.array_type != DBUS_TYPE_BYTE))
goto error_clear; goto error_clear;
wpabuf_free(query);
query = wpabuf_alloc_copy( query = wpabuf_alloc_copy(
entry.bytearray_value, entry.bytearray_value,
entry.array_len); entry.array_len);
@ -2491,14 +2492,17 @@ DBusMessage * wpas_dbus_handler_p2p_delete_service(
ret = wpas_p2p_service_del_bonjour(wpa_s, query); ret = wpas_p2p_service_del_bonjour(wpa_s, query);
if (ret != 0) if (ret != 0)
goto error; goto error;
wpabuf_free(query);
} else } else
goto error; goto error;
wpabuf_free(query);
os_free(service);
return reply; return reply;
error_clear: error_clear:
wpa_dbus_dict_entry_clear(&entry); wpa_dbus_dict_entry_clear(&entry);
error: error:
wpabuf_free(query);
os_free(service);
return wpas_dbus_error_invalid_args(message, NULL); return wpas_dbus_error_invalid_args(message, NULL);
} }