From patchwork Wed Jun 1 15:11:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alain Michaud X-Patchwork-Id: 12866964 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3294CCA477 for ; Wed, 1 Jun 2022 15:12:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354293AbiFAPMj (ORCPT ); Wed, 1 Jun 2022 11:12:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351739AbiFAPMh (ORCPT ); Wed, 1 Jun 2022 11:12:37 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D56D488AB for ; Wed, 1 Jun 2022 08:12:36 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id i5-20020ac85c05000000b00304bbcc1b72so1487702qti.17 for ; Wed, 01 Jun 2022 08:12:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=kgeENkTKQF5CH/ji/s7eILYDZxj2xanbyJLZhsasnkA=; b=FJxMPGLt2Bpvw2/0+tJdREvb+DvBVoSgL11uuMKQGGTKHhbzS1I+Kb5IoBEB8FEwZl 5PL30L7Ye9wlkvHJ1x3wx36AWb/z3moL84nUSqZlHzJrad66C9/VQ9u7QQzKEvTSXlW7 rvy4jBfDlCdSiT+XDVTD+i2XLVhe3o0D/1rXCHKitF61d49rYkx8M4L4h2HqRjpXDL3m uY3Cm8nhLzAqLc+TY/4QGvQR9at5NiE8yWTOylrD8Iz9Y/wIZrRIccGo4Da7Y1jFL1N9 JODWH9iZODIrQCpWLK80EzwKYOygFwR434EKMuiqMbBMbutxv5twhC1Q2gU+37CZx135 StQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=kgeENkTKQF5CH/ji/s7eILYDZxj2xanbyJLZhsasnkA=; b=44Hs2zxrbUT1oHDMIuKoqTdsas4FkQRE++VqNsZObjtXPIHVLw096C2gbfUoZc1N6H wKbHnEEepoeeOgeY/JGmArNxW6N/aOeFOuXIY2p37mpPvTKiWPd7f3irsfDv41tLwKe+ J5G3g7AWDdXmXKNx6ywCY2hOVEGWJWnHAACEBYtZw8O/m78V6R/CAeRLssMcgCnawzRT jzbju/kgH/xGzq1jMFzAQ5omMzgHaMgf0lNsqMlaNKz4wHn+OYEbqTmogkqt2eb3vOE2 UzWa9dtuDcSiGq03fjJ6EcmbRyTR8DO4RXY5DaiuOd4mJfSUDnCxyQwG8F25fjLOnmvK /2gQ== X-Gm-Message-State: AOAM5322QbYS1dDmx+LDQX/Yfx9Ds0py1wJExrKrPM8QoRlVdR6GIvV/ gQm+6S4s5lJIfIMadkhqOrjlXXkh0XmL4QVATi6afiWGzL6HuJ52MlA8MzcmvDMCYfSIsXe/moA 4/YbBWb84PxRgiss1g29w4ITEbaWxqm6c+N6xFsIfw0wjHEK/JUrhT8bUuB3Va/siY0b0tjYB2/ lbW42Lo7XTZYhpvQ== X-Google-Smtp-Source: ABdhPJzoNig3fFGatBX6poNGyFUAGYYb28s9k+CvU/LWYXulZuecUpb6DYnP8BHOpM1XCl11+luMa+37t/YNT9crnFU= X-Received: from alainmic.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:2890]) (user=alainmichaud job=sendgmr) by 2002:ad4:5b8e:0:b0:464:50c4:c568 with SMTP id 14-20020ad45b8e000000b0046450c4c568mr13309768qvp.115.1654096355448; Wed, 01 Jun 2022 08:12:35 -0700 (PDT) Date: Wed, 1 Jun 2022 15:11:27 +0000 Message-Id: <20220601151115.1.Ia503b15be0f366563b4e7c9f93cbec5e756bb0ae@changeid> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.1.255.ge46751e96f-goog Subject: [PATCH] Bluetooth: clear the temporary linkkey in hci_conn_cleanup From: Alain Michaud To: linux-bluetooth@vger.kernel.org Cc: chromeos-bluetooth-upstreaming@chromium.org, Alain Michaud , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Johan Hedberg , Luiz Augusto von Dentz , Marcel Holtmann , Paolo Abeni , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Alain Michaud If a hardware error occurs and the connections are flushed without a disconnection_complete event being signaled, the temporary linkkeys are not flushed. This change ensures that any outstanding flushable linkkeys are flushed when the connection are flushed from the hash table. Signed-off-by: Alain Michaud --- net/bluetooth/hci_conn.c | 3 +++ net/bluetooth/hci_event.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 352d7d612128..85dc1af90fcb 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -118,6 +118,9 @@ static void hci_conn_cleanup(struct hci_conn *conn) if (test_bit(HCI_CONN_PARAM_REMOVAL_PEND, &conn->flags)) hci_conn_params_del(conn->hdev, &conn->dst, conn->dst_type); + if (test_bit(HCI_CONN_FLUSH_KEY, &conn->flags)) + hci_remove_link_key(hdev, &conn->dst); + hci_chan_list_flush(conn); hci_conn_hash_del(hdev, conn); diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 6b83f9b0082c..09f4ff71e747 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3372,8 +3372,10 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, void *data, reason, mgmt_connected); if (conn->type == ACL_LINK) { - if (test_bit(HCI_CONN_FLUSH_KEY, &conn->flags)) + if (test_bit(HCI_CONN_FLUSH_KEY, &conn->flags)) { hci_remove_link_key(hdev, &conn->dst); + clear_bit(HCI_CONN_FLUSH_KEY, &conn->flags); + } hci_req_update_scan(hdev); }