summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2011-06-13 15:37:35 +0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-06-13 14:28:52 -0300
commit6fdf658c9a0e51e6663f2769f6d310c2843a862b (patch)
tree07089bfcc9473b7ea89af3f10086cde76802ca1a /net/bluetooth
parent7f4f0572df6c8eaa6a587bc212b0806ff37380dd (diff)
downloadop-kernel-dev-6fdf658c9a0e51e6663f2769f6d310c2843a862b.zip
op-kernel-dev-6fdf658c9a0e51e6663f2769f6d310c2843a862b.tar.gz
Bluetooth: Fix L2CAP security check
With older userspace versions (using hciops) it might not have the key type to check if the key has sufficient security for any security level so it is necessary to check the return of hci_conn_auth to make sure the connection is authenticated Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_conn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 3163330..b9aa986 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -611,8 +611,8 @@ auth:
if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
return 0;
- hci_conn_auth(conn, sec_level, auth_type);
- return 0;
+ if (!hci_conn_auth(conn, sec_level, auth_type))
+ return 0;
encrypt:
if (conn->link_mode & HCI_LM_ENCRYPT)
OpenPOWER on IntegriCloud