2012-03-05 18:07:08

by Ido Yariv

Subject: [PATCH] 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 <[email protected]>
CC: Brian Gix <[email protected]>
---
net/bluetooth/smp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 75937d7..ebf50065 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)
--
1.7.7.6

2012-03-06 04:27:10

by Vinicius Costa Gomes

Subject: Re: [PATCH] Bluetooth: Fix access to the STK generation methods matrix

Hi Ido,

On 20:07 Mon 05 Mar, Ido Yariv wrote:
> 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 <[email protected]>
> CC: Brian Gix <[email protected]>
> ---
> net/bluetooth/smp.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Acked-by: Vinicius Costa Gomes <[email protected]>

>
> diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
> index 75937d7..ebf50065 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)
> --
> 1.7.7.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

Cheers,
--
Vinicius