From f29e996df8ff47e9d24f169c56e7b256f8e89c60 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Tue, 22 Oct 2019 19:20:05 +0200 Subject: [PATCH] VRRP: Add a test capture file This capture file triggered a buffer over-read with the 4.9.2 release fixed in the 4.9.3 release. With the new GET_ macros, the problem no longer exists. Thus no fix needed. The pcap file was updated to pass the sanity checks and to avoid pcap_loop() error messages. Update the output of the test accordingly. Partial update from a152aebfd1114376ba266ed30416be596ef9d806 in 4.9 branch. --- tests/TESTLIST | 1 + tests/vrrp-vrrp_print-oobr-2.out | 20 ++++++++++++++++++++ tests/vrrp-vrrp_print-oobr-2.pcap | Bin 0 -> 724 bytes 3 files changed, 21 insertions(+) create mode 100644 tests/vrrp-vrrp_print-oobr-2.out create mode 100644 tests/vrrp-vrrp_print-oobr-2.pcap diff --git a/tests/TESTLIST b/tests/TESTLIST index 56123171..654cb4e1 100644 --- a/tests/TESTLIST +++ b/tests/TESTLIST @@ -610,6 +610,7 @@ icmp-icmp_print-oobr-1 icmp-icmp_print-oobr-1.pcap icmp-icmp_print-oobr-1.out -v icmp-icmp_print-oobr-2 icmp-icmp_print-oobr-2.pcap icmp-icmp_print-oobr-2.out -v rsvp-rsvp_obj_print-oobr rsvp-rsvp_obj_print-oobr.pcap rsvp-rsvp_obj_print-oobr.out -v vrrp-vrrp_print-oobr vrrp-vrrp_print-oobr.pcap vrrp-vrrp_print-oobr.out -v +vrrp-vrrp_print-oobr-2 vrrp-vrrp_print-oobr-2.pcap vrrp-vrrp_print-oobr-2.out -v bgp-bgp_capabilities_print-oobr-1 bgp-bgp_capabilities_print-oobr-1.pcap bgp-bgp_capabilities_print-oobr-1.out -v bgp-bgp_capabilities_print-oobr-2 bgp-bgp_capabilities_print-oobr-2.pcap bgp-bgp_capabilities_print-oobr-2.out -v # The .pcap file is truncated after the 1st packet. diff --git a/tests/vrrp-vrrp_print-oobr-2.out b/tests/vrrp-vrrp_print-oobr-2.out new file mode 100644 index 00000000..89f1c2e5 --- /dev/null +++ b/tests/vrrp-vrrp_print-oobr-2.out @@ -0,0 +1,20 @@ + 1 04:20:20.000534 IP (tos 0x2,ECT(0), ttl 35, id 48399, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 39, bad cksum 7f (->c1ae)!) + 0.3.2.148 > 54.0.0.16: VRRPv3, Advertisement, (ttl 35), vrid 255, prio 17, intvl 269cs, length 19, addrs(3): [|vrrp] + 2 07:06:53.912788 IP (tos 0x2,ECT(0), ttl 35, id 40207, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 39, bad cksum 7e (->e1b5)!) + 255.251.2.148 > 54.0.0.16: VRRPv3, Advertisement, (ttl 35), vrid 255, prio 17, intvl 2304cs, length 19, addrs(3): [|vrrp] + 3 07:06:53.912788 IP (tos 0x2,ECT(0), ttl 35, id 40207, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 39, bad cksum 597f (->e1ae)!) + 0.3.2.148 > 54.0.0.16: VRRPv3, Advertisement, (ttl 35), vrid 255, prio 17, intvl 256cs, length 19, addrs(3): [|vrrp] + 4 07:06:53.912788 IP (tos 0x2,ECT(0), ttl 35, id 40207, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 39, bad cksum 7f (->e154)!) + 0.3.2.148 > 54.90.0.16: VRRPv3, Advertisement, (ttl 35), vrid 255, prio 17, intvl 256cs, length 19, addrs(3): [|vrrp] + 5 07:06:53.912788 IP (tos 0x2,ECT(0), ttl 35, id 40207, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 39, bad cksum 7f (->e1ae)!) + 0.3.2.148 > 54.0.0.16: VRRPv3, Advertisement, (ttl 35), vrid 0, prio 4, intvl 2304cs, length 19, addrs: + 6 07:06:53.912788 IP (tos 0x2,ECT(0), ttl 35, id 48399, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 39, bad cksum 7f (->c1ae)!) + 0.3.2.148 > 54.0.0.16: VRRPv3, Advertisement, (ttl 35), vrid 255, prio 17, intvl 256cs, length 19, addrs(3): [|vrrp] + 7 07:06:53.912788 IP (tos 0x2,ECT(0), ttl 35, id 40207, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 39, bad cksum 7f (->e1ae)!) + 0.3.2.148 > 54.0.0.16: VRRPv3, Advertisement, (ttl 35), vrid 255, prio 17, intvl 256cs, length 19, addrs(3): [|vrrp] + 8 07:06:53.912788 IP (tos 0x2,ECT(0), ttl 34, id 40207, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 27, bad cksum 7f (->e260)!) + 0.3.2.148 > 54.90.0.16: VRRPv3, Advertisement, (ttl 34), vrid 255, prio 17, intvl 256cs, length 7 [|vrrp] + 9 07:06:53.912788 IP (tos 0x2,ECT(0), ttl 35, id 40207, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 39, bad cksum 7f (->17af)!) + 0.3.2.148 > 0.0.0.16: VRRPv3, Advertisement, (ttl 35), vrid 0, prio 4, intvl 2304cs, length 19, addrs: + 10 07:06:53.912788 IP (tos 0x2,ECT(0), ttl 35, id 48399, offset 0, flags [+, DF, rsvd], proto VRRP (112), length 39, bad cksum 7f (->2e8a)!) + 242.242.242.242 > 242.242.242.242: VRRPv15, unknown type (2), (ttl 35) diff --git a/tests/vrrp-vrrp_print-oobr-2.pcap b/tests/vrrp-vrrp_print-oobr-2.pcap new file mode 100644 index 0000000000000000000000000000000000000000..1de39f09b3164600a32ca4df87c90b8208a94df3 GIT binary patch literal 724 zcmca|c+)~A1{MYw&;&9Vffy*lD8|IVU;JRoaxl0uF{tn5f54zz zz);V?%rph4O2F{HATuNHBCvV}2B21k|NnWnB{EKV%L_N-2AEq2nNkh)5!5XZQ=*_gBE}R3h6V