Bluetooth: Fix bogus check for re-auth no supported with non-ssp

[ Upstream commit d03376c185926098cb4d668d6458801eb785c0a5 ]

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.

Fixes: 19f8def031bf ("Bluetooth: Fix auth_complete_evt for legacy units")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 9a21ccbb5b5c1c5d1f7f53c829cfef3a01680d2c..b6114bc0dd0f2744d0e76678c7fd91b2a097cbaf 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -852,7 +852,6 @@ void hci_inquiry_cache_flush(struct hci_dev *hdev);
 /* ----- HCI Connections ----- */
 enum {
        HCI_CONN_AUTH_PEND,
-       HCI_CONN_REAUTH_PEND,
        HCI_CONN_ENCRYPT_PEND,
        HCI_CONN_RSWITCH_PEND,
        HCI_CONN_MODE_CHANGE_PEND,

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index ce538dbe89d1312b154d708341716c8847933c35..700920aea39ef06de79997b284e7bc58910828c2 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1436,12 +1436,10 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
                hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED,
                             sizeof(cp), &cp);
 
-               /* If we're already encrypted set the REAUTH_PEND flag,
-                * otherwise set the ENCRYPT_PEND.
+               /* Set the ENCRYPT_PEND to trigger encryption after
+                * authentication.
                 */
-               if (test_bit(HCI_CONN_ENCRYPT, &conn->flags))
-                       set_bit(HCI_CONN_REAUTH_PEND, &conn->flags);
-               else
+               if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
                        set_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
        }
 

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index edf5132b5dc9632ebc6e711344629a6be2a4844a..2ad2f4647847c939314bfaa048fadbf712be45eb 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3017,14 +3017,8 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 
        if (!ev->status) {
                clear_bit(HCI_CONN_AUTH_FAILURE, &conn->flags);
-
-               if (!hci_conn_ssp_enabled(conn) &&
-                   test_bit(HCI_CONN_REAUTH_PEND, &conn->flags)) {
-                       bt_dev_info(hdev, "re-auth of legacy device is not possible.");
-               } else {
-                       set_bit(HCI_CONN_AUTH, &conn->flags);
-                       conn->sec_level = conn->pending_sec_level;
-               }
+               set_bit(HCI_CONN_AUTH, &conn->flags);
+               conn->sec_level = conn->pending_sec_level;
        } else {
                if (ev->status == HCI_ERROR_PIN_OR_KEY_MISSING)
                        set_bit(HCI_CONN_AUTH_FAILURE, &conn->flags);
@@ -3033,7 +3027,6 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
        }
 
        clear_bit(HCI_CONN_AUTH_PEND, &conn->flags);
-       clear_bit(HCI_CONN_REAUTH_PEND, &conn->flags);
 
        if (conn->state == BT_CONFIG) {
                if (!ev->status && hci_conn_ssp_enabled(conn)) {