mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-27 22:13:55 -04:00
Bluetooth: hci_bcsp: validate received packet lengths
The BCSP transmit path reads an HCI command header when an extension packet has only been tested for a nonzero length. Its LE configuration packet handler also indexes bytes through offset seven without a length check. Validate the complete command and LE configuration packet headers before accessing their fields. Signed-off-by: Li Qiang <liqiang01@kylinos.cn> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
committed by
Luiz Augusto von Dentz
parent
65be90af27
commit
ceea75ad89
@@ -194,7 +194,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (hciextn && chan == 5) {
|
||||
if (hciextn && chan == 5 && len > HCI_COMMAND_HDR_SIZE) {
|
||||
__le16 opcode = ((struct hci_command_hdr *)data)->opcode;
|
||||
|
||||
/* Vendor specific commands */
|
||||
@@ -402,6 +402,9 @@ static void bcsp_handle_le_pkt(struct hci_uart *hu)
|
||||
u8 sync_pkt[4] = { 0xda, 0xdc, 0xed, 0xed };
|
||||
|
||||
/* spot "conf" pkts and reply with a "conf rsp" pkt */
|
||||
if (bcsp->rx_skb->len < 8)
|
||||
return;
|
||||
|
||||
if (bcsp->rx_skb->data[1] >> 4 == 4 && bcsp->rx_skb->data[2] == 0 &&
|
||||
!memcmp(&bcsp->rx_skb->data[4], conf_pkt, 4)) {
|
||||
struct sk_buff *nskb = alloc_skb(4, GFP_ATOMIC);
|
||||
|
||||
Reference in New Issue
Block a user