From: "Cho, Yu-Chen" <acho@suse.com>
To: linux-bluetooth@vger.kernel.org
Cc: acho@suse.com
Subject: [PATCH BlueZ] tool/hcidump: Fix memory leak with malformed packet
Date: Sat, 31 Mar 2018 14:55:49 +0800 [thread overview]
Message-ID: <20180331065549.5907-1-acho@suse.com> (raw)
Do not allow to read more then buffer size.
---
tools/hcidump.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tools/hcidump.c b/tools/hcidump.c
index af8f5925a..9044cdd02 100644
--- a/tools/hcidump.c
+++ b/tools/hcidump.c
@@ -89,6 +89,8 @@ struct btsnoop_pkt {
} __attribute__ ((packed));
#define BTSNOOP_PKT_SIZE (sizeof(struct btsnoop_pkt))
+#define BTSNOOP_MAX_PACKET_SIZE (1486 + 4)
+
static uint8_t btsnoop_id[] = { 0x62, 0x74, 0x73, 0x6e, 0x6f, 0x6f, 0x70, 0x00 };
static uint32_t btsnoop_version = 0;
@@ -328,6 +330,9 @@ static void read_dump(int fd)
}
frm.data_len = be32toh(ph.len) - 8;
+ if (frm.data_len > BTSNOOP_MAX_PACKET_SIZE)
+ goto failed;
+
err = read_n(fd, frm.data + 1, frm.data_len - 1);
} else if (parser.flags & DUMP_BTSNOOP) {
uint32_t opcode;
@@ -394,6 +399,9 @@ static void read_dump(int fd)
}
} else {
frm.data_len = btohs(dh.len);
+ if (frm.data_len > HCI_MAX_FRAME_SIZE)
+ goto failed;
+
err = read_n(fd, frm.data, frm.data_len);
}
--
2.16.2
next reply other threads:[~2018-03-31 6:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-31 6:55 Cho, Yu-Chen [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-24 9:53 [PATCH BlueZ] tool/hcidump: Fix memory leak with malformed packet Cho, Yu-Chen
2019-04-24 9:16 Cho, Yu-Chen
2018-03-16 10:43 Cho, Yu-Chen
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=20180331065549.5907-1-acho@suse.com \
--to=acho@suse.com \
--cc=linux-bluetooth@vger.kernel.org \
/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).