Changeset c69aecb

Timestamp:

09/30/14 15:17:06 (7 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

3c54095

Parents:

525d09d

Message:

Handle incomplete file reads in libtrace formats

Some file read function calls assumed that the full amount that was
asked for will be read from the file, which is not necessarily true
especially if the file was truncated.

Location:

lib

Files:

• format_erf.c (modified) (3 diffs)
• format_pcapfile.c (modified) (5 diffs)
• format_tsh.c (modified) (1 diff)

lib/format_erf.c

@@ -480 +480 @@
                                         packet->buffer,
                                         (size_t)dag_record_size)) == -1) {
-                trace_set_err(libtrace,errno,"read(%s)",
-                                libtrace->uridata);
+                trace_set_err(libtrace,errno,"reading ERF file");
                 return -1;
         }
@@ -488 +487 @@
                 return 0;
         }
+
+        if (numbytes < (int)dag_record_size) {
+                trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Incomplete ERF header");
+                return -1;
+        }
 
         rlen = ntohs(((dag_record_t *)packet->buffer)->rlen);
@@ -522 +526 @@
                 return -1;
         }
+
+        if (numbytes < (int)size) {
+                trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Incomplete ERF record");
+                return -1;
+        }
         
         if (erf_prepare_packet(libtrace, packet, packet->buffer, 

lib/format_pcapfile.c

@@ -210 +210 @@
                 
                 if (err<1) {
-                        if (err == 0) {
-                                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED,
-                                                "Reading pcap file header\n");
-                        }
+                        trace_set_err(libtrace, TRACE_ERR_INIT_FAILED,
+                                "Error while reading pcap file header\n");
                         return -1;
                 }
-                
+        
+                if (err != (int)sizeof(DATA(libtrace)->header)) {
+                        trace_set_err(libtrace, TRACE_ERR_INIT_FAILED,
+                                "Incomplete pcap file header");
+                        return -1;
+                }
+                
                 if (!header_is_magic(&(DATA(libtrace)->header))) {
                         trace_set_err(libtrace,TRACE_ERR_INIT_FAILED,
@@ -359 +363 @@
                         packet->buffer,
                         sizeof(libtrace_pcapfile_pkt_hdr_t));
-
         if (err<0) {
                 trace_set_err(libtrace,errno,"reading packet");
@@ -368 +371 @@
                 return 0;
         }
+
+        if (err < (int)sizeof(libtrace_pcapfile_pkt_hdr_t)) {
+                trace_set_err(libtrace, errno, "Incomplete pcap packet header");
+                return -1;
+        }
 
         bytes_to_read = swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen);
@@ -391 +399 @@
                         );
 
-        
         if (err<0) {
                 trace_set_err(libtrace,errno,"reading packet");
@@ -399 +406 @@
                 return 0;
         }
+
+        if (err < (int)bytes_to_read) {
+                trace_set_err(libtrace, errno, "Incomplete pcap packet body");
+                return -1;
+        }
 
         if (pcapfile_prepare_packet(libtrace, packet, packet->buffer,

lib/format_tsh.c

@@ -147 +147 @@
                 return 0;
         }
+
+        if (numbytes < (int)sizeof(tsh_pkt_header_t)) {
+                trace_set_err(libtrace, errno, "Incomplete TSH header");
+                return -1;
+        }
 
         buffer2 = (char*)buffer2 + numbytes;