OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: guard against controllers sending zero'd events 

Some controllers have been observed to send zero'd events under some
conditions.  This change guards against this condition as well as adding
a trace to facilitate diagnosability of this condition.

Signed-off-by: Alain Michaud <alainm@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alain Michaud 2020-03-03 15:55:34 +00:00 committed by Marcel Holtmann
parent 8a208b24d7
commit 08bb4da901
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bluetooth/hci_event.c
View File

@ -5868,6 +5868,11 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
u8 status = 0, event = hdr->evt, req_evt = 0; u8 status = 0, event = hdr->evt, req_evt = 0;
u16 opcode = HCI_OP_NOP; u16 opcode = HCI_OP_NOP;
if (!event) {
bt_dev_warn(hdev, "Received unexpected HCI Event 00000000");
goto done;
}
if (hdev->sent_cmd && bt_cb(hdev->sent_cmd)->hci.req_event == event) { if (hdev->sent_cmd && bt_cb(hdev->sent_cmd)->hci.req_event == event) {
struct hci_command_hdr *cmd_hdr = (void *) hdev->sent_cmd->data; struct hci_command_hdr *cmd_hdr = (void *) hdev->sent_cmd->data;
opcode = __le16_to_cpu(cmd_hdr->opcode); opcode = __le16_to_cpu(cmd_hdr->opcode);
@ -6079,6 +6084,7 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
req_complete_skb(hdev, status, opcode, orig_skb); req_complete_skb(hdev, status, opcode, orig_skb);
} }
done:
kfree_skb(orig_skb); kfree_skb(orig_skb);
kfree_skb(skb); kfree_skb(skb);
hdev->stat.evt_rx++; hdev->stat.evt_rx++;