From: Francois-Xavier Le Bail Date: Wed, 23 Oct 2019 19:24:35 +0000 (+0200) Subject: OSPFv3: Add a test capture file X-Git-Tag: tcpdump-4.99-bp~635 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/1c9a91b5fec26683536bb12ec8ecfd0cb50dd689 OSPFv3: 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 a bounds check previously added, the problem no longer exists. Thus no fix needed. The pcap file was updated to avoid pcap_loop() error messages. It was rename from pcapng to pcap because it is. Update the output of the test accordingly. Partial update from e01c9bf76740802025c9328901b55ee4a0c49ed6 in 4.9 branch. --- diff --git a/tests/TESTLIST b/tests/TESTLIST index df4b61bb..b86e5b30 100644 --- a/tests/TESTLIST +++ b/tests/TESTLIST @@ -648,6 +648,9 @@ icmp6_nodeinfo_oobr icmp6_nodeinfo_oobr.pcap icmp6_nodeinfo_oobr.out # bad packets from Henri Salo rx_ubik-oobr rx_ubik-oobr.pcap rx_ubik-oobr.out -c1 +# bad packets from Junjie Wang +ospf6_print_lshdr-oobr ospf6_print_lshdr-oobr.pcap ospf6_print_lshdr-oobr.out -vv + # RTP tests # fuzzed pcap rtp-seg-fault-1 rtp-seg-fault-1.pcapng rtp-seg-fault-1.out -v -T rtp diff --git a/tests/ospf6_print_lshdr-oobr.out b/tests/ospf6_print_lshdr-oobr.out new file mode 100644 index 00000000..e5bd0e36 --- /dev/null +++ b/tests/ospf6_print_lshdr-oobr.out @@ -0,0 +1,59 @@ + 1 12:43:11.663317 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 36) fe80::1 > ff02::5: OSPFv3, Hello, length 36 + Router-ID 1.1.1.1, Area 0.0.0.1 + Options [V6, External, Router] + Hello Timer 10s, Dead Timer 40s, Interface-ID 0.0.0.5, Priority 1 + Neighbor List: + 2 12:43:21.639415 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 36) fe80::1 > ff02::5: OSPFv3, Hello, length 36 + Router-ID 1.1.1.1, Area 0.0.0.1 + Options [V6, External, Router] + Hello Timer 10s, Dead Timer 40s, Interface-ID 0.0.0.5, Priority 1 + Neighbor List: + 3 12:43:31.662021 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 36) fe80::1 > ff02::5: OSPFv3, Hello, length 36 + Router-ID 1.1.1.1, Area 0.0.0.1 + Options [V6, External, Router] + Hello Timer 10s, Dead Timer 40s, Interface-ID 0.0.0.5, Priority 1 + Neighbor List: + 4 12:43:41.1756221 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 36) fe80::1 > ff02::5: OSPFv3, Hello, length 36 + Router-ID 1.1.1.1, Area 0.0.0.1 + Options [V6, External, Router] + Hello Timer 10s, Dead Timer 40s, Interface-ID 0.0.0.5, Priority 1 + Neighbor List: + 5 12:43:46.469862 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 36) fe80::2 > ff02::5: OSPFv3, Hello, length 36 + Router-ID 2.2.2.2, Area 0.0.0.1 + Options [V6, External, Router] + Hello Timer 10s, Dead Timer 40s, Interface-ID 0.0.0.5, Priority 1 + Neighbor List: + 6 12:43:51.641566 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 40) fe80::1 > ff02::5: OSPFv3, Hello, length 40 + Router-ID 1.1.1.1, Area 0.0.0.1 + Options [V6, External, Router] + Hello Timer 10s, Dead Timer 40s, Interface-ID 0.0.0.5, Priority 1 + Designated Router 1.1.1.1 + Neighbor List: [|ospf3] + 7 12:43:51.657571 IP6 (class 0xe0, flowlabel 0x00100, hlim 1, next-header OSPF (89) payload length: 28) fe80::2 > fe80::1: OSPFv3, Database Description, length 28 + Router-ID 2.2.2.2, Area 0.0.0.1 + Options [V6, External, Router], DD Flags [Init, More, Master], MTU 1500, DD-Sequence 0x00001d46 + 8 12:43:51.661568 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 28) fe80::1 > fe80::2: OSPFv3, Database Description, length 28 + Router-ID 1.1.1.1, Area 0.0.0.1 + Options [V6, External, Router], DD Flags [Init, More, Master], MTU 1500, DD-Sequence 0x0000242c + 9 12:43:51.665572 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 168) fe80::1 > fe80::2: OSPFv3, Database Description, length 168 + Router-ID 1.1.1.1, Area 0.0.0.1 + Options [V6, External, Router], DD Flags [More], MTU 1500, DD-Sequence 0x00001d46 [|ospf3] + 10 12:43:51.669564 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 148) fe80::2 > fe80::1: OSPFv3, Database Description, length 148 + Router-ID 2.2.2.2, Area 0.0.0.1 + Options [V6, External, Router], DD Flags [More, Master], MTU 1500, DD-Sequence 0x00001d47 [|ospf3] + 11 12:43:51.673558 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 28) fe80::1 > fe80::2: OSPFv3, Database Description, length 28 + Router-ID 1.1.1.1, Area 0.0.0.1 + Options [V6, External, Router], DD Flags [none], MTU 1500, DD-Sequence 0x00001d47 + 12 12:43:51.673584 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 100) fe80::2 > fe80::1: OSPFv3, LS-Request, length 100 + Router-ID 2.2.2.2, Area 0.0.0.1 + Advertising Router 1.1.1.1 + Router LSA (1), Area Local Scope, LSA-ID 0.0.0.0 [|ospf3] + 13 12:43:51.677560 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 88) fe80::1 > fe80::2: OSPFv3, LS-Request, length 88 + Router-ID 1.1.1.1, Area 0.0.0.1 + Advertising Router 2.2.2.2 + Router LSA (1), Area Local Scope, LSA-ID 0.0.0.0 [|ospf3] + 14 12:43:51.677587 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 28) fe80::2 > fe80::1: OSPFv3, Database Description, length 28 + Router-ID 2.2.2.2, Area 0.0.0.1 + Options [V6, External, Router], DD Flags [Master], MTU 1500, DD-Sequence 0x00001d48 + 15 12:43:51.681554 IP6 (class 0xe0, hlim 1, next-header OSPF (89) payload length: 288) fe80::1 > fe80:0:ff:ffff:f000::2: OSPFv3, LS-Update, length 288 + Router-ID 1.1.1.1, Area 0.0.0.1 [|ospf3] diff --git a/tests/ospf6_print_lshdr-oobr.pcap b/tests/ospf6_print_lshdr-oobr.pcap new file mode 100644 index 00000000..67fe02e7 Binary files /dev/null and b/tests/ospf6_print_lshdr-oobr.pcap differ