[PATCH] Bluetooth: btintel_pcie: validate completion ring indices

[PATCH] Bluetooth: btintel_pcie: validate completion ring indices

[Pengpeng Hou]

The MSI-X RX and TX completion handlers trust the shared ring indices
read from data->ia.cr_tia[] and data->ia.cr_hia[] before using cr_tia as
an index into the fixed urbd ring arrays. If the device reports a stale
or malformed completion index, the driver can step past rxq->urbd1s[] or
txq->urbd0s[] before it gets a chance to recover.

Validate both completion ring indices against the queue depth before
walking the descriptor arrays.

Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
---
 drivers/bluetooth/btintel_pcie.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
index 37b744e35bc4..06c2b81f2b6e 100644
--- a/drivers/bluetooth/btintel_pcie.c
+++ b/drivers/bluetooth/btintel_pcie.c
@@ -1008,6 +1008,13 @@ static void btintel_pcie_msix_tx_handle(struct btintel_pcie_data *data)
 
 	txq = &data->txq;
 
+	if (cr_tia >= txq->count || cr_hia >= txq->count) {
+		bt_dev_err(data->hdev,
+			   "TXQ: invalid ring indices tia=%u hia=%u",
+			   cr_tia, cr_hia);
+		return;
+	}
+
 	while (cr_tia != cr_hia) {
 		data->tx_wait_done = true;
 		wake_up(&data->tx_wait_q);
@@ -1403,6 +1410,12 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data)
 
 	rxq = &data->rxq;
 
+	if (cr_tia >= rxq->count || cr_hia >= rxq->count) {
+		bt_dev_err(hdev, "RXQ: invalid ring indices tia=%u hia=%u",
+			   cr_tia, cr_hia);
+		return;
+	}
+
 	/* The firmware sends multiple CD in a single MSI-X and it needs to
 	 * process all received CDs in this interrupt.
 	 */
-- 
2.50.1 (Apple Git-155)

RE: Bluetooth: btintel_pcie: validate completion ring indices

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 2833 bytes --]

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=1071502

---Test result---

Test Summary:
CheckPatch                    PENDING   0.44 seconds
GitLint                       PENDING   0.25 seconds
SubjectPrefix                 PASS      0.16 seconds
BuildKernel                   PASS      27.27 seconds
CheckAllWarning               PASS      29.92 seconds
CheckSparse                   PASS      28.32 seconds
BuildKernel32                 PASS      26.05 seconds
TestRunnerSetup               PASS      579.91 seconds
TestRunner_l2cap-tester       PASS      28.33 seconds
TestRunner_iso-tester         FAIL      33.32 seconds
TestRunner_bnep-tester        PASS      6.54 seconds
TestRunner_mgmt-tester        FAIL      117.04 seconds
TestRunner_rfcomm-tester      PASS      9.65 seconds
TestRunner_sco-tester         FAIL      14.71 seconds
TestRunner_ioctl-tester       PASS      10.49 seconds
TestRunner_mesh-tester        FAIL      12.61 seconds
TestRunner_smp-tester         PASS      8.83 seconds
TestRunner_userchan-tester    PASS      6.91 seconds
IncrementalBuild              PENDING   0.81 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: TestRunner_iso-tester - FAIL
Desc: Run iso-tester with test-runner
Output:
BUG: KASAN: slab-use-after-free in le_read_features_complete+0x7e/0x2b0
Total: 141, Passed: 141 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 494, Passed: 489 (99.0%), Failed: 1, Not Run: 4

Failed Test Cases
Read Exp Feature - Success                           Failed       0.113 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
BUG: sleeping function called from invalid context at net/core/sock.c:3782
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner
Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0

Failed Test Cases
Mesh - Send cancel - 1                               Timed out    2.733 seconds
Mesh - Send cancel - 2                               Timed out    1.994 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth

Re: [PATCH] Bluetooth: btintel_pcie: validate completion ring indices

[Luiz Augusto von Dentz]

Hi @Kiran K

