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

Commit 035ad621 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Move SC-only check outside of BT_CONFIG branch 



Checking for SC-only mode requirements when we get an encrypt change
event shouldn't be limited to the BT_CONFIG state but done any time
encryption changes.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b1f663c9

net/bluetooth/hci_event.c

+12 −12
Original line number Diff line number Diff line
@@ -2650,13 +2650,9 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		goto unlock;

	}



	if (conn->state == BT_CONFIG) {

		if (!ev->status)

			conn->state = BT_CONNECTED;



		/* In Secure Connections Only mode, do not allow any

		 * connections that are not encrypted with AES-CCM

		 * using a P-256 authenticated combination key.

	/* In Secure Connections Only mode, do not allow any connections

	 * that are not encrypted with AES-CCM using a P-256 authenticated

	 * combination key.

	 */

	if (hci_dev_test_flag(hdev, HCI_SC_ONLY) &&

	    (!test_bit(HCI_CONN_AES_CCM, &conn->flags) ||
@@ -2666,6 +2662,10 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		goto unlock;

	}



	if (conn->state == BT_CONFIG) {

		if (!ev->status)

			conn->state = BT_CONNECTED;



		hci_connect_cfm(conn, ev->status);

		hci_conn_drop(conn);

	} else