Handle very large -f files by rejecting them.

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 3caa0b24a262f48d3c052bbf0cea54cf2ff171bf..a39766767e40d7a054cae8f3d2c96789172ed317 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,13 +23,15 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

+/* \summary: Virtual Router Redundancy Protocol (VRRP) printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "addrtoname.h"
 
 #include "extract.h"
 #include "addrtoname.h"
 


@@ -140,17 +142,21 @@ vrrp_print(netdissect_options *ndo,
 
                        vec[0].ptr = bp;
                        vec[0].len = len;
 
                        vec[0].ptr = bp;
                        vec[0].len = len;

-                       if (in_cksum(vec, 1))
+                       if (in_cksum(vec, 1)) {
+                               ND_TCHECK_16BITS(&bp[6]);

                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",
                                        EXTRACT_16BITS(&bp[6])));
                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",
                                        EXTRACT_16BITS(&bp[6])));

+                       }

                }
 
                if (version == 3 && ND_TTEST2(bp[0], len)) {
                        uint16_t cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp,
                                len, len, IPPROTO_VRRP);
                }
 
                if (version == 3 && ND_TTEST2(bp[0], len)) {
                        uint16_t cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp,
                                len, len, IPPROTO_VRRP);

-                       if (cksum)
+                       if (cksum) {
+                               ND_TCHECK_16BITS(&bp[6]);

                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",
                                        EXTRACT_16BITS(&bp[6])));
                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",
                                        EXTRACT_16BITS(&bp[6])));

+                       }

                }
 
                ND_PRINT((ndo, ", addrs"));
                }
 
                ND_PRINT((ndo, ", addrs"));