Bluetooth: Fix atomicity violation in {conn,adv}_{min,max}_interval_set
Subsystems (3)
PATCH v2 1/1 Bluetooth: Fix atomicity violation in {conn,adv}_{min,max}_interval_set
In {conn,adv}_min_interval_set():
if (val < ... || val > ... || val > hdev->le_{conn,adv}_max_interval)
return -EINVAL;
hci_dev_lock(hdev);
hdev->le_{conn,adv}_min_interval = val;
hci_dev_unlock(hdev);In {conn,adv}_max_interval_set():
if (val < ... || val > ... || val < hdev->le_{conn,adv}_min_interval)
return -EINVAL;
hci_dev_lock(hdev);
hdev->le_{conn,adv}_max_interval
hci_dev_unlock(hdev);The atomicity violation occurs due to concurrent execution of set_min and set_max funcs. Consider a scenario where setmin writes a new, valid 'min' value, and concurrently, setmax writes a value that is greater than the old 'min' but smaller than the new 'min'. In this case, setmax might check against the old 'min' value (before acquiring the lock) but write its value after the 'min' has been updated by setmin. This leads to a situation where the 'max' value ends up being smaller than the 'min' value, which is an inconsistency.
This possible bug is found by an experimental static analysis tool developed by our team, BassCheck[1]. This tool analyzes the locking APIs to extract function pairs that can be concurrently executed, and then analyzes the instructions in the paired functions to identify possible concurrency bugs including data races and atomicity violations. The above possible bug is reported when our tool analyzes the source code of Linux 5.17.
To resolve this issue, it is suggested to encompass the validity checks within the locked sections in both set_min and set_max funcs. The modification ensures that the validation of 'val' against the current min/max values is atomic, thus maintaining the integrity of the settings. With this patch applied, our tool no longer reports the bug, with the kernel configuration allyesconfig for x86_64. Due to the lack of associated hardware, we cannot test the patch in runtime testing, and just verify it according to the code logic.
[1] https://sites.google.com/view/basscheck/
---
v2:
* Adjust the format to pass the CI.
--- net/bluetooth/hci_debugfs.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
net/bluetooth/hci_debugfs.c +19 -11
@@ -849,11 +849,13 @@ DEFINE_SHOW_ATTRIBUTE(long_term_keys);static int conn_min_interval_set (void *data,u64 val) {struct hci_dev *hdev = data; - -if (val <0x0006 || val >0x0c80 || val > hdev->le_conn_max_interval) + +hci_dev_lock (hdev); +if (val <0x0006 || val >0x0c80 || val > hdev->le_conn_max_interval) { +hci_dev_unlock (hdev);return -EINVAL ; + } -hci_dev_lock (hdev); hdev->le_conn_min_interval = val;hci_dev_unlock (hdev);
@@ -877,11 +879,13 @@ DEFINE_DEBUGFS_ATTRIBUTE(conn_min_interval_fops, conn_min_interval_get,static int conn_max_interval_set (void *data,u64 val) {struct hci_dev *hdev = data; - -if (val <0x0006 || val >0x0c80 || val < hdev->le_conn_min_interval) + +hci_dev_lock (hdev); +if (val <0x0006 || val >0x0c80 || val < hdev->le_conn_min_interval) { +hci_dev_unlock (hdev);return -EINVAL ; + } -hci_dev_lock (hdev); hdev->le_conn_max_interval = val;hci_dev_unlock (hdev);
@@ -989,11 +993,13 @@ DEFINE_DEBUGFS_ATTRIBUTE(adv_channel_map_fops, adv_channel_map_get,static int adv_min_interval_set (void *data,u64 val) {struct hci_dev *hdev = data; - -if (val <0x0020 || val >0x4000 || val > hdev->le_adv_max_interval) + +hci_dev_lock (hdev); +if (val <0x0020 || val >0x4000 || val > hdev->le_adv_max_interval) { +hci_dev_unlock (hdev);return -EINVAL ; + } -hci_dev_lock (hdev); hdev->le_adv_min_interval = val;hci_dev_unlock (hdev);
@@ -1018,10 +1024,12 @@ static int adv_max_interval_set(void *data, u64 val) {struct hci_dev *hdev = data; -if (val <0x0020 || val >0x4000 || val < hdev->le_adv_min_interval) +hci_dev_lock (hdev); +if (val <0x0020 || val >0x4000 || val < hdev->le_adv_min_interval) { +hci_dev_unlock (hdev);return -EINVAL ; + } -hci_dev_lock (hdev); hdev->le_adv_max_interval = val;hci_dev_unlock (hdev);
Signature · 1 line
2.34.1
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=812523
---Test result---
Test Summary:
CheckPatch PASS 0.63 seconds GitLint PASS 0.30 seconds SubjectPrefix PASS 0.12 seconds BuildKernel PASS 28.04 seconds CheckAllWarning PASS 31.02 seconds CheckSparse PASS 36.78 seconds CheckSmatch PASS 100.59 seconds BuildKernel32 PASS 27.03 seconds TestRunnerSetup PASS 434.26 seconds TestRunner_l2cap-tester PASS 23.61 seconds TestRunner_iso-tester PASS 47.73 seconds TestRunner_bnep-tester PASS 7.10 seconds TestRunner_mgmt-tester PASS 162.48 seconds TestRunner_rfcomm-tester PASS 11.08 seconds TestRunner_sco-tester PASS 14.66 seconds TestRunner_ioctl-tester PASS 14.26 seconds TestRunner_mesh-tester PASS 8.97 seconds TestRunner_smp-tester PASS 9.84 seconds TestRunner_userchan-tester PASS 7.31 seconds IncrementalBuild PASS 25.84 seconds
---
Regards,
Linux Bluetooth