tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: hci_core: Fix not checking skb length on hci_acldata_packet

Browse Source 
[ Upstream commit 3fe288a8214e7dd784d1f9b7c9e448244d316b47 ]

This fixes not checking if skb really contains an ACL header otherwise
the code may attempt to access some uninitilized/invalid memory past the
valid skb->data.

Reported-by: syzbot+6ea290ba76d8c1eb1ac2@syzkaller.appspotmail.com
Tested-by: syzbot+6ea290ba76d8c1eb1ac2@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=6ea290ba76d8c1eb1ac2
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Luiz Augusto von Dentz
2024-10-08 10:16:48 -04:00
committed by Greg Kroah-Hartman
parent c55a4c5a04
commit 93a6160dc1
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/bluetooth/hci_core.c
+9 -4
View File
@@ -3771,18 +3771,22 @@ static void hci_tx_work(struct work_struct *work)
/* ACL data packet */ /* ACL data packet */
static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
{ {
struct hci_acl_hdr *hdr = (void *) skb->data; struct hci_acl_hdr *hdr;
struct hci_conn *conn; struct hci_conn *conn;
__u16 handle, flags; __u16 handle, flags;
skb_pull(skb, HCI_ACL_HDR_SIZE); hdr = skb_pull_data(skb, sizeof(*hdr));
if (!hdr) {
bt_dev_err(hdev, "ACL packet too small");
goto drop;
}
handle = __le16_to_cpu(hdr->handle); handle = __le16_to_cpu(hdr->handle);
flags = hci_flags(handle); flags = hci_flags(handle);
handle = hci_handle(handle); handle = hci_handle(handle);
BT_DBG("%s len %d handle 0x%4.4x flags 0x%4.4x", hdev->name, skb->len, bt_dev_dbg(hdev, "len %d handle 0x%4.4x flags 0x%4.4x", skb->len,
handle, flags); handle, flags);
hdev->stat.acl_rx++; hdev->stat.acl_rx++;
@@ -3801,6 +3805,7 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
handle); handle);
} }
drop:
kfree_skb(skb); kfree_skb(skb);
} }