From: Alain Michaud <alainm@chromium.org>
To: linux-bluetooth@vger.kernel.org
Cc: Alain Michaud <alainm@chromium.org>, mcchou@chromium.org
Subject: [PATCH] Bluetooth: Fix adv set removal processing.
Date: Mon, 15 Nov 2021 13:51:14 +0000 [thread overview]
Message-ID: <20211115135114.2763223-1-alainm@chromium.org> (raw)
When multiple advertisement sets are active and a single instance is
removed, the processing of hci_cc_le_set_ext_adv_enable will result in
considering all advertisements as disabled since the instance has
already been removed from the list.
The fix is to use the command parameters to validate the intent rather
than making an assumption based on the validity of the adv set.
remove_advertising() hci0
hci_req_add_ev() hci0 opcode 0x2039 plen 6
hci_req_add_ev() hci0 opcode 0x203c plen 1
hci_remove_adv_instance() hci0 removing 2MR
<-- This removes instance 2 from the adv_instances list
hci_cc_le_set_ext_adv_enable() hci0 status 0x00
hci_sent_cmd_data() hci0 opcode 0x2039
hci_cc_le_set_ext_adv_enable() adv instance 0, enabled 0
<-- This incorrectly assumes that all instances are
being disabled while only handle 2 is being disabled.
hci_cc_le_set_ext_adv_enable() adv instance list status - before
hci_cc_le_set_ext_adv_enable() adv instance 3 is 1
hci_cc_le_set_ext_adv_enable() adv instance 1 is 1
hci_cc_le_set_ext_adv_enable() HCI_LE_ADV state before: 1
hci_cc_le_set_ext_adv_enable() adv instance list status - after
hci_cc_le_set_ext_adv_enable() adv instance 3 is 0
hci_cc_le_set_ext_adv_enable() adv instance 1 is 0
hci_cc_le_set_ext_adv_enable() HCI_LE_ADV state after: 0
<-- This is incorrect since handle 1 and 3 are still enabled
in the controller
The fix was validated by running the ChromeOS bluetooth_AdapterAdvHealth
test suite.
Reviewed-by: mcchou@chromium.org
Signed-off-by: Alain Michaud <alainm@chromium.org>
---
net/bluetooth/hci_event.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index d4b75a6cfeee..52161d04136f 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1385,14 +1385,16 @@ static void hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev,
if (adv->enabled)
goto unlock;
}
- } else {
+
+ hci_dev_clear_flag(hdev, HCI_LE_ADV);
+ } else if (!cp->num_of_sets || !set->handle) {
/* All instances shall be considered disabled */
list_for_each_entry_safe(adv, n, &hdev->adv_instances,
list)
adv->enabled = false;
- }
- hci_dev_clear_flag(hdev, HCI_LE_ADV);
+ hci_dev_clear_flag(hdev, HCI_LE_ADV);
+ }
}
unlock:
--
2.34.0.rc1.387.gb447b232ab-goog
next reply other threads:[~2021-11-15 13:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 13:51 Alain Michaud [this message]
2021-11-15 17:05 ` [PATCH] Bluetooth: Fix adv set removal processing Marcel Holtmann
2021-11-15 19:35 ` Luiz Augusto von Dentz
2021-11-16 20:49 ` Alain Michaud
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=20211115135114.2763223-1-alainm@chromium.org \
--to=alainm@chromium.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=mcchou@chromium.org \
/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).