Changeset 1d4db58 for lib

Timestamp:

03/14/12 14:58:58 (10 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, 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:

f440dc0

Parents:

60f3c4c

Message:

• Fixed bug caused by less-than-careful checking of the amount of payload remaining in a packet when calculating the payload length

File:

• lib/protocols_transport.c (modified) (2 diffs)

lib/protocols_transport.c

@@ -116 +116 @@
                         break;
                 case TRACE_IPPROTO_UDP:
+                        if (rem < sizeof(libtrace_udp_t))
+                                return 0;
+                        if (len < sizeof(libtrace_udp_t))
+                                return 0;
                         len -= sizeof(libtrace_udp_t);
                         break;
                 case TRACE_IPPROTO_ICMP:
+                        if (rem < sizeof(libtrace_icmp_t))
+                                return 0;
+                        if (len < sizeof(libtrace_icmp_t))
+                                return 0;
                         len -= sizeof(libtrace_icmp_t);
                         break;
@@ -125 +133 @@
                         return 0;
         }
-
 
         ((libtrace_packet_t *)packet)->payload_length = len;