Bluetooth: MGMT: validate advertising TLV before type checks
Subsystems (2)
PATCH v2 1/1 Bluetooth: MGMT: validate advertising TLV before type checks
tlv_data_is_valid() reads each advertising data field length from data[i], then inspects data[i + 1] for managed EIR types before checking that the current field still fits inside the supplied buffer.
A malformed field whose length byte is the last byte of the buffer can therefore make the parser read one byte past the advertising data.
Move the existing element-length check before any type-octet inspection so each non-empty element is proven to contain its type byte before the parser looks at data[i + 1].
KASAN reported an out-of-bounds read in tlv_data_is_valid(), reached through add_advertising() and hci_mgmt_cmd().
---
v2:
- Drop the MGMT_OP_ADD_EXT_ADV_DATA hunk; bluetooth-next already validates that command length.
- Keep only the tlv_data_is_valid() element-ordering fix.
- Add a Fixes tag and avoid the raw KASAN headline that triggered checkpatch.
net/bluetooth/mgmt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/bluetooth/mgmt.c +6 -6
@@ -8638,6 +8638,12 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data,if (!cur_len)continue ; +/* If the current field length would exceed the total data +* length, then it's invalid. +*/ +if (i + cur_len >= len) +return false; +if (data[i +1 ] ==EIR_FLAGS && (!is_adv_data ||flags_managed (adv_flags)))return false;
@@ -8654,12 +8660,6 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data,if (data[i +1 ] ==EIR_APPEARANCE &&appearance_managed (adv_flags))return false; - -/* If the current field length would exceed the total data -* length, then it's invalid. -*/ -if (i + cur_len >= len) -return false; }return true;
Signature · 1 line
2.43.0
Dear Cen,
Thank you for your patch.
Am 28.05.26 um 09:57 schrieb Zhang, Cen:
Quoted 7 lines
tlv_data_is_valid()reads each advertising data field length from data[i], then inspects data[i + 1] for managed EIR types before checking that the current field still fits inside the supplied buffer.A malformed field whose length byte is the last byte of the buffer can therefore make the parser read one byte past the advertising data.
Quoted 6 lines
Move the existing element-length check before any type-octet inspection so each non-empty element is proven to contain its type byte before the parser looks at data[i + 1].
KASAN reported an out-of-bounds read in
tlv_data_is_valid(), reached throughadd_advertising()andhci_mgmt_cmd().
I’d add this after the second paragraph, and also add an excerpt, so people also seeing the trace can find the patch/commit more easily.
Quoted 18 lines
Fixes 2bb36870e8cb ("Bluetooth: Unify advertising instance flags check")Signed-off-by Zhang Cen <[email protected]>---
v2:
- Drop theMGMT_OP_ADD_EXT_ADV_DATAhunk; bluetooth-next already validates that command length.
- Keep only thetlv_data_is_valid()element-ordering fix.
- Add a Fixes tag and avoid the raw KASAN headline that triggered checkpatch.net/bluetooth/mgmt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)net/bluetooth/mgmt.c +0
-0
net/bluetooth/mgmt.c static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data, · line 8645
Quoted 8 lines
net/bluetooth/mgmt.c +5
-0@@ -8638,6 +8638,12 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data,if (!cur_len)continue ; +/* If the current field length would exceed the total data +* length, then it's invalid. +*/ +if (i + cur_len >= len) +return false;
Does Linux log something in this case?
Quoted 7 lines
net/bluetooth/mgmt.c +1
-0+if (data[i +1 ] ==EIR_FLAGS && (!is_adv_data ||flags_managed (adv_flags)))return false;@@ -8654,12 +8660,6 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data,if (data[i +1 ] ==EIR_APPEARANCE &&appearance_managed (adv_flags))
net/bluetooth/mgmt.c static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data, · line 8665
Quoted 10 lines
net/bluetooth/mgmt.c +0
-6return false; - -/* If the current field length would exceed the total data -* length, then it's invalid. -*/ -if (i + cur_len >= len) -return false; }return true;
The diff looks good. Feel free to add:
Kind regards,
Paul
Hi Paul,
Thanks for the review.
Quoted 2 lines
Does Linux log something in this case?
There is no printk or other kernel log for this case. The malformed advertising data makes tlv_data_is_valid() return false, and add_advertising() then reports MGMT_STATUS_INVALID_PARAMS through the Bluetooth management command status response. Keeping this quiet matches the surrounding validation paths and avoids user-triggerable log noise.
Quoted 3 lines
The diff looks good. Feel free to add:
Reviewed-by Paul Menzel <[email protected]>
I will send v3 with the KASAN excerpt moved earlier in the commit message, and with your Reviewed-by tag added.
Thanks,
Zhang Cen