aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2011-04-28 06:07:58 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-28 14:03:50 -0400
commit58797bf77234154a84827186bda316a1205bde05 (patch)
tree9321f9e71c1e34436ce475b04729e937c11320ba /net/bluetooth/hci_event.c
parent60b83f571cf17a7a8ca9ddf2090db63e6a594571 (diff)
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/hci_event.c')
-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 40e96cd79e4a..9d50e90993ca 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)
2397 2397
2398 /* If remote requests no-bonding follow that lead */ 2398 /* If remote requests no-bonding follow that lead */
2399 if (conn->remote_auth == 0x00 || conn->remote_auth == 0x01) 2399 if (conn->remote_auth == 0x00 || conn->remote_auth == 0x01)
2400 return 0x00; 2400 return conn->remote_auth | (conn->auth_type & 0x01);
2401 2401
2402 return conn->auth_type; 2402 return conn->auth_type;
2403} 2403}