From patchwork Thu Oct 15 21:12:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hans-Christian Egtvedt \(hegtvedt\)" X-Patchwork-Id: 290323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B242EC433E7 for ; Thu, 15 Oct 2020 21:19:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5AE2C2076A for ; Thu, 15 Oct 2020 21:19:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cisco.com header.i=@cisco.com header.b="KppQssNG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726157AbgJOVTT (ORCPT ); Thu, 15 Oct 2020 17:19:19 -0400 Received: from aer-iport-1.cisco.com ([173.38.203.51]:19033 "EHLO aer-iport-1.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726018AbgJOVTS (ORCPT ); Thu, 15 Oct 2020 17:19:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1842; q=dns/txt; s=iport; t=1602796758; x=1604006358; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7cMXzNOF9J//04TbRvfrLASSiRGZ/tV0OqpQHR+3loQ=; b=KppQssNGeCKPEbGh5gEx0hwIGdHJu1z0iwvGPgYWaQ5bjt6Aly/4ocNM RNZsKCHe4AuveLqxfBkjCXb1K0+xQY37mqOjY4MDOrG87kwqZQVpHSv0B OyRshLB6+b6tFyBngLXa1YzmjytoAqtB0TnXrmToECs7alD5FLMNNSMCp I=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0DZBAB4uohf/xbLJq1ghkcBIBIsjT+IGJwmCwEBAQ8vBAEBhEoCggkmOBMCAwEBCwEBBQEBAQIBBgRthWiFcwYnCwFGECAxVxmDJoJ9rE6BdTOKW4E4iDeEYTMGgUE/g3NshASBBoUqBJAlN6ccgnSaXw8igxaeNC2OHIZenlqBayOBV00jFYMkUBkNjisXFI4SPwMwAjYCBgoBAQMJjAKCRgEB X-IronPort-AV: E=Sophos;i="5.77,380,1596499200"; d="scan'208";a="30387898" Received: from aer-iport-nat.cisco.com (HELO aer-core-1.cisco.com) ([173.38.203.22]) by aer-iport-1.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 15 Oct 2020 21:12:04 +0000 Received: from hce-anki.rd.cisco.com ([10.47.78.239]) by aer-core-1.cisco.com (8.15.2/8.15.2) with ESMTP id 09FLC3V4020717; Thu, 15 Oct 2020 21:12:04 GMT From: Hans-Christian Noren Egtvedt To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, Patrick Steinhardt , Luiz Augusto von Dentz , Marcel Holtmann , stable@vger.kernel.org Subject: [v4.9..v5.4/bluetooth PATCH 2/3] Bluetooth: Fix update of connection state in `hci_encrypt_cfm` Date: Thu, 15 Oct 2020 23:12:01 +0200 Message-Id: <20201015211202.1188015-2-hegtvedt@cisco.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201015211202.1188015-1-hegtvedt@cisco.com> References: <20201015211202.1188015-1-hegtvedt@cisco.com> MIME-Version: 1.0 X-Outbound-SMTP-Client: 10.47.78.239, [10.47.78.239] X-Outbound-Node: aer-core-1.cisco.com Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Patrick Steinhardt 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_encrypt_cfm") Signed-off-by: Patrick Steinhardt Acked-by: Luiz Augusto von Dentz Signed-off-by: Marcel Holtmann (cherry picked from commit 339ddaa626995bc6218972ca241471f3717cc5f4) Cc: stable@vger.kernel.org # 4.9..5.4 --- 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_core.h index ffd0eedd27ab..144f580556f9 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1314,7 +1314,7 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status) __u8 encrypt; if (conn->state == BT_CONFIG) { - if (status) + if (!status) conn->state = BT_CONNECTED; hci_connect_cfm(conn, status);