Bluetooth: Fix advertising duplicated flags
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: Fix advertising duplicated flags
From: Luiz Augusto von Dentz <[email protected]>
Instances may have flags set as part of its data in which case the code should not attempt to add it again otherwise it can cause duplication:
< HCI Command: LE Set Extended Advertising Data (0x08|0x0037) plen 35
Handle: 0x00
Operation: Complete extended advertising data (0x03)
Fragment preference: Minimize fragmentation (0x01)
Data length: 0x06
Flags: 0x04
BR/EDR Not Supported
Flags: 0x06
LE General Discoverable Mode
BR/EDR Not SupportedSigned-off-by Luiz Augusto von Dentz <[email protected]>
--- net/bluetooth/hci_request.c | 9 +++++++++ 1 file changed, 9 insertions(+)
net/bluetooth/hci_request.c +9 -0
@@ -1273,6 +1273,14 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) instance_flags =get_adv_instance_flags (hdev, instance); +/* If instance already has the flags set skip adding it once +* again. +*/ +if (adv_instance &&eir_get_data (adv_instance->adv_data, + adv_instance->adv_data_len,EIR_FLAGS , +NULL )) + goto skip_flags; +/* The Add Advertising command allows userspace to set both the general * and limited discoverable flags. */
@@ -1305,6 +1313,7 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) } } +skip_flags:if (adv_instance) {memcpy (ptr, adv_instance->adv_data, adv_instance->adv_data_len);
Signature · 1 line
2.21.0
Johan Hedberg
AppliedHi Luiz,
Quoted 14 lines · Luiz Augusto von Dentz
Instances may have flags set as part of its data in which case the code should not attempt to add it again otherwise it can cause duplication:
< HCI Command: LE Set Extended Advertising Data (0x08|0x0037) plen 35
Handle: 0x00 Operation: Complete extended advertising data (0x03) Fragment preference: Minimize fragmentation (0x01) Data length: 0x06 Flags: 0x04 BR/EDR Not Supported Flags: 0x06 LE General Discoverable Mode BR/EDR Not Supported
Quoted 4 lines
Signed-off-by Luiz Augusto von Dentz <[email protected]>--- net/bluetooth/hci_request.c | 9 +++++++++ 1 file changed, 9 insertions(+)
Applied to bluetooth-next. Thanks.
Johan