Pārlūkot izejas kodu

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>
Luiz Augusto von Dentz 14 gadi atpakaļ
vecāks
revīzija
6fdf658c9a
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      net/bluetooth/hci_conn.c

+ 2 - 2
net/bluetooth/hci_conn.c

@@ -611,8 +611,8 @@ auth:
 	if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
 	if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
 		return 0;
 		return 0;
 
 
-	hci_conn_auth(conn, sec_level, auth_type);
-	return 0;
+	if (!hci_conn_auth(conn, sec_level, auth_type))
+		return 0;
 
 
 encrypt:
 encrypt:
 	if (conn->link_mode & HCI_LM_ENCRYPT)
 	if (conn->link_mode & HCI_LM_ENCRYPT)