[v4.9..v5.4/bluetooth PATCH 1/3] Bluetooth: Consolidate encryption handling in hci_encrypt_cfm

[Hans-Christian Noren Egtvedt]

From: Luiz Augusto von Dentz <luiz.von.de...@intel.com>

This makes hci_encrypt_cfm calls hci_connect_cfm in case the connection
state is BT_CONFIG so callers don't have to check the state.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.de...@intel.com>
Signed-off-by: Marcel Holtmann <mar...@holtmann.org>
(cherry picked from commit 3ca44c16b0dcc764b641ee4ac226909f5c421aa3)
Cc: sta...@vger.kernel.org # 4.9..5.4
---
 include/net/bluetooth/hci_core.h | 20 ++++++++++++++++++--
 net/bluetooth/hci_event.c        | 28 +++-------------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index b689aceb636b..ffd0eedd27ab 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1308,10 +1308,26 @@ static inline void hci_auth_cfm(struct hci_conn *conn, 
__u8 status)
                conn->security_cfm_cb(conn, status);
 }
 
-static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
-                                                               __u8 encrypt)
+static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status)
 {
        struct hci_cb *cb;
+       __u8 encrypt;
+
+       if (conn->state == BT_CONFIG) {
+               if (status)
+                       conn->state = BT_CONNECTED;
+
+               hci_connect_cfm(conn, status);
+               hci_conn_drop(conn);
+               return;
+       }
+
+       if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
+               encrypt = 0x00;
+       else if (test_bit(HCI_CONN_AES_CCM, &conn->flags))
+               encrypt = 0x02;
+       else
+               encrypt = 0x01;
 
        if (conn->sec_level == BT_SECURITY_SDP)
                conn->sec_level = BT_SECURITY_LOW;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index fd436e5d7b54..de4cce5f1bd8 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2840,7 +2840,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, 
struct sk_buff *skb)
                                     &cp);
                } else {
                        clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
-                       hci_encrypt_cfm(conn, ev->status, 0x00);
+                       hci_encrypt_cfm(conn, ev->status);
                }
        }
 
@@ -2925,22 +2925,7 @@ static void read_enc_key_size_complete(struct hci_dev 
*hdev, u8 status,
                conn->enc_key_size = rp->key_size;
        }
 
-       if (conn->state == BT_CONFIG) {
-               conn->state = BT_CONNECTED;
-               hci_connect_cfm(conn, 0);
-               hci_conn_drop(conn);
-       } else {
-               u8 encrypt;
-
-               if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
-                       encrypt = 0x00;
-               else if (test_bit(HCI_CONN_AES_CCM, &conn->flags))
-                       encrypt = 0x02;
-               else
-                       encrypt = 0x01;
-
-               hci_encrypt_cfm(conn, 0, encrypt);
-       }
+       hci_encrypt_cfm(conn, 0);
 
 unlock:
        hci_dev_unlock(hdev);
@@ -3058,14 +3043,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, 
struct sk_buff *skb)
        }
 
 notify:
-       if (conn->state == BT_CONFIG) {
-               if (!ev->status)
-                       conn->state = BT_CONNECTED;
-
-               hci_connect_cfm(conn, ev->status);
-               hci_conn_drop(conn);
-       } else
-               hci_encrypt_cfm(conn, ev->status, ev->encrypt);
+       hci_encrypt_cfm(conn, ev->status);
 
 unlock:
        hci_dev_unlock(hdev);
-- 
2.27.0