From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Marcel Holtmann <marcel@holtmann.org>,
Johan Hedberg <johan.hedberg@gmail.com>,
Sathish Narsimman <sathish.narasimman@intel.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] Revert "Bluetooth: Update resolving list when updating whitelist"
Date: Sat, 3 Oct 2020 15:54:49 +0200 [thread overview]
Message-ID: <20201003135449.GA2691@kroah.com> (raw)
This reverts commit 0eee35bdfa3b472cc986ecc6ad76293fdcda59e2 as it
breaks all bluetooth connections on my machine.
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Sathish Narsimman <sathish.narasimman@intel.com>
Fixes: 0eee35bdfa3b ("Bluetooth: Update resolving list when updating whitelist")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/bluetooth/hci_request.c | 41 ++-----------------------------------
1 file changed, 2 insertions(+), 39 deletions(-)
This has been bugging me for since 5.9-rc1, when all bluetooth devices
stopped working on my desktop system. I finally got the time to do
bisection today, and it came down to this patch. Reverting it on top of
5.9-rc7 restored bluetooth devices and now my input devices properly
work.
As it's almost 5.9-final, any chance this can be merged now to fix the
issue?
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index e0269192f2e5..75b0a4776f10 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -697,21 +697,6 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,
bt_dev_dbg(req->hdev, "Remove %pMR (0x%x) from whitelist", &cp.bdaddr,
cp.bdaddr_type);
hci_req_add(req, HCI_OP_LE_DEL_FROM_WHITE_LIST, sizeof(cp), &cp);
-
- if (use_ll_privacy(req->hdev)) {
- struct smp_irk *irk;
-
- irk = hci_find_irk_by_addr(req->hdev, bdaddr, bdaddr_type);
- if (irk) {
- struct hci_cp_le_del_from_resolv_list cp;
-
- cp.bdaddr_type = bdaddr_type;
- bacpy(&cp.bdaddr, bdaddr);
-
- hci_req_add(req, HCI_OP_LE_DEL_FROM_RESOLV_LIST,
- sizeof(cp), &cp);
- }
- }
}
/* Adds connection to white list if needed. On error, returns -1. */
@@ -732,7 +717,7 @@ static int add_to_white_list(struct hci_request *req,
return -1;
/* White list can not be used with RPAs */
- if (!allow_rpa && !use_ll_privacy(hdev) &&
+ if (!allow_rpa &&
hci_find_irk_by_addr(hdev, ¶ms->addr, params->addr_type)) {
return -1;
}
@@ -750,28 +735,6 @@ static int add_to_white_list(struct hci_request *req,
cp.bdaddr_type);
hci_req_add(req, HCI_OP_LE_ADD_TO_WHITE_LIST, sizeof(cp), &cp);
- if (use_ll_privacy(hdev)) {
- struct smp_irk *irk;
-
- irk = hci_find_irk_by_addr(hdev, ¶ms->addr,
- params->addr_type);
- if (irk) {
- struct hci_cp_le_add_to_resolv_list cp;
-
- cp.bdaddr_type = params->addr_type;
- bacpy(&cp.bdaddr, ¶ms->addr);
- memcpy(cp.peer_irk, irk->val, 16);
-
- if (hci_dev_test_flag(hdev, HCI_PRIVACY))
- memcpy(cp.local_irk, hdev->irk, 16);
- else
- memset(cp.local_irk, 0, 16);
-
- hci_req_add(req, HCI_OP_LE_ADD_TO_RESOLV_LIST,
- sizeof(cp), &cp);
- }
- }
-
return 0;
}
@@ -812,7 +775,7 @@ static u8 update_white_list(struct hci_request *req)
}
/* White list can not be used with RPAs */
- if (!allow_rpa && !use_ll_privacy(hdev) &&
+ if (!allow_rpa &&
hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) {
return 0x00;
}
--
2.28.0
next reply other threads:[~2020-10-03 13:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-03 13:54 Greg Kroah-Hartman [this message]
2020-10-03 15:51 ` [PATCH] Revert "Bluetooth: Update resolving list when updating whitelist" Marcel Holtmann
2020-10-03 16:07 ` Greg Kroah-Hartman
2020-10-03 18:33 ` Marcel Holtmann
2020-10-04 10:51 ` Greg Kroah-Hartman
2020-10-04 10:53 ` Greg Kroah-Hartman
2020-10-04 12:17 ` Bastien Nocera
2020-10-04 13:18 ` Greg Kroah-Hartman
2020-10-04 13:23 ` Bastien Nocera
2020-10-05 8:29 ` Greg Kroah-Hartman
2020-10-04 16:59 ` Marcel Holtmann
2020-10-05 8:36 ` Greg Kroah-Hartman
2020-10-05 12:19 ` Marcel Holtmann
2020-10-05 12:40 ` Greg Kroah-Hartman
2020-10-05 15:44 ` Marcel Holtmann
2020-10-05 16:11 ` Greg Kroah-Hartman
2020-10-05 17:14 ` Marcel Holtmann
2020-10-05 17:38 ` Greg Kroah-Hartman
2020-10-05 18:02 ` Greg Kroah-Hartman
2020-10-05 18:58 ` Marcel Holtmann
2020-10-07 13:23 ` Greg Kroah-Hartman
2020-10-07 13:40 ` Greg Kroah-Hartman
2020-10-07 13:43 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201003135449.GA2691@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=johan.hedberg@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=netdev@vger.kernel.org \
--cc=sathish.narasimman@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).