[v1] Bluetooth: hci_sync: Fix accept_list when attempting to suspend

Commit Message

Luiz Augusto von Dentz Jan. 5, 2024, 4:10 p.m. UTC

From: Luiz Augusto von Dentz <[e-mail]>

During suspend, only wakeable devices can be in acceptlist, so if the
device was previously added it needs to be removed otherwise the 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 <[e-mail]>
Signed-off-by: Luiz Augusto von Dentz <[e-mail]>
---
 net/bluetooth/hci_sync.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Paul Menzel Jan. 6, 2024, 9:50 a.m. UTC | #1

Dear Luiz,


Thank you for your patch.

Am 05.01.24 um 17:10 schrieb Luiz Augusto von Dentz:
> From: Luiz Augusto von Dentz <[e-mail]>
> 
> During suspend, only wakeable devices can be in acceptlist, so if the
> device was previously added it needs to be removed otherwise the can end

… the *device* can?

> up waking up the system prematurely.
> 
> Fixes: 3b42055388c3 ("Bluetooth: hci_sync: Fix attempting to suspend with unfiltered passive scan")
> Signed-off-by: Clancy Shang <[e-mail]>
> Signed-off-by: Luiz Augusto von Dentz <[e-mail]>
> ---
>   net/bluetooth/hci_sync.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> 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)

Reviewed-by: Paul Menzel <[e-mail]>


Kind regards,

Paul

[e-mail] Jan. 8, 2024, 6 p.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Fri,  5 Jan 2024 11:10:42 -0500 you wrote:
> From: Luiz Augusto von Dentz <[e-mail]>
> 
> During suspend, only wakeable devices can be in acceptlist, so if the
> device was previously added it needs to be removed otherwise the 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 <[e-mail]>
> Signed-off-by: Luiz Augusto von Dentz <[e-mail]>
> 
> [...]

Here is the summary with links:
  - [v1] Bluetooth: hci_sync: Fix accept_list when attempting to suspend
    https://git.kernel.org/bluetooth/bluetooth-next/c/0bcd317e8b31

You are awesome, thank you!

Patch

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)