diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-03-18 15:42:30 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-03-18 10:18:26 -0700 |
| commit | 2e2336445e696805b40d6a13cf25f26d49e20069 (patch) | |
| tree | e248d860b6ed117a674d113e3e1b5d636aa07d62 /net/bluetooth | |
| parent | 943a732ab6440f4edbccd8cd9044a588b35059a0 (diff) | |
| download | op-kernel-dev-2e2336445e696805b40d6a13cf25f26d49e20069.zip op-kernel-dev-2e2336445e696805b40d6a13cf25f26d49e20069.tar.gz | |
Bluetooth: Fix MITM flag when initiating SMP pairing
The pairing process initiated through mgmt sets the conn->auth_type
value regardless of BR/EDR or LE pairing. This value will contain the
MITM flag if the local IO capability allows it. When sending the SMP
pairing request we should check the value and ensure that the MITM bit
gets correctly set in the bonding flags.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/smp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 6f29430..a015003 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -909,6 +909,12 @@ 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. + */ + if ((hcon->auth_type & 0x01)) + authreq |= SMP_AUTH_MITM; + if (hcon->link_mode & HCI_LM_MASTER) { struct smp_cmd_pairing cp; |
