Changeset 5460603 for lib

Timestamp:

01/14/19 17:30:49 (21 months ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

15f32cb

Parents:

6b7a958

Message:

Fix potential buffer overflow in pcapfile: reading code.

Fixes #97.

File:

• lib/format_pcapfile.c (modified) (1 diff)

lib/format_pcapfile.c

@@ -404 +404 @@
         bytes_to_read = swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen);
 
-        if (bytes_to_read >= LIBTRACE_PACKET_BUFSIZE) {
+        if (bytes_to_read >= (LIBTRACE_PACKET_BUFSIZE -
+                        sizeof(libtrace_pcapfile_pkt_hdr_t))) {
                 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Invalid caplen in pcap header (%u) - trace may be corrupt", (uint32_t)bytes_to_read);
                 return -1;