diff options
| author | Szymon Janc <ext.szymon.janc@tieto.com> | 2016-09-30 17:17:27 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2016-10-16 09:00:57 +0300 |
| commit | 653053532757704b1db58afe0f521b501e05b3af (patch) | |
| tree | 38b030b4fe9adb37fc10f3935b84abff18b42d8a /net | |
| parent | 5c640374610a90fe3a9dbb515a135aec84e9af9b (diff) | |
Bluetooth: SMP: Fix getting context for BR/EDR pairing
BR/EDR context should be look-up with BR CID.
Change-Id: Id9cdce89b86a9c13015dc71a3a395a02f3d29a9a
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/smp.c | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index ad3459bd1..584e994d5 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -1281,12 +1281,40 @@ static int bt_smp_br_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan) return -ENOMEM; } -static int smp_br_send_pairing_req(struct bt_smp *smp) +static struct bt_smp *smp_br_chan_get(struct bt_conn *conn) +{ + struct bt_l2cap_chan *chan; + + chan = bt_l2cap_br_lookup_rx_cid(conn, BT_L2CAP_CID_BR_SMP); + if (!chan) { + BT_ERR("Unable to find SMP channel"); + return NULL; + } + + return CONTAINER_OF(chan, struct bt_smp, chan); +} + +static int smp_br_send_pairing_req(struct bt_conn *conn) { - struct bt_conn *conn = smp->chan.chan.conn; struct bt_smp_pairing *req; struct net_buf *req_buf; uint8_t max_key_size; + struct bt_smp *smp; + + smp = smp_br_chan_get(conn); + if (!smp) { + return -ENOTCONN; + } + + /* SMP Timeout */ + if (atomic_test_bit(smp->flags, SMP_FLAG_TIMEOUT)) { + return -EIO; + } + + /* pairing is in progress */ + if (atomic_test_bit(smp->flags, SMP_FLAG_PAIRING)) { + return -EBUSY; + } max_key_size = bt_conn_enc_key_size(conn); if (!max_key_size) { @@ -2331,6 +2359,12 @@ int bt_smp_send_pairing_req(struct bt_conn *conn) BT_DBG(""); +#if defined(CONFIG_BLUETOOTH_BREDR) + if (conn->type == BT_CONN_TYPE_BR) { + return smp_br_send_pairing_req(conn); + } +#endif + smp = smp_chan_get(conn); if (!smp) { return -ENOTCONN; @@ -2346,12 +2380,6 @@ int bt_smp_send_pairing_req(struct bt_conn *conn) return -EBUSY; } -#if defined(CONFIG_BLUETOOTH_BREDR) - if (conn->type == BT_CONN_TYPE_BR) { - return smp_br_send_pairing_req(smp); - } -#endif - /* early verify if required sec level if reachable */ if (!sec_level_reachable(conn)) { return -EINVAL; |