瀏覽代碼

Bluetooth: Fix SMP pairing method selection

The tk_request function takes the local IO capability as the second last
parameter and the remote IO capability as the last parameter. They were
previously swapped: when we receive a pairing response
req->io_capability contains the local one and rsp->io_capability the
remote one.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg 13 年之前
父節點
當前提交
476585ecf0
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      net/bluetooth/smp.c

+ 1 - 1
net/bluetooth/smp.c

@@ -648,7 +648,7 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
 
 
 	auth |= (req->auth_req | rsp->auth_req) & SMP_AUTH_MITM;
 	auth |= (req->auth_req | rsp->auth_req) & SMP_AUTH_MITM;
 
 
-	ret = tk_request(conn, 0, auth, rsp->io_capability, req->io_capability);
+	ret = tk_request(conn, 0, auth, req->io_capability, rsp->io_capability);
 	if (ret)
 	if (ret)
 		return SMP_UNSPECIFIED;
 		return SMP_UNSPECIFIED;