diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-02-09 02:48:38 +0100 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-02-27 06:14:40 +0100 |
commit | 0684e5f9fb9e3f7e168ab831dfca693bcb44805b (patch) | |
tree | 1fb1315dff64ef2ebaa24729988b2c3b7c77d578 /net/bluetooth/l2cap.c | |
parent | efc7688b557dd1be10eead7399b315efcb1dbc74 (diff) | |
download | kernel_samsung_tuna-0684e5f9fb9e3f7e168ab831dfca693bcb44805b.zip kernel_samsung_tuna-0684e5f9fb9e3f7e168ab831dfca693bcb44805b.tar.gz kernel_samsung_tuna-0684e5f9fb9e3f7e168ab831dfca693bcb44805b.tar.bz2 |
Bluetooth: Use general bonding whenever possible
When receiving incoming connection to specific services, always use
general bonding. This ensures that the link key gets stored and can be
used for further authentications.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap.c')
-rw-r--r-- | net/bluetooth/l2cap.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index b677af6..8a93dde 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -263,8 +263,22 @@ static void l2cap_chan_del(struct sock *sk, int err) static inline int l2cap_check_security(struct sock *sk) { struct l2cap_conn *conn = l2cap_pi(sk)->conn; + __u8 auth_type; + + switch (l2cap_pi(sk)->sec_level) { + case BT_SECURITY_HIGH: + auth_type = HCI_AT_GENERAL_BONDING_MITM; + break; + case BT_SECURITY_MEDIUM: + auth_type = HCI_AT_GENERAL_BONDING; + break; + default: + auth_type = HCI_AT_NO_BONDING; + break; + } - return hci_conn_security(conn->hcon, l2cap_pi(sk)->sec_level); + return hci_conn_security(conn->hcon, l2cap_pi(sk)->sec_level, + auth_type); } static inline u8 l2cap_get_ident(struct l2cap_conn *conn) |