tool/hcidump: Fix memory leak with malformed packet
PATCH 1/1 tool/hcidump: Fix memory leak with malformed packet
Do not allow to read more then buffer size.
--- tools/hcidump.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/hcidump.c +8 -0
@@ -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); }
Signature · 1 line
2.16.2