Bluetooth: mgmt: validate advertising TLV envelopes before parsing
Subsystems (2)
PATCH 1/1 Bluetooth: mgmt: validate advertising TLV envelopes before parsing
tlv_data_is_valid() loads the field length from data[i] and then inspects data[i + 1] for managed EIR types before it proves that the element still fits inside the supplied advertising buffer.
Move the existing per-element length check ahead of the type-byte tests so every non-empty element is proven to fit before data[i + 1] is read.
Also reject MGMT_OP_ADD_EXT_ADV_DATA commands whose declared advertising and scan-response lengths do not match the trailing command payload. Unlike MGMT_OP_ADD_ADVERTISING, that path did not validate the outer envelope before slicing cp->data for tlv_data_is_valid().
Sanitizer validation reported:
BUG: KASAN: vmalloc-out-of-bounds in tlv_data_is_valid() Read of size 1 at addr ffffc9000031a000 Call trace: dump_stack_lvl() (?:?) print_address_description() (mm/kasan/report.c:373) tlv_data_is_valid() (net/bluetooth/mgmt.c:8623) print_report() (?:?) srso_alias_return_thunk() (arch/x86/include/asm/nospec-branch.h:375) kasan_addr_to_slab() (mm/kasan/common.c:45) kasan_report() (?:?) add_advertising() (net/bluetooth/mgmt.c:8751) __entry_text_end() (?:?) __hci_dev_get() (net/bluetooth/hci_core.c:67) do_raw_read_unlock() (kernel/locking/spinlock_debug.c:178) _raw_read_unlock() (kernel/locking/spinlock.c:262) hci_mgmt_cmd() (net/bluetooth/hci_sock.c:1619) hci_sock_sendmsg() (net/bluetooth/hci_sock.c:1800) sock_write_iter() (net/socket.c:1234) reacquire_held_locks() (kernel/locking/lockdep.c:5375) security_file_permission() (?:?) vfs_write() (fs/read_write.c:668) __sys_bind() (net/socket.c:1947) ksys_write() (fs/read_write.c:729) rcu_is_watching() (?:?) do_syscall_64() (arch/x86/entry/syscall_64.c:87) entry_SYSCALL_64_after_hwframe() (?:?)
---
net/bluetooth/mgmt.c +10 -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;
@@ -9113,6 +9113,10 @@ static int add_ext_adv_data(struct sock *sk, struct hci_dev *hdev, void *data,BT_DBG ("%s" , hdev->name); +if (data_len !=sizeof (*cp) + cp->adv_data_len + cp->scan_rsp_len) +return mgmt_cmd_status (sk, hdev->id,MGMT_OP_ADD_EXT_ADV_DATA , +MGMT_STATUS_INVALID_PARAMS ); +hci_dev_lock (hdev); adv_instance =hci_find_adv_instance (hdev, cp->instance);
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1092077
---Test result---
Test Summary:
CheckPatch FAIL 0.60 seconds GitLint PASS 0.27 seconds SubjectPrefix PASS 0.11 seconds BuildKernel PASS 19.18 seconds CheckAllWarning PASS 21.24 seconds CheckSparse PASS 20.64 seconds BuildKernel32 PASS 19.26 seconds TestRunnerSetup PASS 404.83 seconds TestRunner_mgmt-tester PASS 2008.13 seconds TestRunner_mesh-tester PASS 55.00 seconds IncrementalBuild PASS 19.11 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
Bluetooth: mgmt: validate advertising TLV envelopes before parsing
WARNING: The commit message has 'BUG: KASAN: ', perhaps it also needs a 'Fixes:' tag?
total: 0 errors, 1 warnings, 0 checks, 34 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/patch/14563149.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
https://github.com/bluez/bluetooth-next/pull/159
---
Regards,
Linux Bluetooth