aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGravatar Luiz Augusto von Dentz <luiz.von.dentz@intel.com> 2024-01-05 10:43:26 -0500
committerGravatar Luiz Augusto von Dentz <luiz.von.dentz@intel.com> 2024-02-28 09:42:02 -0500
commite5469adb2a7e930d96813316592302d9f8f1df4e (patch)
tree9a71a12ef683381fc1d5d8f1e6340f9b0816ccd4 /net
parentBluetooth: Avoid potential use-after-free in hci_error_reset (diff)
downloadlinux-e5469adb2a7e930d96813316592302d9f8f1df4e.tar.gz
linux-e5469adb2a7e930d96813316592302d9f8f1df4e.tar.bz2
linux-e5469adb2a7e930d96813316592302d9f8f1df4e.zip
Bluetooth: hci_sync: Fix accept_list when attempting to suspend
During suspend, only wakeable devices can be in acceptlist, so if the device was previously added it needs to be removed otherwise the device can end up waking up the system prematurely. Fixes: 3b42055388c3 ("Bluetooth: hci_sync: Fix attempting to suspend with unfiltered passive scan") Signed-off-by: Clancy Shang <clancy.shang@quectel.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_sync.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index b3141e3f9cf6..5716345a26df 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2206,8 +2206,11 @@ static int hci_le_add_accept_list_sync(struct hci_dev *hdev,
/* During suspend, only wakeable devices can be in acceptlist */
if (hdev->suspended &&
- !(params->flags & HCI_CONN_FLAG_REMOTE_WAKEUP))
+ !(params->flags & HCI_CONN_FLAG_REMOTE_WAKEUP)) {
+ hci_le_del_accept_list_sync(hdev, &params->addr,
+ params->addr_type);
return 0;
+ }
/* Select filter policy to accept all advertising */
if (*num_entries >= hdev->le_accept_list_size)