[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251024162912.221224-2-rpthibeault@gmail.com>
Date: Fri, 24 Oct 2025 12:29:10 -0400
From: Raphael Pinsonneault-Thibeault <rpthibeault@...il.com>
To: marcel@...tmann.org,
johan.hedberg@...il.com,
luiz.dentz@...il.com
Cc: Raphael Pinsonneault-Thibeault <rpthibeault@...il.com>,
linux-bluetooth@...r.kernel.org,
linux-kernel@...r.kernel.org,
syzbot+a9a4bedfca6aa9d7fa24@...kaller.appspotmail.com,
linux-kernel-mentees@...ts.linux.dev,
skhan@...uxfoundation.org,
david.hunter.linux@...il.com,
khalid@...nel.org
Subject: [PATCH v2] Bluetooth: hci_event: validate skb length for unknown CC opcode
In hci_cmd_complete_evt(), if the command complete event has an unknown
opcode, we assume the first byte of the remaining skb->data contains the
return status. However, parameter data has previously been pulled in
hci_event_func(), which may leave the skb empty. If so, using skb->data[0]
for the return status uses un-init memory.
The fix is to check skb->len before using skb->data.
Reported-by: syzbot+a9a4bedfca6aa9d7fa24@...kaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=a9a4bedfca6aa9d7fa24
Tested-by: syzbot+a9a4bedfca6aa9d7fa24@...kaller.appspotmail.com
Fixes: afcb3369f46ed ("Bluetooth: hci_event: Fix vendor (unknown) opcode status handling")
Signed-off-by: Raphael Pinsonneault-Thibeault <rpthibeault@...il.com>
---
changes in v2:
- check skb->len before accessing skb->data in hci_cmd_complete_evt().
- remove v1’s changes
- update commit message and Fixes tag
Thank you for the response Luiz. I didn’t want to spam you or the ML
with another reply since you were very clear.
net/bluetooth/hci_event.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index d790b0d4eb9a..d2ac95a824db 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4211,6 +4211,13 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, void *data,
}
if (i == ARRAY_SIZE(hci_cc_table)) {
+ if (!skb->len) {
+ bt_dev_err(hdev, "Unexpected cc 0x%4.4x with no status",
+ *opcode);
+ *status = HCI_ERROR_UNSPECIFIED;
+ return;
+ }
+
/* Unknown opcode, assume byte 0 contains the status, so
* that e.g. __hci_cmd_sync() properly returns errors
* for vendor specific commands send by HCI drivers.
--
2.43.0
Powered by blists - more mailing lists