From 51b64c476a5ddc66d3459f14e98e5de9211e9e24 Mon Sep 17 00:00:00 2001
From: Miao-chen Chou <mcchou@chromium.org>
Date: Tue, 7 Jul 2020 15:52:28 -0700
Subject: [PATCH] Bluetooth: Use whitelist for scan policy when suspending
Git-commit: 51b64c476a5ddc66d3459f14e98e5de9211e9e24
Patch-mainline: v5.9-rc1
References: jsc#SLE-13430
Even with one advertisement monitor in place, the scan policy should use
the whitelist while the system is going to suspend to prevent waking by
random advertisement.
The following test was performed.
- With a paired device, register one advertisement monitor, suspend
the system and verify that the host was not awaken by random
advertisements.
Signed-off-by: Miao-chen Chou <mcchou@chromium.org>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
net/bluetooth/hci_request.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 68a2ec36e1c1..770b93758112 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -800,9 +800,10 @@ static u8 update_white_list(struct hci_request *req)
/* Once the controller offloading of advertisement monitor is in place,
* the if condition should include the support of MSFT extension
- * support.
+ * support. If suspend is ongoing, whitelist should be the default to
+ * prevent waking by random advertisements.
*/
- if (!idr_is_empty(&hdev->adv_monitors_idr))
+ if (!idr_is_empty(&hdev->adv_monitors_idr) && !hdev->suspended)
return 0x00;
/* Select filter policy to use white list */
--
2.16.4