Skip to content

Commit

Permalink
Bluetooth: Fix requiring SMP MITM for outgoing connections
Browse files Browse the repository at this point in the history
Due to recent changes to the way that the MITM requirement is set for
outgoing pairing attempts we can no longer rely on the hcon->auth_type
variable (which is actually good since it was formed from BR/EDR
concepts that don't really exist for SMP).

To match the logic that BR/EDR now uses simply rely on the local IO
capability and/or needed security level to set the MITM requirement for
outgoing pairing requests.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org
  • Loading branch information
Johan Hedberg authored and Marcel Holtmann committed Jun 1, 2014
1 parent 6a5e816 commit 79897d2
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions net/bluetooth/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -909,10 +909,11 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)

authreq = seclevel_to_authreq(sec_level);

/* hcon->auth_type is set by pair_device in mgmt.c. If the MITM
* flag is set we should also set it for the SMP request.
/* Require MITM if IO Capability allows or the security level
* requires it.
*/
if ((hcon->auth_type & 0x01))
if (hcon->io_capability != HCI_IO_NO_INPUT_OUTPUT ||
sec_level > BT_SECURITY_MEDIUM)
authreq |= SMP_AUTH_MITM;

if (hcon->link_mode & HCI_LM_MASTER) {
Expand Down

0 comments on commit 79897d2

Please sign in to comment.