On Tue, Mar 24, 2026 at 4:51 AM Pengpeng Hou <pengpeng@iscas.ac.cn> wrote:
>
> The MSI-X RX and TX completion handlers trust the shared ring indices
> read from data->ia.cr_tia[] and data->ia.cr_hia[] before using cr_tia as
> an index into the fixed urbd ring arrays. If the device reports a stale
> or malformed completion index, the driver can step past rxq->urbd1s[] or
> txq->urbd0s[] before it gets a chance to recover.
>
> Validate both completion ring indices against the queue depth before
> walking the descriptor arrays.
>
> Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
> ---
>  drivers/bluetooth/btintel_pcie.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
> index 37b744e35bc4..06c2b81f2b6e 100644
> --- a/drivers/bluetooth/btintel_pcie.c
> +++ b/drivers/bluetooth/btintel_pcie.c
> @@ -1008,6 +1008,13 @@ static void btintel_pcie_msix_tx_handle(struct btintel_pcie_data *data)
>
>         txq = &data->txq;
>
> +       if (cr_tia >= txq->count || cr_hia >= txq->count) {
> +               bt_dev_err(data->hdev,
> +                          "TXQ: invalid ring indices tia=%u hia=%u",
> +                          cr_tia, cr_hia);
> +               return;
> +       }
> +
>         while (cr_tia != cr_hia) {
>                 data->tx_wait_done = true;
>                 wake_up(&data->tx_wait_q);
> @@ -1403,6 +1410,12 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data)
>
>         rxq = &data->rxq;
>
> +       if (cr_tia >= rxq->count || cr_hia >= rxq->count) {
> +               bt_dev_err(hdev, "RXQ: invalid ring indices tia=%u hia=%u",
> +                          cr_tia, cr_hia);
> +               return;
> +       }
> +
>         /* The firmware sends multiple CD in a single MSI-X and it needs to
>          * process all received CDs in this interrupt.
>          */
> --
> 2.50.1 (Apple Git-155)

Can you review these changes?

-- 
Luiz Augusto von Dentz

RE: [PATCH] Bluetooth: btintel_pcie: validate completion ring indices

[K, Kiran]

Hi Luiz, Pengpeng,

>Subject: Re: [PATCH] Bluetooth: btintel_pcie: validate completion ring indices
>
>Hi @Kiran K
>
>On Tue, Mar 24, 2026 at 4:51 AM Pengpeng Hou <pengpeng@iscas.ac.cn>
>wrote:
>>
>> The MSI-X RX and TX completion handlers trust the shared ring indices
>> read from data->ia.cr_tia[] and data->ia.cr_hia[] before using cr_tia
>> as an index into the fixed urbd ring arrays. If the device reports a
>> stale or malformed completion index, the driver can step past
>> rxq->urbd1s[] or
>> txq->urbd0s[] before it gets a chance to recover.
>>
>> Validate both completion ring indices against the queue depth before
>> walking the descriptor arrays.
>>
>> Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
>> ---
>>  drivers/bluetooth/btintel_pcie.c | 13 +++++++++++++
>>  1 file changed, 13 insertions(+)
>>
>> diff --git a/drivers/bluetooth/btintel_pcie.c
>> b/drivers/bluetooth/btintel_pcie.c
>> index 37b744e35bc4..06c2b81f2b6e 100644
>> --- a/drivers/bluetooth/btintel_pcie.c
>> +++ b/drivers/bluetooth/btintel_pcie.c
>> @@ -1008,6 +1008,13 @@ static void btintel_pcie_msix_tx_handle(struct
>> btintel_pcie_data *data)
>>
>>         txq = &data->txq;
>>
>> +       if (cr_tia >= txq->count || cr_hia >= txq->count) {
>> +               bt_dev_err(data->hdev,
>> +                          "TXQ: invalid ring indices tia=%u hia=%u",
>> +                          cr_tia, cr_hia);
>> +               return;
>> +       }
>> +
>>         while (cr_tia != cr_hia) {
>>                 data->tx_wait_done = true;
>>                 wake_up(&data->tx_wait_q); @@ -1403,6 +1410,12 @@
>> static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data
>> *data)
>>
>>         rxq = &data->rxq;
>>
>> +       if (cr_tia >= rxq->count || cr_hia >= rxq->count) {
>> +               bt_dev_err(hdev, "RXQ: invalid ring indices tia=%u hia=%u",
>> +                          cr_tia, cr_hia);
>> +               return;
>> +       }
>> +
>>         /* The firmware sends multiple CD in a single MSI-X and it needs to
>>          * process all received CDs in this interrupt.
>>          */
>> --
>> 2.50.1 (Apple Git-155)
>
>Can you review these changes?
>
Looks good to me.

Tested-by: Kiran K <kiran.k@intel.com>
 
Thanks,
Kiran