linux-stable.git/net/bluetooth/smp.c, branch linux-3.2.y

Bluetooth: Fix handling of unexpected SMP PDUs

2013-02-20T03:15:22+00:00

commit 8cf9fa1240229cbdd888236c0c43fcbad680cf00 upstream.

The conn->smp_chan pointer can be NULL if SMP PDUs arrive at unexpected
moments. To avoid NULL pointer dereferences the code should be checking
for this and disconnect if an unexpected SMP PDU arrives. This patch
fixes the issue by adding a check for conn->smp_chan for all other PDUs
except pairing request and security request (which are are the first
PDUs to come to initialize the SMP context).

Signed-off-by: Johan Hedberg 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo Padovan 
Signed-off-by: Ben Hutchings

Bluetooth: SMP: Fix setting unknown auth_req bits

2012-10-30T23:26:43+00:00

commit 065a13e2cc665f6547dc7e8a9d6b6565badf940a upstream.

When sending a pairing request or response we should not just blindly
copy the value that the remote device sent. Instead we should at least
make sure to mask out any unknown bits. This is particularly critical
from the upcoming LE Secure Connections feature perspective as
incorrectly indicating support for it (by copying the remote value)
would cause a failure to pair with devices that support it.

Signed-off-by: Johan Hedberg 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo Padovan 
Signed-off-by: Ben Hutchings

Bluetooth: Change signature of smp_conn_security()

2012-10-10T02:31:11+00:00

commit cc110922da7e902b62d18641a370fec01a9fa794 upstream.

To make it clear that it may be called from contexts that may not have
any knowledge of L2CAP, we change the connection parameter, to receive
a hci_conn.

This also makes it clear that it is checking the security of the link.

Signed-off-by: Vinicius Costa Gomes 
Signed-off-by: Gustavo Padovan 
Signed-off-by: Ben Hutchings

Bluetooth: Remove support for other SMP keys than the LTK

2011-09-21T15:59:16+00:00

For now, only the LTK is properly supported. We are able to receive
and generate the other types of keys, but we are not able to use
them. So it's better not request them to be distributed.

Signed-off-by: Vinicius Costa Gomes 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Fix not setting a pending security level

2011-09-21T15:59:15+00:00

For slave initiated security, we should set a default security level,
for now BT_SECURITY_MEDIUM.

Signed-off-by: Vinicius Costa Gomes 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Use the LTK after receiving a LE Security Request

2011-09-21T15:59:15+00:00

When receiving a security request from the remote device we should find
if there is already a LTK associated with the remote device, if found
we should use it to encrypt the link.

Signed-off-by: Vinicius Costa Gomes 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Fix sending wrong authentication requirements

2011-09-21T15:59:15+00:00

Until we support any pairing method (Passkey Entry, OOB) that gives
MITM protection we shouldn't send that we have MITM protection.

Signed-off-by: Vinicius Costa Gomes 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Move SMP crypto functions to a workqueue

2011-09-21T15:58:12+00:00

The function crypto_blkcipher_setkey() called by smp_e()
can sleep, so all the crypto work has to be moved to
hci_dev workqueue.

Signed-off-by: Vinicius Costa Gomes 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Move SMP fields to a separate structure

2011-09-21T15:58:12+00:00

The objective is to make the core to have as little as possible
information about SMP procedures and logic. Now, all the SMP
specific information is hidden from the core.

Signed-off-by: Vinicius Costa Gomes 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Add a flag to indicate that SMP is going on

2011-09-21T15:58:11+00:00

Add HCI_CONN_LE_SMP_PEND flag to indicate that SMP is pending
for that connection. This allows to have information that an SMP
procedure is going on for that connection.

We use the HCI_CONN_ENCRYPT_PEND to indicate that encryption
(HCI_LE_Start_Encryption) is pending for that connection.

While a SMP procedure is going on we hold an reference to the
connection, to avoid disconnections.

Signed-off-by: Vinicius Costa Gomes 
Signed-off-by: Gustavo F. Padovan