OSDN Git Service

Bluetooth: guard against controllers sending zero'd events
authorAlain Michaud <alainm@chromium.org>
Tue, 3 Mar 2020 15:55:34 +0000 (15:55 +0000)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 4 Mar 2020 07:27:22 +0000 (08:27 +0100)
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>
net/bluetooth/hci_event.c

index 591e747..a40ed31 100644 (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;
        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) {
                struct hci_command_hdr *cmd_hdr = (void *) hdev->sent_cmd->data;
                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);
        }
 
+done:
        kfree_skb(orig_skb);
        kfree_skb(skb);
        hdev->stat.evt_rx++;