2012-02-01 21:27:56

by Vinicius Costa Gomes

Subject: [PATCH] Bluetooth: Fix invalid memory access when there's no SMP channel

We only should try to free the SMP channel that was created if there
is a pending SMP session.

Signed-off-by: Vinicius Costa Gomes <[email protected]>
---
net/bluetooth/smp.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 5818334..9ff56e1 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -263,8 +263,11 @@ static void smp_failure(struct l2cap_conn *conn, u8 reason, u8 send)

clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->hcon->flags);
mgmt_auth_failed(conn->hcon->hdev, conn->dst, reason);
- cancel_delayed_work_sync(&conn->security_timer);
- smp_chan_destroy(conn);
+
+ if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags)) {
+ cancel_delayed_work_sync(&conn->security_timer);
+ smp_chan_destroy(conn);
+ }
}

#define JUST_WORKS 0x00
@@ -506,7 +509,7 @@ void smp_chan_destroy(struct l2cap_conn *conn)
{
struct smp_chan *smp = conn->smp_chan;

- clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags);
+ BUG_ON(!smp);

if (smp->tfm)
crypto_free_blkcipher(smp->tfm);
--
1.7.8.1

2012-02-01 21:35:18

by Johan Hedberg

Subject: Re: [PATCH] Bluetooth: Fix invalid memory access when there's no SMP channel

Hi Vinicius,

On Wed, Feb 01, 2012, Vinicius Costa Gomes wrote:
> We only should try to free the SMP channel that was created if there
> is a pending SMP session.
>
> Signed-off-by: Vinicius Costa Gomes <[email protected]>
> ---
> net/bluetooth/smp.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)

Applied to my bluetooth-next tree. Thanks.

Johan

2012-02-01 21:30:32

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: Fix invalid memory access when there's no SMP channel

Hi Vinicius,

> We only should try to free the SMP channel that was created if there
> is a pending SMP session.
>
> Signed-off-by: Vinicius Costa Gomes <[email protected]>
> ---
> net/bluetooth/smp.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)

Acked-by: Marcel Holtmann <[email protected]>

Regards

Marcel