Skip to content

Commit

Permalink
Bluetooth: Correct packet len calculation
Browse files Browse the repository at this point in the history
Remove unneeded skb_pull and correct packet length calculation
removing magic number. Move BT_DBG after len check otherwise
it could possibly access wrong memory.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
  • Loading branch information
Andrei Emeltchenko authored and Gustavo F. Padovan committed Jan 3, 2012
1 parent 3542b85 commit c5993de
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions net/bluetooth/hci_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -2271,20 +2271,19 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
struct hci_ev_num_comp_pkts *ev = (void *) skb->data;
int i;

skb_pull(skb, sizeof(*ev));

BT_DBG("%s num_hndl %d", hdev->name, ev->num_hndl);

if (hdev->flow_ctl_mode != HCI_FLOW_CTL_MODE_PACKET_BASED) {
BT_ERR("Wrong event for mode %d", hdev->flow_ctl_mode);
return;
}

if (skb->len < ev->num_hndl * 4) {
if (skb->len < sizeof(*ev) || skb->len < sizeof(*ev) +
ev->num_hndl * sizeof(struct hci_comp_pkts_info)) {
BT_DBG("%s bad parameters", hdev->name);
return;
}

BT_DBG("%s num_hndl %d", hdev->name, ev->num_hndl);

for (i = 0; i < ev->num_hndl; i++) {
struct hci_comp_pkts_info *info = &ev->handles[i];
struct hci_conn *conn;
Expand Down

0 comments on commit c5993de

Please sign in to comment.