Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 15 Jul 2020 10:59:47 +0200
From:   Patrick Steinhardt <ps@pks.im>
To:     linux-bluetooth@vger.kernel.org
Cc:     Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Subject: [PATCH] Bluetooth: Fix updating connecton state in `hci_encrypt_cfm`
Message-ID: <0df5bf3eac160de28b9493a8959510980a8a8e8b.1594803508.git.ps@pks.im>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="eAbsdosE1cNLO4uF"
Content-Disposition: inline
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk


--eAbsdosE1cNLO4uF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Starting with the upgrade to v5.8-rc3, I've noticed I wasn't able to
connect to my Bluetooth headset properly anymore. While connecting to
the device would eventually succeed, bluetoothd seemed to be confused
about the current connection state where the state was flapping hence
and forth. Bisecting this issue led to commit 3ca44c16b0dc ("Bluetooth:
Consolidate encryption handling in hci_encrypt_cfm"), which refactored
`hci_encrypt_cfm` to also handle updating the connection state.

The commit in question changed the code to call `hci_connect_cfm` inside
`hci_encrypt_cfm` and updating the connection state. But the conversion
didn't keep old behaviour of when the connection state is updated, which
now causes us to not properly update it anymore.

Fix the issue by adding another parameter to the function that allows
callers to specify whether the connection state should be updated, which
allows us to restore previous behaviour.

Fixes: 3ca44c16b0dc ("Bluetooth: Consolidate encryption handling in hci_enc=
rypt_cfm")
Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 include/net/bluetooth/hci_core.h | 4 ++--
 net/bluetooth/hci_event.c        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_c=
ore.h
index cdd4f1db8670..9abcc4a89abc 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1381,13 +1381,13 @@ static inline void hci_auth_cfm(struct hci_conn *co=
nn, __u8 status)
 		conn->security_cfm_cb(conn, status);
 }
=20
-static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status)
+static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status, __u=
8 update_state)
 {
 	struct hci_cb *cb;
 	__u8 encrypt;
=20
 	if (conn->state =3D=3D BT_CONFIG) {
-		if (status)
+		if (update_state)
 			conn->state =3D BT_CONNECTED;
=20
 		hci_connect_cfm(conn, status);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index cfeaee347db3..483d35eda2f1 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2931,7 +2931,7 @@ static void hci_auth_complete_evt(struct hci_dev *hde=
v, struct sk_buff *skb)
 				     &cp);
 		} else {
 			clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
-			hci_encrypt_cfm(conn, ev->status);
+			hci_encrypt_cfm(conn, ev->status, 0);
 		}
 	}
=20
@@ -3016,7 +3016,7 @@ static void read_enc_key_size_complete(struct hci_dev=
 *hdev, u8 status,
 		conn->enc_key_size =3D rp->key_size;
 	}
=20
-	hci_encrypt_cfm(conn, 0);
+	hci_encrypt_cfm(conn, 0, 1);
=20
 unlock:
 	hci_dev_unlock(hdev);
@@ -3134,7 +3134,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hd=
ev, struct sk_buff *skb)
 	}
=20
 notify:
-	hci_encrypt_cfm(conn, ev->status);
+	hci_encrypt_cfm(conn, ev->status, !ev->status);
=20
 unlock:
 	hci_dev_unlock(hdev);
--=20
2.27.0


--eAbsdosE1cNLO4uF
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl8OxYIACgkQVbJhu7ck
PpRjOxAAhU43UIvw1uWfrB0Sl/6And9SXbT580tLQWc33qgJrgKEAr4ec5bIX5c5
UsNgmtmzkmw2Ka1xgvBPr/g4TMC6UQOwdvi+nCYWVtjyDZ0cogkvAZQGyUg3Re74
xfrO/Ef9PMrpGE3RlnctiOlut2blCK6SyGM37KYFI7Ec/20GTlDmQlkBY0BkZlyL
d4VcwQQ5jtRXaT6YQOPghJP7ksohNA18QxP9DfUKYStZT9J5FW2XybsQF9Um5R7B
xPv3BtYIpmWB44/n1dhZCHd6Tk20uWnsLgD2L0/xRx4J8KMLVr4OtqhqijoVGL2O
TFGZNKvwb9YAN8HTxlqPDEBMv1nu5bPEAI9LUTIjcQZDPMxiNMTq1xesjoPuHeKu
g6sB8p9fDgT/n3FlcZZpshweechp1U5tFcqN/3wlsqWTBvk1cVrMsK6IHyMJH/WE
LB47DtyjLtMG8T41B545kTPccMRClPoQPohoBmFWS5JriAS+1pFAxs+EkUp8dDwT
u0H6QKfokFF0gyeYDlbz+YsdP68nq78YtWhjRb7fCmF7Vu7Q8AhUdosNRNcVgemM
b0vl/L7rh+Dgj2kNVXSsrb7VWfjcntyua4EMjemW8M+5bFT2MFWtyfA5wSg40X5F
QCSkF/HFKGy+0cTZHjQH/AVFeYMfkXxPoO9z8Jv5ROD5gn+4Zls=
=q2aI
-----END PGP SIGNATURE-----

--eAbsdosE1cNLO4uF--