mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-02 06:46:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

security: add missing NULL checks after strdup/calloc in backend-hsphfpd

Browse source 
Memory Safety: Medium

Multiple allocation results in the HSP/HFP daemon backend were not
checked for NULL:

- transport_data->transport_path strdup in new_audio_connection()
- endpoint->remote_address and local_address strdup in property parsing
- t_path strdup before spa_bt_transport_create()
- endpoint calloc and endpoint->path strdup in interface enumeration
- backend->hsphfpd_service_id strdup after registration

Each could cause a NULL pointer dereference under memory pressure. Add
appropriate NULL checks with error returns matching the existing patterns
in each function (DBUS_HANDLER_RESULT_NEED_MEMORY or -ENOMEM).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Wim Taymans 2026-04-29 11:36:32 +02:00
parent c3c1216633
commit acabcf085d
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
spa/plugins/bluez5/backend-hsphfpd.c
View file

@ -675,6 +675,8 @@ static DBusHandlerResult hsphfpd_new_audio_connection(DBusConnection *conn, DBus
transport_data = transport->user_data; transport_data = transport->user_data;
transport_data->transport_path = strdup(transport_path); transport_data->transport_path = strdup(transport_path);
if (transport_data->transport_path == NULL)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
transport_data->rx_soft_volume = (rx_volume_control != HSPHFPD_VOLUME_CONTROL_REMOTE); transport_data->rx_soft_volume = (rx_volume_control != HSPHFPD_VOLUME_CONTROL_REMOTE);
transport_data->tx_soft_volume = (tx_volume_control != HSPHFPD_VOLUME_CONTROL_REMOTE); transport_data->tx_soft_volume = (tx_volume_control != HSPHFPD_VOLUME_CONTROL_REMOTE);
transport_data->rx_volume_gain = rx_volume_gain; transport_data->rx_volume_gain = rx_volume_gain;
@ -974,11 +976,15 @@ static DBusHandlerResult hsphfpd_parse_endpoint_properties(struct impl *backend,
{ {
const char *value; const char *value;
dbus_message_iter_get_basic(&value_i, &value); dbus_message_iter_get_basic(&value_i, &value);
if (spa_streq(key, "RemoteAddress")) if (spa_streq(key, "RemoteAddress")) {
endpoint->remote_address = strdup(value); endpoint->remote_address = strdup(value);
else if (spa_streq(key, "LocalAddress")) if (endpoint->remote_address == NULL)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
} else if (spa_streq(key, "LocalAddress")) {
endpoint->local_address = strdup(value); endpoint->local_address = strdup(value);
else if (spa_streq(key, "Profile")) { if (endpoint->local_address == NULL)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
} else if (spa_streq(key, "Profile")) {
if (endpoint->profile) if (endpoint->profile)
spa_log_warn(backend->log, "Endpoint %s received a duplicate '%s' property, ignoring", endpoint->path, key); spa_log_warn(backend->log, "Endpoint %s received a duplicate '%s' property, ignoring", endpoint->path, key);
else if (spa_streq(value, "headset")) else if (spa_streq(value, "headset"))
@ -1076,6 +1082,8 @@ static DBusHandlerResult hsphfpd_parse_endpoint_properties(struct impl *backend,
} }
char *t_path = strdup(endpoint->path); char *t_path = strdup(endpoint->path);
if (t_path == NULL)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
t = spa_bt_transport_create(backend->monitor, t_path, sizeof(struct hsphfpd_transport_data)); t = spa_bt_transport_create(backend->monitor, t_path, sizeof(struct hsphfpd_transport_data));
if (t == NULL) { if (t == NULL) {
spa_log_warn(backend->log, "can't create transport: %m"); spa_log_warn(backend->log, "can't create transport: %m");
@ -1138,7 +1146,13 @@ static DBusHandlerResult hsphfpd_parse_interfaces(struct impl *backend, DBusMess
endpoint = endpoint_find(backend, path); endpoint = endpoint_find(backend, path);
if (!endpoint) { if (!endpoint) {
endpoint = calloc(1, sizeof(struct hsphfpd_endpoint)); endpoint = calloc(1, sizeof(struct hsphfpd_endpoint));
if (endpoint == NULL)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
endpoint->path = strdup(path); endpoint->path = strdup(path);
if (endpoint->path == NULL) {
free(endpoint);
return DBUS_HANDLER_RESULT_NEED_MEMORY;
}
spa_list_append(&backend->endpoint_list, &endpoint->link); spa_list_append(&backend->endpoint_list, &endpoint->link);
spa_log_debug(backend->log, "Found endpoint %s", path); spa_log_debug(backend->log, "Found endpoint %s", path);
} }
@ -1224,6 +1238,8 @@ static int hsphfpd_register(struct impl *backend)
} }
backend->hsphfpd_service_id = strdup(dbus_message_get_sender(r)); backend->hsphfpd_service_id = strdup(dbus_message_get_sender(r));
if (backend->hsphfpd_service_id == NULL)
return -ENOMEM;
spa_log_debug(backend->log, "Registered to hsphfpd"); spa_log_debug(backend->log, "Registered to hsphfpd");