Bluetooth: hci_event: Fix sending HCI_OP_READ_ENC_KEY_SIZE
The code shall always check if HCI_QUIRK_BROKEN_READ_ENC_KEY_SIZE has
been set before attempting to use HCI_OP_READ_ENC_KEY_SIZE.
Fixes: c569242cd4
("Bluetooth: hci_event: set the conn encrypted before conn establishes")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
parent
b23d98d46d
commit
a9a830a676
|
@ -1907,6 +1907,10 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
|
||||||
#define privacy_mode_capable(dev) (use_ll_privacy(dev) && \
|
#define privacy_mode_capable(dev) (use_ll_privacy(dev) && \
|
||||||
(hdev->commands[39] & 0x04))
|
(hdev->commands[39] & 0x04))
|
||||||
|
|
||||||
|
#define read_key_size_capable(dev) \
|
||||||
|
((dev)->commands[20] & 0x10 && \
|
||||||
|
!test_bit(HCI_QUIRK_BROKEN_READ_ENC_KEY_SIZE, &hdev->quirks))
|
||||||
|
|
||||||
/* Use enhanced synchronous connection if command is supported and its quirk
|
/* Use enhanced synchronous connection if command is supported and its quirk
|
||||||
* has not been set.
|
* has not been set.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -3218,7 +3218,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, void *data,
|
||||||
if (key) {
|
if (key) {
|
||||||
set_bit(HCI_CONN_ENCRYPT, &conn->flags);
|
set_bit(HCI_CONN_ENCRYPT, &conn->flags);
|
||||||
|
|
||||||
if (!(hdev->commands[20] & 0x10)) {
|
if (!read_key_size_capable(hdev)) {
|
||||||
conn->enc_key_size = HCI_LINK_KEY_SIZE;
|
conn->enc_key_size = HCI_LINK_KEY_SIZE;
|
||||||
} else {
|
} else {
|
||||||
cp.handle = cpu_to_le16(conn->handle);
|
cp.handle = cpu_to_le16(conn->handle);
|
||||||
|
@ -3666,8 +3666,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,
|
||||||
* controller really supports it. If it doesn't, assume
|
* controller really supports it. If it doesn't, assume
|
||||||
* the default size (16).
|
* the default size (16).
|
||||||
*/
|
*/
|
||||||
if (!(hdev->commands[20] & 0x10) ||
|
if (!read_key_size_capable(hdev)) {
|
||||||
test_bit(HCI_QUIRK_BROKEN_READ_ENC_KEY_SIZE, &hdev->quirks)) {
|
|
||||||
conn->enc_key_size = HCI_LINK_KEY_SIZE;
|
conn->enc_key_size = HCI_LINK_KEY_SIZE;
|
||||||
goto notify;
|
goto notify;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue