From: Ido Yariv <ido@wizery.com>
Date: Mon, 5 Mar 2012 18:07:08 +0000 (+0200)
Subject: Bluetooth: Fix access to the STK generation methods matrix
X-Git-Tag: v3.4-rc1~177^2~112^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3ff53ff006b7906c88adf9d0fccc06a8877fae1;p=karo-tx-linux.git

Bluetooth: Fix access to the STK generation methods matrix

The major index of the table is actually the remote I/O capabilities, not
the local ones. As a result, devices with different I/O capabilities
could have used wrong or even unsupported generation methods.

Signed-off-by: Ido Yariv <ido@wizery.com>
CC: Brian Gix <bgix@codeaurora.org>
Acked-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 8f56282c247d..9883d673873c 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -310,7 +310,7 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
 			remote_io > SMP_IO_KEYBOARD_DISPLAY)
 		method = JUST_WORKS;
 	else
-		method = gen_method[local_io][remote_io];
+		method = gen_method[remote_io][local_io];
 
 	/* If not bonding, don't ask user to confirm a Zero TK */
 	if (!(auth & SMP_AUTH_BONDING) && method == JUST_CFM)