Bluetooth: hci_event: Mask data status from LE ext adv reports

[ Upstream commit 0cadf8534f2a727bc3a01e8c583b085d25963ee0 ]

The Event_Type field in an LE Extended Advertising Report uses bits 5
and 6 for data status (e.g. truncation or fragmentation), not the PDU
type itself.

The ext_evt_type_to_legacy() function fails to mask these status bits
before evaluation. This causes valid advertisements with status bits set
(e.g. a truncated non-connectable advertisement, which ends up showing
as PDU type 0x40) to be misclassified as unknown and subsequently
dropped. This is okay for most checks which use bitwise AND on the
relevant event type bits, but it doesn't work for non-connectable types,
which are checked with '== LE_EXT_ADV_NON_CONN_IND' (that is, zero).

In terms of behaviour, first the device sends a truncated report:

> HCI Event: LE Meta Event (0x3e) plen 26
      LE Extended Advertising Report (0x0d)
        Entry 0
          Event type: 0x0040
            Data status: Incomplete, data truncated, no more to come
          Address type: Random (0x01)
          Address: 1D:12:46:FA:F8:6E (Non-Resolvable)
          SID: 0x03
          RSSI: -98 dBm (0x9e)
          Data length: 0x00

Then, a few seconds later, it sends the subsequent complete report:

> HCI Event: LE Meta Event (0x3e) plen 122
      LE Extended Advertising Report (0x0d)
        Entry 0
          Event type: 0x0000
            Data status: Complete
          Address type: Random (0x01)
          Address: 1D:12:46:FA:F8:6E (Non-Resolvable)
          SID: 0x03
          RSSI: -97 dBm (0x9f)
          Data length: 0x60
          Service Data: Google (0xfef3)
            Data[92]: ...

These devices often send multiple truncated reports per second.

This patch introduces a PDU type mask to ensure only the relevant bits
are evaluated, allowing for the correct translation of all valid
extended advertising packets.

Fixes: b2cc9761f144 ("Bluetooth: Handle extended ADV PDU types")
Signed-off-by: Chris Down <chris@chrisdown.name>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index e4a97b2d099841da01719380772f9be1d6b270da..4c084a03d6bb75f8e7f36c70c74d00f5b941b6cd 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -2577,6 +2577,7 @@ struct hci_ev_le_conn_complete {
 #define LE_EXT_ADV_DIRECT_IND          0x0004
 #define LE_EXT_ADV_SCAN_RSP            0x0008
 #define LE_EXT_ADV_LEGACY_PDU          0x0010
+#define LE_EXT_ADV_DATA_STATUS_MASK    0x0060
 #define LE_EXT_ADV_EVT_TYPE_MASK       0x007f
 
 #define ADDR_LE_DEV_PUBLIC             0x00

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 8516ba62c54559813a90d382d80e92cb3a50591e..3b22ce3aa95bb555345ec751ed8c21bdc4756c93 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6216,6 +6216,11 @@ static void hci_le_adv_report_evt(struct hci_dev *hdev, void *data,
 
 static u8 ext_evt_type_to_legacy(struct hci_dev *hdev, u16 evt_type)
 {
+       u16 pdu_type = evt_type & ~LE_EXT_ADV_DATA_STATUS_MASK;
+
+       if (!pdu_type)
+               return LE_ADV_NONCONN_IND;
+
        if (evt_type & LE_EXT_ADV_LEGACY_PDU) {
                switch (evt_type) {
                case LE_LEGACY_ADV_IND:
@@ -6247,8 +6252,7 @@ static u8 ext_evt_type_to_legacy(struct hci_dev *hdev, u16 evt_type)
        if (evt_type & LE_EXT_ADV_SCAN_IND)
                return LE_ADV_SCAN_IND;
 
-       if (evt_type == LE_EXT_ADV_NON_CONN_IND ||
-           evt_type & LE_EXT_ADV_DIRECT_IND)
+       if (evt_type & LE_EXT_ADV_DIRECT_IND)
                return LE_ADV_NONCONN_IND;
 
 invalid: