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 19:43:33 +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 v2] Bluetooth: Fix update of connection state in
 `hci_encrypt_cfm`
Message-ID: <50fd2c75ce196196f879f8373555cc30bfc75154.1594834970.git.ps@pks.im>
References: <0df5bf3eac160de28b9493a8959510980a8a8e8b.1594803508.git.ps@pks.im>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="XOIedfhf+7KOe/yw"
Content-Disposition: inline
In-Reply-To: <0df5bf3eac160de28b9493a8959510980a8a8e8b.1594803508.git.ps@pks.im>
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk


--XOIedfhf+7KOe/yw
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, 2020-05-19), 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 to change the connection state. But with the
conversion, we now only update the connection state if a status was set
already. In fact, the reverse should be true: the status should be
updated if no status is yet set. So let's fix the isuse by reversing the
condition.

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_c=
ore.h
index cdd4f1db8670..da3728871e85 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1387,7 +1387,7 @@ static inline void hci_encrypt_cfm(struct hci_conn *c=
onn, __u8 status)
 	__u8 encrypt;
=20
 	if (conn->state =3D=3D BT_CONFIG) {
-		if (status)
+		if (!status)
 			conn->state =3D BT_CONNECTED;
=20
 		hci_connect_cfm(conn, status);
--=20
2.27.0


--XOIedfhf+7KOe/yw
Content-Type: application/pgp-signature; name="signature.asc"

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

iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl8PQEQACgkQVbJhu7ck
PpS16g//UnlOVdhsGJy5NF7MOvpKO40nLapdxOc5qvJX37rTLkyE8GTfCKpkrHBf
XxJ1DOZWLOhqEEb0RX32L/JjuOCb+wUjAwx6+y6o7vXswFKUxxUlHRxHOGDafq6n
eD5NPcw9Lv1dSLvMzNfKVdD/hVgf1wy8Uj92SREcSob8Yzu48nrcovRYGHumhJ49
dg2XJ2a0UpnAxuwjPzcp87rChHCaAYb67yBrWokURVp34QHxjiBt4jM8hERMyD2O
BBXiJb7aODo3Wa4BFTZcHMBGraEjpgsrDe1tURBnkrn2MxaAawigwNnz4Q+KJS0S
dFUoOuhrcuNgzUGBNiY0efW7SbZ9pFO09hmCgcylb0TCxX28kpOfHX98ruxfdRbz
Z/5ayYtmQNQVQojY8TWpz8hoeLArMC8sfrK5eP6B0lpouiDBUVh+LTBrCchs+3Hv
OLe7HazD6pPPI6zX2uxLhbSzHld8aC9n088NUlwijCMENRXI30uQIYYioh2vJLsf
natq/0YZbWety2hJL1sTp6Ai0lXVpZ2yGyrI6CK+WA8J6GH7Y9Q/JJHCFHr7vcAo
5nlM9gMB4I0Hrww+DlRjFSepX7vhnZz0agD02JWQEgseEtT2cEIJz4PUg12bTvem
oe/ZHzjXUm8oKm5GI/7Z/sUEgzC77Et/IOjeyThNUkCQ3pyP7l4=
=U4vV
-----END PGP SIGNATURE-----

--XOIedfhf+7KOe/yw--