Bluetooth: btintel_pcie: validate device-supplied DMA indices
PATCH 1/1 Bluetooth: btintel_pcie: validate device-supplied DMA indices
In btintel_pcie_msix_rx_handle(), the driver processes RX completion descriptors (urbd1) written by the PCIe device into DMA-coherent memory. urbd1->frbd_tag (a 16-bit field fully controlled by the device firmware via DMA) is used directly as an array index into rxq->bufs[] without any bounds check. rxq->bufs[] has only BTINTEL_PCIE_RX_DESCS_COUNT (64) entries, while frbd_tag can be any value 0-65535. A malicious or malfunctioning device can write an out-of-range frbd_tag, causing the driver to dereference an out-of-bounds data_buf pointer.
Additionally, cr_hia is read from a DMA-shared index array also writable by the device; if the device sets cr_hia >= rxq->count, the while-loop never terminates because cr_tia is wrapped via modulo rxq->count and can never equal an out-of-range cr_hia.
Add bounds validation for cr_hia and frbd_tag in the RX path, and cr_hia in the TX path. Log invalid values with bt_dev_err before returning.
--- drivers/bluetooth/btintel_pcie.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/bluetooth/btintel_pcie.c +16 -0
@@ -2065,6 +2065,11 @@ static void btintel_pcie_msix_tx_handle(struct btintel_pcie_data *data) txq = &data->txq; +if (cr_hia >= txq->count) { +bt_dev_err (data->hdev,"TXQ: invalid cr_hia %u" , cr_hia); +return ; + } +while (cr_tia != cr_hia) { data->tx_wait_done = true;wake_up (&data->tx_wait_q);
@@ -2644,6 +2649,11 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data) rxq = &data->rxq; +if (cr_hia >= rxq->count) { +bt_dev_err (hdev,"RXQ: invalid cr_hia %u" , cr_hia); +return ; + } +/* The firmware sends multiple CD in a single MSI-X and it needs to * process all received CDs in this interrupt. */
@@ -2651,6 +2661,12 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data) urbd1 = &rxq->urbd1s[cr_tia];ipc_print_urbd1 (data->hdev, urbd1, cr_tia); +if (urbd1->frbd_tag >= rxq->count) { +bt_dev_err (hdev,"RXQ: invalid frbd_tag %u" , + urbd1->frbd_tag); +return ; + } + buf = &rxq->bufs[urbd1->frbd_tag];if (!buf) { bt_dev_err(hdev, "RXQ: failed to get the DMA buffer for %d",
Signature · 1 line
2.43.0
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/series/1165082/
---Test result---
Test Summary:
CheckPatch PASS 0.62 seconds VerifyFixes PASS 0.08 seconds VerifySignedoff PASS 0.08 seconds GitLint PASS 0.24 seconds SubjectPrefix PASS 0.07 seconds BuildKernel PASS 28.40 seconds CheckAllWarning PASS 33.55 seconds CheckSparse PASS 35.80 seconds BuildKernel32 PASS 29.12 seconds CheckKernelLLVM PASS 34.83 seconds TestRunnerSetup PASS 768.66 seconds IncrementalBuild PASS 26.84 seconds
https://github.com/bluez/bluetooth-next/pull/769
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 10 lines · On Tue, 15 Sep 2026 10:42:15 +0530 you wrote:
In
btintel_pcie_msix_rx_handle(), the driver processes RX completion descriptors (urbd1) written by the PCIe device into DMA-coherent memory.urbd1->frbd_tag(a 16-bit field fully controlled by the device firmware via DMA) is used directly as an array index into rxq->bufs[] without any bounds check. rxq->bufs[] has onlyBTINTEL_PCIE_RX_DESCS_COUNT(64) entries, whilefrbd_tagcan be any value 0-65535. A malicious or malfunctioning device can write an out-of-rangefrbd_tag, causing the driver to dereference an out-of-boundsdata_bufpointer.[...]
Here is the summary with links:
- [v1] Bluetooth: btintel_pcie: validate device-supplied DMA indices
https://git.kernel.org/bluetooth/bluetooth-next/c/37a111293453
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html