Bluetooth: guard against controllers sending zero'd events
[ Upstream commit 08bb4da901
]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a941594034
commit
202e2ff9de
|
@ -5853,6 +5853,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);
|
||||||
|
@ -6064,6 +6069,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++;
|
||||||
|
|
Loading…
Reference in New Issue