mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 17:22:07 +00:00
Bluetooth: MGMT: Mark LL Privacy as stable
This marks LL Privacy as stable by removing its experimental UUID and move its functionality to Device Flag (HCI_CONN_FLAG_ADDRESS_RESOLUTION) which can be set by MGMT Device Set Flags so userspace retain control of the feature. Link: https://github.com/bluez/bluez/issues/1028 Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz
parent
fcd17fe2de
commit
514e14b1a7
@ -438,7 +438,6 @@ enum {
|
||||
HCI_FORCE_BREDR_SMP,
|
||||
HCI_FORCE_STATIC_ADDR,
|
||||
HCI_LL_RPA_RESOLUTION,
|
||||
HCI_ENABLE_LL_PRIVACY,
|
||||
HCI_CMD_PENDING,
|
||||
HCI_FORCE_NO_MITM,
|
||||
HCI_QUALITY_REPORT,
|
||||
|
||||
@ -157,8 +157,9 @@ struct bdaddr_list_with_irk {
|
||||
|
||||
/* Bitmask of connection flags */
|
||||
enum hci_conn_flags {
|
||||
HCI_CONN_FLAG_REMOTE_WAKEUP = 1,
|
||||
HCI_CONN_FLAG_DEVICE_PRIVACY = 2,
|
||||
HCI_CONN_FLAG_REMOTE_WAKEUP = BIT(0),
|
||||
HCI_CONN_FLAG_DEVICE_PRIVACY = BIT(1),
|
||||
HCI_CONN_FLAG_ADDRESS_RESOLUTION = BIT(2),
|
||||
};
|
||||
typedef u8 hci_conn_flags_t;
|
||||
|
||||
@ -1919,11 +1920,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
|
||||
|
||||
#define ll_privacy_capable(dev) ((dev)->le_features[0] & HCI_LE_LL_PRIVACY)
|
||||
|
||||
/* Use LL Privacy based address resolution if supported */
|
||||
#define use_ll_privacy(dev) (ll_privacy_capable(dev) && \
|
||||
hci_dev_test_flag(dev, HCI_ENABLE_LL_PRIVACY))
|
||||
|
||||
#define privacy_mode_capable(dev) (use_ll_privacy(dev) && \
|
||||
#define privacy_mode_capable(dev) (ll_privacy_capable(dev) && \
|
||||
(hdev->commands[39] & 0x04))
|
||||
|
||||
#define read_key_size_capable(dev) \
|
||||
|
||||
@ -1066,7 +1066,7 @@ int hci_update_random_address_sync(struct hci_dev *hdev, bool require_privacy,
|
||||
/* If Controller supports LL Privacy use own address type is
|
||||
* 0x03
|
||||
*/
|
||||
if (use_ll_privacy(hdev))
|
||||
if (ll_privacy_capable(hdev))
|
||||
*own_addr_type = ADDR_LE_DEV_RANDOM_RESOLVED;
|
||||
else
|
||||
*own_addr_type = ADDR_LE_DEV_RANDOM;
|
||||
@ -2162,7 +2162,7 @@ static int hci_le_set_scan_enable_sync(struct hci_dev *hdev, u8 val,
|
||||
|
||||
static int hci_le_set_addr_resolution_enable_sync(struct hci_dev *hdev, u8 val)
|
||||
{
|
||||
if (!use_ll_privacy(hdev))
|
||||
if (!ll_privacy_capable(hdev))
|
||||
return 0;
|
||||
|
||||
/* If controller is not/already resolving we are done. */
|
||||
@ -2254,7 +2254,7 @@ static int hci_le_del_resolve_list_sync(struct hci_dev *hdev,
|
||||
struct hci_cp_le_del_from_resolv_list cp;
|
||||
struct bdaddr_list_with_irk *entry;
|
||||
|
||||
if (!use_ll_privacy(hdev))
|
||||
if (!ll_privacy_capable(hdev))
|
||||
return 0;
|
||||
|
||||
/* Check if the IRK has been programmed */
|
||||
@ -2319,7 +2319,7 @@ static int hci_le_add_resolve_list_sync(struct hci_dev *hdev,
|
||||
struct bdaddr_list_with_irk *entry;
|
||||
struct hci_conn_params *p;
|
||||
|
||||
if (!use_ll_privacy(hdev))
|
||||
if (!ll_privacy_capable(hdev))
|
||||
return 0;
|
||||
|
||||
/* Attempt to program local identity address, type and irk if params is
|
||||
@ -2332,7 +2332,8 @@ static int hci_le_add_resolve_list_sync(struct hci_dev *hdev,
|
||||
hci_copy_identity_address(hdev, &cp.bdaddr, &cp.bdaddr_type);
|
||||
memcpy(cp.peer_irk, hdev->irk, 16);
|
||||
goto done;
|
||||
}
|
||||
} else if (!(params->flags & HCI_CONN_FLAG_ADDRESS_RESOLUTION))
|
||||
return 0;
|
||||
|
||||
irk = hci_find_irk_by_addr(hdev, ¶ms->addr, params->addr_type);
|
||||
if (!irk)
|
||||
@ -2379,6 +2380,10 @@ static int hci_le_set_privacy_mode_sync(struct hci_dev *hdev,
|
||||
struct hci_cp_le_set_privacy_mode cp;
|
||||
struct smp_irk *irk;
|
||||
|
||||
if (!ll_privacy_capable(hdev) ||
|
||||
!(params->flags & HCI_CONN_FLAG_ADDRESS_RESOLUTION))
|
||||
return 0;
|
||||
|
||||
/* If device privacy mode has already been set there is nothing to do */
|
||||
if (params->privacy_mode == HCI_DEVICE_PRIVACY)
|
||||
return 0;
|
||||
@ -2428,11 +2433,6 @@ static int hci_le_add_accept_list_sync(struct hci_dev *hdev,
|
||||
if (*num_entries >= hdev->le_accept_list_size)
|
||||
return -ENOSPC;
|
||||
|
||||
/* Accept list can not be used with RPAs */
|
||||
if (!use_ll_privacy(hdev) &&
|
||||
hci_find_irk_by_addr(hdev, ¶ms->addr, params->addr_type))
|
||||
return -EINVAL;
|
||||
|
||||
/* Attempt to program the device in the resolving list first to avoid
|
||||
* having to rollback in case it fails since the resolving list is
|
||||
* dynamic it can probably be smaller than the accept list.
|
||||
@ -2567,7 +2567,7 @@ static int hci_pause_addr_resolution(struct hci_dev *hdev)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!use_ll_privacy(hdev))
|
||||
if (!ll_privacy_capable(hdev))
|
||||
return 0;
|
||||
|
||||
if (!hci_dev_test_flag(hdev, HCI_LL_RPA_RESOLUTION))
|
||||
@ -2671,12 +2671,12 @@ static int hci_le_clear_accept_list_sync(struct hci_dev *hdev)
|
||||
*
|
||||
* Update is done using the following sequence:
|
||||
*
|
||||
* use_ll_privacy((Disable Advertising) -> Disable Resolving List) ->
|
||||
* ll_privacy_capable((Disable Advertising) -> Disable Resolving List) ->
|
||||
* Remove Devices From Accept List ->
|
||||
* (has IRK && use_ll_privacy(Remove Devices From Resolving List))->
|
||||
* (has IRK && ll_privacy_capable(Remove Devices From Resolving List))->
|
||||
* Add Devices to Accept List ->
|
||||
* (has IRK && use_ll_privacy(Remove Devices From Resolving List)) ->
|
||||
* use_ll_privacy(Enable Resolving List -> (Enable Advertising)) ->
|
||||
* (has IRK && ll_privacy_capable(Remove Devices From Resolving List)) ->
|
||||
* ll_privacy_capable(Enable Resolving List -> (Enable Advertising)) ->
|
||||
* Enable Scanning
|
||||
*
|
||||
* In case of failure advertising shall be restored to its original state and
|
||||
@ -2697,7 +2697,7 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
|
||||
/* Pause advertising if resolving list can be used as controllers
|
||||
* cannot accept resolving list modifications while advertising.
|
||||
*/
|
||||
if (use_ll_privacy(hdev)) {
|
||||
if (ll_privacy_capable(hdev)) {
|
||||
err = hci_pause_advertising_sync(hdev);
|
||||
if (err) {
|
||||
bt_dev_err(hdev, "pause advertising failed: %d", err);
|
||||
@ -2842,7 +2842,7 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)
|
||||
bt_dev_err(hdev, "Unable to enable LL privacy: %d", err);
|
||||
|
||||
/* Resume advertising if it was paused */
|
||||
if (use_ll_privacy(hdev))
|
||||
if (ll_privacy_capable(hdev))
|
||||
hci_resume_advertising_sync(hdev);
|
||||
|
||||
/* Select filter policy to use accept list */
|
||||
@ -3100,7 +3100,7 @@ static int hci_passive_scan_sync(struct hci_dev *hdev)
|
||||
* If there are devices to scan:
|
||||
*
|
||||
* Disable Scanning -> Update Accept List ->
|
||||
* use_ll_privacy((Disable Advertising) -> Disable Resolving List ->
|
||||
* ll_privacy_capable((Disable Advertising) -> Disable Resolving List ->
|
||||
* Update Resolving List -> Enable Resolving List -> (Enable Advertising)) ->
|
||||
* Enable Scanning
|
||||
*
|
||||
@ -3454,7 +3454,7 @@ int hci_update_name_sync(struct hci_dev *hdev)
|
||||
*
|
||||
* HCI_SSP_ENABLED(Enable SSP)
|
||||
* HCI_LE_ENABLED(Enable LE)
|
||||
* HCI_LE_ENABLED(use_ll_privacy(Add local IRK to Resolving List) ->
|
||||
* HCI_LE_ENABLED(ll_privacy_capable(Add local IRK to Resolving List) ->
|
||||
* Update adv data)
|
||||
* Enable Authentication
|
||||
* lmp_bredr_capable(Set Fast Connectable -> Set Scan Type -> Set Class ->
|
||||
@ -4229,6 +4229,14 @@ static int hci_le_set_event_mask_sync(struct hci_dev *hdev)
|
||||
if (use_enhanced_conn_complete(hdev))
|
||||
events[1] |= 0x02; /* LE Enhanced Connection Complete */
|
||||
|
||||
/* Mark Device Privacy if Privacy Mode is supported */
|
||||
if (privacy_mode_capable(hdev))
|
||||
hdev->conn_flags |= HCI_CONN_FLAG_DEVICE_PRIVACY;
|
||||
|
||||
/* Mark Address Resolution if LL Privacy is supported */
|
||||
if (ll_privacy_capable(hdev))
|
||||
hdev->conn_flags |= HCI_CONN_FLAG_ADDRESS_RESOLUTION;
|
||||
|
||||
/* If the controller supports Extended Scanner Filter
|
||||
* Policies, enable the corresponding event.
|
||||
*/
|
||||
@ -5385,7 +5393,7 @@ int hci_stop_discovery_sync(struct hci_dev *hdev)
|
||||
}
|
||||
|
||||
/* Resume advertising if it was paused */
|
||||
if (use_ll_privacy(hdev))
|
||||
if (ll_privacy_capable(hdev))
|
||||
hci_resume_advertising_sync(hdev);
|
||||
|
||||
/* No further actions needed for LE-only discovery */
|
||||
@ -5897,7 +5905,7 @@ static int hci_active_scan_sync(struct hci_dev *hdev, uint16_t interval)
|
||||
|
||||
failed:
|
||||
/* Resume advertising if it was paused */
|
||||
if (use_ll_privacy(hdev))
|
||||
if (ll_privacy_capable(hdev))
|
||||
hci_resume_advertising_sync(hdev);
|
||||
|
||||
/* Resume passive scanning */
|
||||
@ -6673,7 +6681,7 @@ int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,
|
||||
/* If Controller supports LL Privacy use own address type is
|
||||
* 0x03
|
||||
*/
|
||||
if (use_ll_privacy(hdev))
|
||||
if (ll_privacy_capable(hdev))
|
||||
*own_addr_type = ADDR_LE_DEV_RANDOM_RESOLVED;
|
||||
else
|
||||
*own_addr_type = ADDR_LE_DEV_RANDOM;
|
||||
|
||||
@ -4417,12 +4417,6 @@ static const u8 le_simultaneous_roles_uuid[16] = {
|
||||
0x96, 0x46, 0xc0, 0x42, 0xb5, 0x10, 0x1b, 0x67,
|
||||
};
|
||||
|
||||
/* 15c0a148-c273-11ea-b3de-0242ac130004 */
|
||||
static const u8 rpa_resolution_uuid[16] = {
|
||||
0x04, 0x00, 0x13, 0xac, 0x42, 0x02, 0xde, 0xb3,
|
||||
0xea, 0x11, 0x73, 0xc2, 0x48, 0xa1, 0xc0, 0x15,
|
||||
};
|
||||
|
||||
/* 6fbaf188-05e0-496a-9885-d6ddfdb4e03e */
|
||||
static const u8 iso_socket_uuid[16] = {
|
||||
0x3e, 0xe0, 0xb4, 0xfd, 0xdd, 0xd6, 0x85, 0x98,
|
||||
@ -4473,17 +4467,6 @@ static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev,
|
||||
idx++;
|
||||
}
|
||||
|
||||
if (hdev && ll_privacy_capable(hdev)) {
|
||||
if (hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY))
|
||||
flags = BIT(0) | BIT(1);
|
||||
else
|
||||
flags = BIT(1);
|
||||
|
||||
memcpy(rp->features[idx].uuid, rpa_resolution_uuid, 16);
|
||||
rp->features[idx].flags = cpu_to_le32(flags);
|
||||
idx++;
|
||||
}
|
||||
|
||||
if (hdev && (aosp_has_quality_report(hdev) ||
|
||||
hdev->set_quality_report)) {
|
||||
if (hci_dev_test_flag(hdev, HCI_QUALITY_REPORT))
|
||||
@ -4540,27 +4523,6 @@ static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev,
|
||||
return status;
|
||||
}
|
||||
|
||||
static int exp_ll_privacy_feature_changed(bool enabled, struct hci_dev *hdev,
|
||||
struct sock *skip)
|
||||
{
|
||||
struct mgmt_ev_exp_feature_changed ev;
|
||||
|
||||
memset(&ev, 0, sizeof(ev));
|
||||
memcpy(ev.uuid, rpa_resolution_uuid, 16);
|
||||
ev.flags = cpu_to_le32((enabled ? BIT(0) : 0) | BIT(1));
|
||||
|
||||
// Do we need to be atomic with the conn_flags?
|
||||
if (enabled && privacy_mode_capable(hdev))
|
||||
hdev->conn_flags |= HCI_CONN_FLAG_DEVICE_PRIVACY;
|
||||
else
|
||||
hdev->conn_flags &= ~HCI_CONN_FLAG_DEVICE_PRIVACY;
|
||||
|
||||
return mgmt_limited_event(MGMT_EV_EXP_FEATURE_CHANGED, hdev,
|
||||
&ev, sizeof(ev),
|
||||
HCI_MGMT_EXP_FEATURE_EVENTS, skip);
|
||||
|
||||
}
|
||||
|
||||
static int exp_feature_changed(struct hci_dev *hdev, const u8 *uuid,
|
||||
bool enabled, struct sock *skip)
|
||||
{
|
||||
@ -4601,16 +4563,6 @@ static int set_zero_key_func(struct sock *sk, struct hci_dev *hdev,
|
||||
}
|
||||
#endif
|
||||
|
||||
if (hdev && use_ll_privacy(hdev) && !hdev_is_powered(hdev)) {
|
||||
bool changed;
|
||||
|
||||
changed = hci_dev_test_and_clear_flag(hdev,
|
||||
HCI_ENABLE_LL_PRIVACY);
|
||||
if (changed)
|
||||
exp_feature_changed(hdev, rpa_resolution_uuid, false,
|
||||
sk);
|
||||
}
|
||||
|
||||
hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);
|
||||
|
||||
return mgmt_cmd_complete(sk, hdev ? hdev->id : MGMT_INDEX_NONE,
|
||||
@ -4716,71 +4668,6 @@ static int set_mgmt_mesh_func(struct sock *sk, struct hci_dev *hdev,
|
||||
return err;
|
||||
}
|
||||
|
||||
static int set_rpa_resolution_func(struct sock *sk, struct hci_dev *hdev,
|
||||
struct mgmt_cp_set_exp_feature *cp,
|
||||
u16 data_len)
|
||||
{
|
||||
struct mgmt_rp_set_exp_feature rp;
|
||||
bool val, changed;
|
||||
int err;
|
||||
u32 flags;
|
||||
|
||||
/* Command requires to use the controller index */
|
||||
if (!hdev)
|
||||
return mgmt_cmd_status(sk, MGMT_INDEX_NONE,
|
||||
MGMT_OP_SET_EXP_FEATURE,
|
||||
MGMT_STATUS_INVALID_INDEX);
|
||||
|
||||
/* Changes can only be made when controller is powered down */
|
||||
if (hdev_is_powered(hdev))
|
||||
return mgmt_cmd_status(sk, hdev->id,
|
||||
MGMT_OP_SET_EXP_FEATURE,
|
||||
MGMT_STATUS_REJECTED);
|
||||
|
||||
/* Parameters are limited to a single octet */
|
||||
if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1)
|
||||
return mgmt_cmd_status(sk, hdev->id,
|
||||
MGMT_OP_SET_EXP_FEATURE,
|
||||
MGMT_STATUS_INVALID_PARAMS);
|
||||
|
||||
/* Only boolean on/off is supported */
|
||||
if (cp->param[0] != 0x00 && cp->param[0] != 0x01)
|
||||
return mgmt_cmd_status(sk, hdev->id,
|
||||
MGMT_OP_SET_EXP_FEATURE,
|
||||
MGMT_STATUS_INVALID_PARAMS);
|
||||
|
||||
val = !!cp->param[0];
|
||||
|
||||
if (val) {
|
||||
changed = !hci_dev_test_and_set_flag(hdev,
|
||||
HCI_ENABLE_LL_PRIVACY);
|
||||
hci_dev_clear_flag(hdev, HCI_ADVERTISING);
|
||||
|
||||
/* Enable LL privacy + supported settings changed */
|
||||
flags = BIT(0) | BIT(1);
|
||||
} else {
|
||||
changed = hci_dev_test_and_clear_flag(hdev,
|
||||
HCI_ENABLE_LL_PRIVACY);
|
||||
|
||||
/* Disable LL privacy + supported settings changed */
|
||||
flags = BIT(1);
|
||||
}
|
||||
|
||||
memcpy(rp.uuid, rpa_resolution_uuid, 16);
|
||||
rp.flags = cpu_to_le32(flags);
|
||||
|
||||
hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);
|
||||
|
||||
err = mgmt_cmd_complete(sk, hdev->id,
|
||||
MGMT_OP_SET_EXP_FEATURE, 0,
|
||||
&rp, sizeof(rp));
|
||||
|
||||
if (changed)
|
||||
exp_ll_privacy_feature_changed(val, hdev, sk);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int set_quality_report_func(struct sock *sk, struct hci_dev *hdev,
|
||||
struct mgmt_cp_set_exp_feature *cp,
|
||||
u16 data_len)
|
||||
@ -5032,7 +4919,6 @@ static const struct mgmt_exp_feature {
|
||||
EXP_FEAT(debug_uuid, set_debug_func),
|
||||
#endif
|
||||
EXP_FEAT(mgmt_mesh_uuid, set_mgmt_mesh_func),
|
||||
EXP_FEAT(rpa_resolution_uuid, set_rpa_resolution_func),
|
||||
EXP_FEAT(quality_report_uuid, set_quality_report_func),
|
||||
EXP_FEAT(offload_codecs_uuid, set_offload_codec_func),
|
||||
EXP_FEAT(le_simultaneous_roles_uuid, set_le_simultaneous_roles_func),
|
||||
@ -5062,22 +4948,6 @@ static int set_exp_feature(struct sock *sk, struct hci_dev *hdev,
|
||||
MGMT_STATUS_NOT_SUPPORTED);
|
||||
}
|
||||
|
||||
static u32 get_params_flags(struct hci_dev *hdev,
|
||||
struct hci_conn_params *params)
|
||||
{
|
||||
u32 flags = hdev->conn_flags;
|
||||
|
||||
/* Devices using RPAs can only be programmed in the acceptlist if
|
||||
* LL Privacy has been enable otherwise they cannot mark
|
||||
* HCI_CONN_FLAG_REMOTE_WAKEUP.
|
||||
*/
|
||||
if ((flags & HCI_CONN_FLAG_REMOTE_WAKEUP) && !use_ll_privacy(hdev) &&
|
||||
hci_find_irk_by_addr(hdev, ¶ms->addr, params->addr_type))
|
||||
flags &= ~HCI_CONN_FLAG_REMOTE_WAKEUP;
|
||||
|
||||
return flags;
|
||||
}
|
||||
|
||||
static int get_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
u16 data_len)
|
||||
{
|
||||
@ -5112,7 +4982,6 @@ static int get_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
if (!params)
|
||||
goto done;
|
||||
|
||||
supported_flags = get_params_flags(hdev, params);
|
||||
current_flags = params->flags;
|
||||
}
|
||||
|
||||
@ -5192,7 +5061,7 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
supported_flags = get_params_flags(hdev, params);
|
||||
supported_flags = hdev->conn_flags;
|
||||
|
||||
if ((supported_flags | current_flags) != supported_flags) {
|
||||
bt_dev_warn(hdev, "Bad flag given (0x%x) vs supported (0x%0x)",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user