Changeset 7aa03d9 for lib

Timestamp:

01/15/19 09:53:33 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

cbd77bd

Parents:

e7132d6

Message:

Check for NULL packet buffer in get_meta_data(), Make sure not to read past the end of the packet in pcapng_get_meta_data()

Location:

lib

Files:

• format_erf.c (modified) (1 diff)
• format_pcapng.c (modified) (5 diffs)

lib/format_erf.c

@@ -923 +923 @@
         uint16_t curr_sec;
 
-        hdr = (dag_record_t *)packet->header;
+        if (packet->buffer == NULL) { return NULL; }
+
+        hdr = (dag_record_t *)packet->buffer;
         bodyptr = (char *)packet->payload;
+        /* 24 is size of the ERF header */
         remaining = ntohs(hdr->rlen) - 24;
 

lib/format_pcapng.c

@@ -2107 +2107 @@
         uint32_t blocktype;
         uint16_t optcode;
+        int remaining;
+
+        if (packet->buffer == NULL) { return NULL; }
 
         hdr = (struct pcapng_peeker *)packet->buffer;
@@ -2113 +2116 @@
         if (DATA(packet->trace)->byteswapped) {
                 blocktype = byteswap32(hdr->blocktype);
+                remaining = byteswap32(hdr->blocklen);
         } else {
                 blocktype = hdr->blocktype;
+                remaining = hdr->blocklen;
         }
 
@@ -2160 +2165 @@
         else { return NULL; }
 
+        /* update remaining to account for header and any payload */
+        remaining -= ptr - packet->buffer;
+
         /* Skip over the options till a match is found or they run out */
         struct pcapng_optheader *opthdr = ptr;
@@ -2167 +2175 @@
                 optcode = opthdr->optcode;
         }
-        while ((optcode != section) && (optcode != PCAPNG_OPTION_END)) {
+        while ((optcode != section) && (optcode != PCAPNG_OPTION_END) &&
+                (remaining > 0)) {
+
                 uint16_t len;
 
@@ -2190 +2200 @@
                         optcode = opthdr->optcode;
                 }
+
+                /* update remaining */
+                remaining -= (ptr-packet->buffer);
+
         }