summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2011-04-28 12:07:58 +0200
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-28 15:03:50 -0300
commit58797bf77234154a84827186bda316a1205bde05 (patch)
tree9321f9e71c1e34436ce475b04729e937c11320ba /net/bluetooth
parent60b83f571cf17a7a8ca9ddf2090db63e6a594571 (diff)
downloadop-kernel-dev-58797bf77234154a84827186bda316a1205bde05.zip
op-kernel-dev-58797bf77234154a84827186bda316a1205bde05.tar.gz
Bluetooth: Respect local MITM req in io_cap reply
If host requires MITM protection notify that to controller in io capabilities reply even if the remote device requires no bonding. If it is not respected, host can get an unauthenticated link key while it expects authenticated one. Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 40e96cd..9d50e90 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2397,7 +2397,7 @@ static inline u8 hci_get_auth_req(struct hci_conn *conn)
/* If remote requests no-bonding follow that lead */
if (conn->remote_auth == 0x00 || conn->remote_auth == 0x01)
- return 0x00;
+ return conn->remote_auth | (conn->auth_type & 0x01);
return conn->auth_type;
}
OpenPOWER on IntegriCloud