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

Commit 0c75831b authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Greg Kroah-Hartman
Browse files

Bluetooth: Consolidate encryption handling in hci_encrypt_cfm 



commit 3ca44c16b0dcc764b641ee4ac226909f5c421aa3 upstream.

This makes hci_encrypt_cfm calls hci_connect_cfm in case the connection
state is BT_CONFIG so callers don't have to check the state.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Cc: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b2e8060

include/net/bluetooth/hci_core.h

+18 −2
Original line number Diff line number Diff line
@@ -1287,10 +1287,26 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status) 
		conn->security_cfm_cb(conn, status);

}



static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,

								__u8 encrypt)

static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status)

{

	struct hci_cb *cb;

	__u8 encrypt;



	if (conn->state == BT_CONFIG) {

		if (status)

			conn->state = BT_CONNECTED;



		hci_connect_cfm(conn, status);

		hci_conn_drop(conn);

		return;

	}



	if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))

		encrypt = 0x00;

	else if (test_bit(HCI_CONN_AES_CCM, &conn->flags))

		encrypt = 0x02;

	else

		encrypt = 0x01;



	if (conn->sec_level == BT_SECURITY_SDP)

		conn->sec_level = BT_SECURITY_LOW;

net/bluetooth/hci_event.c

+3 −25
Original line number Diff line number Diff line
@@ -2756,7 +2756,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
				     &cp);

		} else {

			clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);

			hci_encrypt_cfm(conn, ev->status, 0x00);

			hci_encrypt_cfm(conn, ev->status);

		}

	}
@@ -2841,22 +2841,7 @@ static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status, 
		conn->enc_key_size = rp->key_size;

	}



	if (conn->state == BT_CONFIG) {

		conn->state = BT_CONNECTED;

		hci_connect_cfm(conn, 0);

		hci_conn_drop(conn);

	} else {

		u8 encrypt;



		if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))

			encrypt = 0x00;

		else if (test_bit(HCI_CONN_AES_CCM, &conn->flags))

			encrypt = 0x02;

		else

			encrypt = 0x01;



		hci_encrypt_cfm(conn, 0, encrypt);

	}

	hci_encrypt_cfm(conn, 0);



unlock:

	hci_dev_unlock(hdev);
@@ -2955,14 +2940,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	}



notify:

	if (conn->state == BT_CONFIG) {

		if (!ev->status)

			conn->state = BT_CONNECTED;



		hci_connect_cfm(conn, ev->status);

		hci_conn_drop(conn);

	} else

		hci_encrypt_cfm(conn, ev->status, ev->encrypt);

	hci_encrypt_cfm(conn, ev->status);



unlock:

	hci_dev_unlock(hdev);