From: Dan Carpenter <dan.carpenter@oracle.com>
To: Marcel Holtmann <marcel@holtmann.org>,
Jaganath Kanakkassery <jaganath.k.os@gmail.com>
Cc: Johan Hedberg <johan.hedberg@gmail.com>,
Tomas Bortoli <tomasbortoli@gmail.com>,
linux-bluetooth@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] Bluetooth: hci_event: potential out of bounds parsing ADV events
Date: Sat, 30 Mar 2019 10:25:11 +0300 [thread overview]
Message-ID: <20190330072511.GA5502@kadam> (raw)
There is a potential out of bounds if "ev->length" is too high or if the
number of reports are too many.
Fixes: c215e9397b00 ("Bluetooth: Process extended ADV report event")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Not tested. I suck at pointer math, and I don't know why the protocol
requires a "+ 1". Please review carefully.
net/bluetooth/hci_event.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 609fd6871c5a..ee945b3d12e1 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -5417,6 +5417,7 @@ static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)
{
u8 num_reports = skb->data[0];
void *ptr = &skb->data[1];
+ void *end = &skb->data[skb->len];
hci_dev_lock(hdev);
@@ -5425,6 +5426,8 @@ static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)
u8 legacy_evt_type;
u16 evt_type;
+ if (ptr + sizeof(*ev) + ev->length + 1 > end)
+ break;
evt_type = __le16_to_cpu(ev->evt_type);
legacy_evt_type = ext_evt_type_to_legacy(evt_type);
if (legacy_evt_type != LE_ADV_INVALID) {
--
2.17.1
next reply other threads:[~2019-03-30 7:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 7:25 Dan Carpenter [this message]
2019-03-30 9:20 ` [PATCH] Bluetooth: hci_event: potential out of bounds parsing ADV events Tomas Bortoli
2019-03-30 22:44 ` Tomas Bortoli
2019-04-01 6:32 ` Dan Carpenter
2019-04-01 17:24 ` Tomas Bortoli
2019-04-01 17:41 ` Dan Carpenter
2019-04-03 6:54 ` Jaganath K
2019-04-01 18:03 ` Cong Wang
2019-04-02 6:33 ` Dan Carpenter
2019-04-02 17:42 ` Cong Wang
2019-04-02 18:46 ` Tomas Bortoli
2019-04-02 19:55 ` Dan Carpenter
2019-04-03 22:55 ` Cong Wang
2019-04-04 8:06 ` Dan Carpenter
2019-04-05 17:16 ` Cong Wang
2019-04-05 20:48 ` Dan Carpenter
2019-04-05 21:05 ` Tomas Bortoli
2019-04-05 21:14 ` Dan Carpenter
[not found] ` <CAAHj5qj3PciY8ngqSGzH3=TQcm5vCghb0Z_0Y3DFQjTLMUM-9Q@mail.gmail.com>
2019-04-05 21:23 ` Dan Carpenter
2019-04-02 20:13 ` Dan Carpenter
2019-04-03 22:51 ` Cong Wang
2019-04-04 6:35 ` Dan Carpenter
2019-04-05 16:28 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190330072511.GA5502@kadam \
--to=dan.carpenter@oracle.com \
--cc=jaganath.k.os@gmail.com \
--cc=johan.hedberg@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=tomasbortoli@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).