Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79c6c70c authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix HCI_CONN_AUTH_PEND flag for all authentication requests 



The HCI_CONN_AUTH_PEND flag should be set whenever requesting
authentication so that multiple pending requests can't occur.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 9f61656a

net/bluetooth/hci_event.c

+16 −2
Original line number Diff line number Diff line
@@ -1021,12 +1021,19 @@ static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status) 
	hci_dev_lock(hdev);



	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);

	if (conn && hci_outgoing_auth_needed(hdev, conn)) {

	if (!conn)

		goto unlock;



	if (!hci_outgoing_auth_needed(hdev, conn))

		goto unlock;



	if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {

		struct hci_cp_auth_requested cp;

		cp.handle = __cpu_to_le16(conn->handle);

		hci_send_cmd(hdev, HCI_OP_AUTH_REQUESTED, sizeof(cp), &cp);

	}



unlock:

	hci_dev_unlock(hdev);

}
@@ -1516,12 +1523,19 @@ static inline void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb 
		mgmt_remote_name(hdev->id, &ev->bdaddr, ev->name);



	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);

	if (conn && hci_outgoing_auth_needed(hdev, conn)) {

	if (!conn)

		goto unlock;



	if (!hci_outgoing_auth_needed(hdev, conn))

		goto unlock;



	if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {

		struct hci_cp_auth_requested cp;

		cp.handle = __cpu_to_le16(conn->handle);

		hci_send_cmd(hdev, HCI_OP_AUTH_REQUESTED, sizeof(cp), &cp);

	}



unlock:

	hci_dev_unlock(hdev);

}