Bluetooth: Differentiate LE User Pairing Responses

Low Energy (LE) pairing responses must be recognized and handled
differently from BR/EDR pairing responses. BR/EDR responses are
handled via HCI commands by the LMP layer, and LE responses are
handled by the Host.

Signed-off-by: Brian Gix <bgix@codeaurora.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

1 files changed, 24 insertions, 0 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 394222ef67a..c06a05c09a9 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1587,6 +1587,30 @@ static int user_pairing_resp(struct sock *sk, u16 index, bdaddr_t *bdaddr,
                 goto done;
         }
 
+        /*
+         * Check for an existing ACL link, if present pair via
+         * HCI commands.
+         *
+         * If no ACL link is present, check for an LE link and if
+         * present, pair via the SMP engine.
+         *
+         * If neither ACL nor LE links are present, fail with error.
+         */
+        conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, bdaddr);
+        if (!conn) {
+                conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, bdaddr);
+                if (!conn) {
+                        err = cmd_status(sk, index, mgmt_op,
+                                                MGMT_STATUS_NOT_CONNECTED);
+                        goto done;
+                }
+
+                /* Continue with pairing via SMP */
+
+                err = cmd_status(sk, index, mgmt_op, MGMT_STATUS_SUCCESS);
+                goto done;
+        }
+
         cmd = mgmt_pending_add(sk, mgmt_op, hdev, bdaddr, sizeof(*bdaddr));
         if (!cmd) {
                 err = -ENOMEM;