| Message ID | 20200520212015.626026-1-luiz.dentz@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] Bluetooth: Disconnect if E0 is used for Level 4 | expand |
On Wed, 2020-05-20 at 14:20 -0700, Luiz Augusto von Dentz wrote: > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > This reverts 19f8def031bfa50c579149b200bfeeb919727b27 > "Bluetooth: Fix auth_complete_evt for legacy units" which seems to be > working around a bug on a broken controller rather then any > limitation > imposed by the Bluetooth spec, in fact if there ws not possible to > re-auth the command shall fail not succeed. > > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Looks like this fell through the cracks, do you want me to rebase and re-send it?
Hi Bastien, On Thu, Nov 30, 2023 at 7:02 AM Bastien Nocera <hadess@hadess.net> wrote: > > On Wed, 2020-05-20 at 14:20 -0700, Luiz Augusto von Dentz wrote: > > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > > > This reverts 19f8def031bfa50c579149b200bfeeb919727b27 > > "Bluetooth: Fix auth_complete_evt for legacy units" which seems to be > > working around a bug on a broken controller rather then any > > limitation > > imposed by the Bluetooth spec, in fact if there ws not possible to > > re-auth the command shall fail not succeed. > > > > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > Looks like this fell through the cracks, do you want me to rebase and > re-send it? Yeah, please resend so we get the CI to test it doesn't break anything.
On Thu, 2023-11-30 at 08:43 -0500, Luiz Augusto von Dentz wrote: > Hi Bastien, > > On Thu, Nov 30, 2023 at 7:02 AM Bastien Nocera <hadess@hadess.net> > wrote: > > > > On Wed, 2020-05-20 at 14:20 -0700, Luiz Augusto von Dentz wrote: > > > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > > > > > This reverts 19f8def031bfa50c579149b200bfeeb919727b27 > > > "Bluetooth: Fix auth_complete_evt for legacy units" which seems > > > to be > > > working around a bug on a broken controller rather then any > > > limitation > > > imposed by the Bluetooth spec, in fact if there ws not possible > > > to > > > re-auth the command shall fail not succeed. > > > > > > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > > > Looks like this fell through the cracks, do you want me to rebase > > and > > re-send it? > > Yeah, please resend so we get the CI to test it doesn't break > anything. Done. Cheers
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index cdd4f1db8670..c69309ffd40a 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1402,11 +1402,13 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status) else encrypt = 0x01; - if (conn->sec_level == BT_SECURITY_SDP) - conn->sec_level = BT_SECURITY_LOW; + if (!status) { + if (conn->sec_level == BT_SECURITY_SDP) + conn->sec_level = BT_SECURITY_LOW; - if (conn->pending_sec_level > conn->sec_level) - conn->sec_level = conn->pending_sec_level; + if (conn->pending_sec_level > conn->sec_level) + conn->sec_level = conn->pending_sec_level; + } mutex_lock(&hci_cb_list_lock); list_for_each_entry(cb, &hci_cb_list, list) { diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 307800fd18e6..b99b5c6de55a 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -1323,6 +1323,23 @@ int hci_conn_check_link_mode(struct hci_conn *conn) return 0; } + /* AES encryption is required for Level 4: + * + * BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 3, Part C + * page 1319: + * + * 128-bit equivalent strength for link and encryption keys + * required using FIPS approved algorithms (E0 not allowed, + * SAFER+ not allowed, and P-192 not allowed; encryption key + * not shortened) + */ + if (conn->sec_level == BT_SECURITY_FIPS && + !test_bit(HCI_CONN_AES_CCM, &conn->flags)) { + bt_dev_err(conn->hdev, + "Invalid security: Missing AES-CCM usage"); + return 0; + } + if (hci_conn_ssp_enabled(conn) && !test_bit(HCI_CONN_ENCRYPT, &conn->flags)) return 0; diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index cfeaee347db3..d6a1e2450696 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3065,27 +3065,23 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags); + /* Check link security requirements are met */ + if (!hci_conn_check_link_mode(conn)) + ev->status = HCI_ERROR_AUTH_FAILURE; + if (ev->status && conn->state == BT_CONNECTED) { if (ev->status == HCI_ERROR_PIN_OR_KEY_MISSING) set_bit(HCI_CONN_AUTH_FAILURE, &conn->flags); + /* Notify upper layers so they can cleanup before + * disconnecting. + */ + hci_encrypt_cfm(conn, ev->status); hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE); hci_conn_drop(conn); goto unlock; } - /* In Secure Connections Only mode, do not allow any connections - * that are not encrypted with AES-CCM using a P-256 authenticated - * combination key. - */ - if (hci_dev_test_flag(hdev, HCI_SC_ONLY) && - (!test_bit(HCI_CONN_AES_CCM, &conn->flags) || - conn->key_type != HCI_LK_AUTH_COMBINATION_P256)) { - hci_connect_cfm(conn, HCI_ERROR_AUTH_FAILURE); - hci_conn_drop(conn); - goto unlock; - } - /* Try reading the encryption key size for encrypted ACL links */ if (!ev->status && ev->encrypt && conn->type == ACL_LINK) { struct hci_cp_read_enc_key_size cp;