[Bluez,v1,04/14] core: add adapter and device allowed_uuid functions

Message ID	20210708142059.Bluez.v1.4.Ibc0b5f02cb249f9aca9efe45e2dadc5e50b7d89e@changeid (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-bluetooth-owner@kernel.org> Date: Thu, 8 Jul 2021 14:23:04 +0800 In-Reply-To: <20210708062314.245754-1-howardchung@google.com> Message-Id: <20210708142059.Bluez.v1.4.Ibc0b5f02cb249f9aca9efe45e2dadc5e50b7d89e@changeid> Mime-Version: 1.0 References: <20210708062314.245754-1-howardchung@google.com> Subject: [Bluez PATCH v1 04/14] core: add adapter and device allowed_uuid functions From: Howard Chung <howardchung@google.com> To: linux-bluetooth@vger.kernel.org, luiz.dentz@gmail.com Cc: Yun-Hao Chung <howardchung@chromium.org>, Miao-chen Chou <mcchou@chromium.org> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	[Bluez,v1,01/14] lib: add hash functions for bt_uuid_t \| expand [Bluez,v1,00/14] [Bluez,v1,01/14] lib: add hash functions for bt_uuid_t [Bluez,v1,02/14] unit: add uuid unit tests [Bluez,v1,03/14] core: add is_allowed property in btd_service [Bluez,v1,04/14] core: add adapter and device allowed_uuid functions [Bluez,v1,05/14] core: add device state and state callbacks [Bluez,v1,06/14] audio: Remove Media1 interface when a2dp source disallowed [Bluez,v1,07/14] plugins: add a new plugin for admin_policy [Bluez,v1,08/14] plugins/admin_policy: add admin_policy adapter driver [Bluez,v1,09/14] plugins/admin_policy: add ServiceAllowList method [Bluez,v1,10/14] plugins/admin_policy: add ServiceAllowList property [Bluez,v1,11/14] plugins/admin_policy: add device state callback [Bluez,v1,12/14] plugins/admin_policy: add AffectedByPolicy property [Bluez,v1,13/14] plugins/admin_policy: persist policy settings [Bluez,v1,14/14] core: fix a possible crash when removing devices

diff --git a/src/adapter.c b/src/adapter.c index 84bc5a1b09eb..f75b8acf1ffb 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -260,6 +260,8 @@ struct btd_adapter { struct btd_battery_provider_manager *battery_provider_manager; + GHashTable *allowed_uuid_set; /* Set of allowed service UUIDs */ + gboolean initialized; GSList *pin_callbacks; @@ -3480,6 +3482,87 @@ static DBusMessage *connect_device(DBusConnection *conn, return NULL; } +static void update_adapter_profile(struct btd_profile *profile, void *data) +{ + struct btd_adapter *adapter = data; + bool is_allowed; + + is_allowed = btd_adapter_is_uuid_allowed(adapter, profile->remote_uuid); + + if (is_allowed && !g_slist_find(adapter->profiles, profile)) { + adapter_add_profile(adapter, profile); + + info("service %s is allowed", profile->remote_uuid); + + } else if (!is_allowed && g_slist_find(adapter->profiles, profile)) { + adapter_remove_profile(adapter, profile); + + info("service %s is blocked", profile->remote_uuid); + } +} + +static void update_device_allowed_services(void *data, void *user_data) +{ + struct btd_device *device = data; + + btd_device_update_allowed_services(device); +} + +static void add_uuid_to_uuid_set(void *data, void *user_data) +{ + bt_uuid_t *uuid = data; + GHashTable *uuid_set = user_data; + + if (!uuid) { + error("Found NULL in UUID allowed list"); + return; + } + + g_hash_table_add(uuid_set, uuid); +} + +bool btd_adapter_set_allowed_uuids(struct btd_adapter *adapter, + struct queue *uuids) +{ + if (!adapter) + return false; + + if (adapter->allowed_uuid_set) + g_hash_table_destroy(adapter->allowed_uuid_set); + + adapter->allowed_uuid_set = g_hash_table_new(bt_uuid_hash, + bt_uuid_equal); + if (!adapter->allowed_uuid_set) { + btd_error(adapter->dev_id, + "Failed to allocate allowed_uuid_set"); + return false; + } + + queue_foreach(uuids, add_uuid_to_uuid_set, adapter->allowed_uuid_set); + btd_profile_foreach(update_adapter_profile, adapter); + g_slist_foreach(adapter->devices, update_device_allowed_services, NULL); + + return true; +} + +bool btd_adapter_is_uuid_allowed(struct btd_adapter *adapter, + const char *uuid_str) +{ + bt_uuid_t uuid; + + if (!adapter || !adapter->allowed_uuid_set) + return true; + + if (bt_string_to_uuid(&uuid, uuid_str)) { + btd_error(adapter->dev_id, + "Failed to parse UUID string '%s'", uuid_str); + return false; + } + + return !g_hash_table_size(adapter->allowed_uuid_set) || + g_hash_table_contains(adapter->allowed_uuid_set, &uuid); +} + static const GDBusMethodTable adapter_methods[] = { { GDBUS_ASYNC_METHOD("StartDiscovery", NULL, NULL, start_discovery) }, { GDBUS_METHOD("SetDiscoveryFilter", @@ -4691,6 +4774,12 @@ static void probe_profile(struct btd_profile *profile, void *data) if (profile->adapter_probe == NULL) return; + if (!btd_adapter_is_uuid_allowed(adapter, profile->remote_uuid)) { + info("service %s is not allowed to probe", + profile->remote_uuid); + return; + } + err = profile->adapter_probe(profile, adapter); if (err < 0) { btd_error(adapter->dev_id, "%s: %s (%d)", profile->name, @@ -5395,6 +5484,7 @@ static void adapter_free(gpointer user_data) g_free(adapter->stored_alias); g_free(adapter->current_alias); free(adapter->modalias); + g_hash_table_destroy(adapter->allowed_uuid_set); g_free(adapter); } diff --git a/src/adapter.h b/src/adapter.h index 60b5e3bcca34..7cac51451249 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -25,6 +25,7 @@ struct btd_adapter; struct btd_device; +struct queue; struct btd_adapter *btd_adapter_get_default(void); bool btd_adapter_is_default(struct btd_adapter *adapter); @@ -97,6 +98,8 @@ void adapter_service_remove(struct btd_adapter *adapter, uint32_t handle); struct agent *adapter_get_agent(struct btd_adapter *adapter); +bool btd_adapter_uuid_is_allowed(struct btd_adapter *adapter, const char *uuid); + struct btd_adapter *btd_adapter_ref(struct btd_adapter *adapter); void btd_adapter_unref(struct btd_adapter *adapter); @@ -240,3 +243,8 @@ enum kernel_features { }; bool btd_has_kernel_features(uint32_t feature); + +bool btd_adapter_set_allowed_uuids(struct btd_adapter *adapter, + struct queue *uuids); +bool btd_adapter_is_uuid_allowed(struct btd_adapter *adapter, + const char *uuid_str); diff --git a/src/device.c b/src/device.c index faf07ba22270..e1d82eab0988 100644 --- a/src/device.c +++ b/src/device.c @@ -1929,6 +1929,51 @@ static int service_prio_cmp(gconstpointer a, gconstpointer b) return p2->priority - p1->priority; } +bool btd_device_all_services_allowed(struct btd_device *dev) +{ + GSList *l; + struct btd_adapter *adapter = dev->adapter; + char *uuid; + + for (l = dev->uuids; l != NULL; l = g_slist_next(l)) { + uuid = l->data; + + if (!btd_adapter_is_uuid_allowed(adapter, uuid)) + return false; + } + + return true; +} + +void btd_device_update_allowed_services(struct btd_device *dev) +{ + struct btd_adapter *adapter = dev->adapter; + struct btd_service *service; + struct btd_profile *profile; + GSList *l; + bool is_allowed; + char addr[18]; + + /* If service discovery is ongoing, let the service discovery complete + * callback call this function. + */ + if (dev->browse) { + ba2str(&dev->bdaddr, addr); + DBG("service discovery of %s is ongoing. Skip updating allowed " + "services", addr); + return; + } + + for (l = dev->services; l != NULL; l = g_slist_next(l)) { + service = l->data; + profile = btd_service_get_profile(service); + + is_allowed = btd_adapter_is_uuid_allowed(adapter, + profile->remote_uuid); + btd_service_set_allowed(service, is_allowed); + } +} + static GSList *create_pending_list(struct btd_device *dev, const char *uuid) { struct btd_service *service; @@ -1937,9 +1982,14 @@ static GSList *create_pending_list(struct btd_device *dev, const char *uuid) if (uuid) { service = find_connectable_service(dev, uuid); - if (service) + + if (!service) + return dev->pending; + + if (btd_service_is_allowed(service)) return g_slist_prepend(dev->pending, service); + info("service %s is blocked", uuid); return dev->pending; } @@ -1950,6 +2000,11 @@ static GSList *create_pending_list(struct btd_device *dev, const char *uuid) if (!p->auto_connect) continue; + if (!btd_service_is_allowed(service)) { + info("service %s is blocked", p->remote_uuid); + continue; + } + if (g_slist_find(dev->pending, service)) continue; @@ -2633,6 +2688,8 @@ static void device_svc_resolved(struct btd_device *dev, uint8_t browse_type, dev->svc_callbacks); g_free(cb); } + + btd_device_update_allowed_services(dev); } static struct bonding_req *bonding_request_new(DBusMessage *msg, diff --git a/src/device.h b/src/device.h index 4ae9abe0dbb4..5f615cb4b6b2 100644 --- a/src/device.h +++ b/src/device.h @@ -175,5 +175,7 @@ uint32_t btd_device_get_current_flags(struct btd_device *dev); void btd_device_flags_changed(struct btd_device *dev, uint32_t supported_flags, uint32_t current_flags); +bool btd_device_all_services_allowed(struct btd_device *dev); +void btd_device_update_allowed_services(struct btd_device *dev); void btd_device_init(void); void btd_device_cleanup(void);

[Bluez,v1,04/14] core: add adapter and device allowed_uuid functions

Commit Message

Patch