Commit 6fdf658c authored Jun 13, 2011 by Luiz Augusto von Dentz Committed by Gustavo Padovan Jun 13, 2011

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>

parent 7f4f0572

net/bluetooth/hci_conn.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -611,7 +611,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
		if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
		return 0;

		hci_conn_auth(conn, sec_level, auth_type);
		if (!hci_conn_auth(conn, sec_level, auth_type))
		return 0;

		encrypt: