From: Guy Harris Date: Sat, 5 Mar 2022 00:01:01 +0000 (-0800) Subject: Clean a bunch of fuzzed files not to fuzz the container. X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/a02c2faeec982d233a32b6db4df20ce817dd1563 Clean a bunch of fuzzed files not to fuzz the container. For some reason pcap fuzzers just *love* to fuzz the "link-layer type plus other stuff" part of the pcap file header. That can produce a file that has non-zero values in reserved fields, which means it can get rejected well before being handed to anything for dissection. Clear out one of the reserved parts of that field, as we'll be changing libpcap to check for non-zero values and reporting an error. --- diff --git a/tests/aarp-heapoverflow-1.pcap b/tests/aarp-heapoverflow-1.pcap index be84f53f..2bfc7f33 100644 Binary files a/tests/aarp-heapoverflow-1.pcap and b/tests/aarp-heapoverflow-1.pcap differ diff --git a/tests/aarp-heapoverflow-2.pcap b/tests/aarp-heapoverflow-2.pcap index f0295211..19af6436 100644 Binary files a/tests/aarp-heapoverflow-2.pcap and b/tests/aarp-heapoverflow-2.pcap differ diff --git a/tests/atm-oam-heapoverflow.pcap b/tests/atm-oam-heapoverflow.pcap index a0691e08..e3a3d09d 100644 Binary files a/tests/atm-oam-heapoverflow.pcap and b/tests/atm-oam-heapoverflow.pcap differ diff --git a/tests/bad-ipv4-version-pgm-heapoverflow.pcap b/tests/bad-ipv4-version-pgm-heapoverflow.pcap index 116e401f..50666258 100644 Binary files a/tests/bad-ipv4-version-pgm-heapoverflow.pcap and b/tests/bad-ipv4-version-pgm-heapoverflow.pcap differ diff --git a/tests/beep-oobr.pcap b/tests/beep-oobr.pcap index a1db1433..743c652a 100644 Binary files a/tests/beep-oobr.pcap and b/tests/beep-oobr.pcap differ diff --git a/tests/bootp_asan.pcap b/tests/bootp_asan.pcap index 7c8a6ae1..4da878fd 100644 Binary files a/tests/bootp_asan.pcap and b/tests/bootp_asan.pcap differ diff --git a/tests/calm-fast-mac-lookup-heapoverflow.pcap b/tests/calm-fast-mac-lookup-heapoverflow.pcap index 15744a96..c64ca715 100644 Binary files a/tests/calm-fast-mac-lookup-heapoverflow.pcap and b/tests/calm-fast-mac-lookup-heapoverflow.pcap differ diff --git a/tests/cve2015-0261-crash.pcap b/tests/cve2015-0261-crash.pcap index 78ba8945..c721b376 100644 Binary files a/tests/cve2015-0261-crash.pcap and b/tests/cve2015-0261-crash.pcap differ diff --git a/tests/decnet-oobr.pcap b/tests/decnet-oobr.pcap index 0554b7ba..c51d11fd 100644 Binary files a/tests/decnet-oobr.pcap and b/tests/decnet-oobr.pcap differ diff --git a/tests/decnet-shorthdr-oobr.pcap b/tests/decnet-shorthdr-oobr.pcap index a4c01600..36a1b482 100644 Binary files a/tests/decnet-shorthdr-oobr.pcap and b/tests/decnet-shorthdr-oobr.pcap differ diff --git a/tests/frf15-heapoverflow.pcap b/tests/frf15-heapoverflow.pcap index d56ef1f3..31c1a36e 100644 Binary files a/tests/frf15-heapoverflow.pcap and b/tests/frf15-heapoverflow.pcap differ diff --git a/tests/geonet-mac-lookup-heapoverflow.pcap b/tests/geonet-mac-lookup-heapoverflow.pcap index 33794c50..b46f534f 100644 Binary files a/tests/geonet-mac-lookup-heapoverflow.pcap and b/tests/geonet-mac-lookup-heapoverflow.pcap differ diff --git a/tests/gre-heapoverflow-1.pcap b/tests/gre-heapoverflow-1.pcap index 103031f8..338c0cc2 100644 Binary files a/tests/gre-heapoverflow-1.pcap and b/tests/gre-heapoverflow-1.pcap differ diff --git a/tests/gre-heapoverflow-2.pcap b/tests/gre-heapoverflow-2.pcap index 3a204843..9138672f 100644 Binary files a/tests/gre-heapoverflow-2.pcap and b/tests/gre-heapoverflow-2.pcap differ diff --git a/tests/heap-overflow-1.pcap b/tests/heap-overflow-1.pcap index afcc2744..2bfbf575 100644 Binary files a/tests/heap-overflow-1.pcap and b/tests/heap-overflow-1.pcap differ diff --git a/tests/heap-overflow-2.pcap b/tests/heap-overflow-2.pcap index c7d0a002..935e4f0a 100644 Binary files a/tests/heap-overflow-2.pcap and b/tests/heap-overflow-2.pcap differ diff --git a/tests/heapoverflow-atalk_2.pcap b/tests/heapoverflow-atalk_2.pcap index bbd59331..b6477cbb 100644 Binary files a/tests/heapoverflow-atalk_2.pcap and b/tests/heapoverflow-atalk_2.pcap differ diff --git a/tests/heapoverflow-atalk_print.pcap b/tests/heapoverflow-atalk_print.pcap index aa5b4fae..4abc9f6a 100644 Binary files a/tests/heapoverflow-atalk_print.pcap and b/tests/heapoverflow-atalk_print.pcap differ diff --git a/tests/heapoverflow-ip_demux_print.pcap b/tests/heapoverflow-ip_demux_print.pcap index 9090f7fc..5bd2d3a0 100644 Binary files a/tests/heapoverflow-ip_demux_print.pcap and b/tests/heapoverflow-ip_demux_print.pcap differ diff --git a/tests/heapoverflow-ppp_hdlc_if_print.pcap b/tests/heapoverflow-ppp_hdlc_if_print.pcap index 7012ea8d..fab0ec61 100644 Binary files a/tests/heapoverflow-ppp_hdlc_if_print.pcap and b/tests/heapoverflow-ppp_hdlc_if_print.pcap differ diff --git a/tests/heapoverflow-q933_printq.pcap b/tests/heapoverflow-q933_printq.pcap index b3b3c312..6a05b3ab 100644 Binary files a/tests/heapoverflow-q933_printq.pcap and b/tests/heapoverflow-q933_printq.pcap differ diff --git a/tests/heapoverflow-sl_if_print.pcap b/tests/heapoverflow-sl_if_print.pcap index 926e08a7..02ee8615 100644 Binary files a/tests/heapoverflow-sl_if_print.pcap and b/tests/heapoverflow-sl_if_print.pcap differ diff --git a/tests/heapoverflow-tcp_print.pcap b/tests/heapoverflow-tcp_print.pcap index edceeaec..4e40b3f9 100644 Binary files a/tests/heapoverflow-tcp_print.pcap and b/tests/heapoverflow-tcp_print.pcap differ diff --git a/tests/hoobr_aodv_extension.pcap b/tests/hoobr_aodv_extension.pcap index 263949a8..4ca1c8d8 100644 Binary files a/tests/hoobr_aodv_extension.pcap and b/tests/hoobr_aodv_extension.pcap differ diff --git a/tests/hoobr_bfd_print.pcap b/tests/hoobr_bfd_print.pcap index 0f619863..55f02073 100644 Binary files a/tests/hoobr_bfd_print.pcap and b/tests/hoobr_bfd_print.pcap differ diff --git a/tests/hoobr_chdlc_print.pcap b/tests/hoobr_chdlc_print.pcap index 22ac1572..bcf40091 100644 Binary files a/tests/hoobr_chdlc_print.pcap and b/tests/hoobr_chdlc_print.pcap differ diff --git a/tests/hoobr_juniper.pcap b/tests/hoobr_juniper.pcap index 5e8fde4b..6c39f8fe 100644 Binary files a/tests/hoobr_juniper.pcap and b/tests/hoobr_juniper.pcap differ diff --git a/tests/hoobr_juniper2.pcap b/tests/hoobr_juniper2.pcap index c2e7bbcb..d81c7d89 100644 Binary files a/tests/hoobr_juniper2.pcap and b/tests/hoobr_juniper2.pcap differ diff --git a/tests/hoobr_juniper3.pcap b/tests/hoobr_juniper3.pcap index f686960f..21aeedb8 100644 Binary files a/tests/hoobr_juniper3.pcap and b/tests/hoobr_juniper3.pcap differ diff --git a/tests/hoobr_juniper4.pcap b/tests/hoobr_juniper4.pcap index dc409539..a5e28aeb 100644 Binary files a/tests/hoobr_juniper4.pcap and b/tests/hoobr_juniper4.pcap differ diff --git a/tests/hoobr_lookup_nsap.pcap b/tests/hoobr_lookup_nsap.pcap index 665c8ccc..f977692b 100644 Binary files a/tests/hoobr_lookup_nsap.pcap and b/tests/hoobr_lookup_nsap.pcap differ diff --git a/tests/hoobr_nfs_printfh.pcap b/tests/hoobr_nfs_printfh.pcap index 0a9e9f97..cac415b7 100644 Binary files a/tests/hoobr_nfs_printfh.pcap and b/tests/hoobr_nfs_printfh.pcap differ diff --git a/tests/hoobr_nfs_xid_map_enter.pcap b/tests/hoobr_nfs_xid_map_enter.pcap index d61c105a..43427af3 100644 Binary files a/tests/hoobr_nfs_xid_map_enter.pcap and b/tests/hoobr_nfs_xid_map_enter.pcap differ diff --git a/tests/hoobr_parse_field.pcap b/tests/hoobr_parse_field.pcap index 5a0c276c..7f8420cb 100644 Binary files a/tests/hoobr_parse_field.pcap and b/tests/hoobr_parse_field.pcap differ diff --git a/tests/hoobr_pimv1.pcap b/tests/hoobr_pimv1.pcap index 5aa3f38f..40ee420d 100644 Binary files a/tests/hoobr_pimv1.pcap and b/tests/hoobr_pimv1.pcap differ diff --git a/tests/hoobr_ripng_print.pcap b/tests/hoobr_ripng_print.pcap index d3723108..761964db 100644 Binary files a/tests/hoobr_ripng_print.pcap and b/tests/hoobr_ripng_print.pcap differ diff --git a/tests/hoobr_rt6_print.pcap b/tests/hoobr_rt6_print.pcap index 6f51a9fb..e06ab5f5 100644 Binary files a/tests/hoobr_rt6_print.pcap and b/tests/hoobr_rt6_print.pcap differ diff --git a/tests/hoobr_safeputs.pcap b/tests/hoobr_safeputs.pcap index 4948fc2d..3db96908 100644 Binary files a/tests/hoobr_safeputs.pcap and b/tests/hoobr_safeputs.pcap differ diff --git a/tests/ieee802.11_meshhdr-oobr.pcap b/tests/ieee802.11_meshhdr-oobr.pcap index 15df4fbe..dbd7932e 100644 Binary files a/tests/ieee802.11_meshhdr-oobr.pcap and b/tests/ieee802.11_meshhdr-oobr.pcap differ diff --git a/tests/ieee802.11_rates_oobr.pcap b/tests/ieee802.11_rates_oobr.pcap index 30a5698b..0c954218 100644 Binary files a/tests/ieee802.11_rates_oobr.pcap and b/tests/ieee802.11_rates_oobr.pcap differ diff --git a/tests/ieee802.11_tim_ie_oobr.pcap b/tests/ieee802.11_tim_ie_oobr.pcap index 2116a6bf..6be87b7d 100644 Binary files a/tests/ieee802.11_tim_ie_oobr.pcap and b/tests/ieee802.11_tim_ie_oobr.pcap differ diff --git a/tests/igrp-oobr.pcap b/tests/igrp-oobr.pcap index cd7662c0..dde9695c 100644 Binary files a/tests/igrp-oobr.pcap and b/tests/igrp-oobr.pcap differ diff --git a/tests/ipcomp-heapoverflow.pcap b/tests/ipcomp-heapoverflow.pcap index 506f1056..4209a45a 100644 Binary files a/tests/ipcomp-heapoverflow.pcap and b/tests/ipcomp-heapoverflow.pcap differ diff --git a/tests/ipv6-mobility-header-oobr.pcap b/tests/ipv6-mobility-header-oobr.pcap index 854fc57f..48d594e9 100644 Binary files a/tests/ipv6-mobility-header-oobr.pcap and b/tests/ipv6-mobility-header-oobr.pcap differ diff --git a/tests/ipv6-next-header-oobr-1.pcap b/tests/ipv6-next-header-oobr-1.pcap index eadccaf7..b1140fa2 100644 Binary files a/tests/ipv6-next-header-oobr-1.pcap and b/tests/ipv6-next-header-oobr-1.pcap differ diff --git a/tests/ipv6-next-header-oobr-2.pcap b/tests/ipv6-next-header-oobr-2.pcap index db1538e2..cc50bede 100644 Binary files a/tests/ipv6-next-header-oobr-2.pcap and b/tests/ipv6-next-header-oobr-2.pcap differ diff --git a/tests/ipv6-rthdr-oobr.pcap b/tests/ipv6-rthdr-oobr.pcap index b29d5190..6fd54e38 100644 Binary files a/tests/ipv6-rthdr-oobr.pcap and b/tests/ipv6-rthdr-oobr.pcap differ diff --git a/tests/ipv6hdr-heapoverflow.pcap b/tests/ipv6hdr-heapoverflow.pcap index 72808687..82609ff3 100644 Binary files a/tests/ipv6hdr-heapoverflow.pcap and b/tests/ipv6hdr-heapoverflow.pcap differ diff --git a/tests/isakmp-3948-oobr-2.pcap b/tests/isakmp-3948-oobr-2.pcap index 029159d0..bde587f7 100644 Binary files a/tests/isakmp-3948-oobr-2.pcap and b/tests/isakmp-3948-oobr-2.pcap differ diff --git a/tests/isakmp-rfc3948-oobr.pcap b/tests/isakmp-rfc3948-oobr.pcap index c3c1f72e..b2a29bb9 100644 Binary files a/tests/isakmp-rfc3948-oobr.pcap and b/tests/isakmp-rfc3948-oobr.pcap differ diff --git a/tests/isoclns-heapoverflow.pcap b/tests/isoclns-heapoverflow.pcap index bf90da65..66da8358 100644 Binary files a/tests/isoclns-heapoverflow.pcap and b/tests/isoclns-heapoverflow.pcap differ diff --git a/tests/isoclns-oobr.pcap b/tests/isoclns-oobr.pcap index 0a28b5f7..2221d87a 100644 Binary files a/tests/isoclns-oobr.pcap and b/tests/isoclns-oobr.pcap differ diff --git a/tests/juniper_atm1_oobr.pcap b/tests/juniper_atm1_oobr.pcap index bb4f6e06..28c7d3e0 100644 Binary files a/tests/juniper_atm1_oobr.pcap and b/tests/juniper_atm1_oobr.pcap differ diff --git a/tests/juniper_es_oobr.pcap b/tests/juniper_es_oobr.pcap index 8537f080..c09f7eb9 100644 Binary files a/tests/juniper_es_oobr.pcap and b/tests/juniper_es_oobr.pcap differ diff --git a/tests/kh-timed-001-oobr.pcap b/tests/kh-timed-001-oobr.pcap index cce27efa..65fa8163 100644 Binary files a/tests/kh-timed-001-oobr.pcap and b/tests/kh-timed-001-oobr.pcap differ diff --git a/tests/kh-timed-002-oobr.pcap b/tests/kh-timed-002-oobr.pcap index f38f0ece..6410842f 100644 Binary files a/tests/kh-timed-002-oobr.pcap and b/tests/kh-timed-002-oobr.pcap differ diff --git a/tests/kh-timed-004-oobr.pcap b/tests/kh-timed-004-oobr.pcap index 0a3326b5..727653ad 100644 Binary files a/tests/kh-timed-004-oobr.pcap and b/tests/kh-timed-004-oobr.pcap differ diff --git a/tests/l2tp-avp-overflow.pcap b/tests/l2tp-avp-overflow.pcap index 8732f3c4..e45f7e45 100644 Binary files a/tests/l2tp-avp-overflow.pcap and b/tests/l2tp-avp-overflow.pcap differ diff --git a/tests/llc-xid-heapoverflow.pcap b/tests/llc-xid-heapoverflow.pcap index ff32a2f1..05f3a378 100644 Binary files a/tests/llc-xid-heapoverflow.pcap and b/tests/llc-xid-heapoverflow.pcap differ diff --git a/tests/mlppp-oobr.pcap b/tests/mlppp-oobr.pcap index a215e502..6bbde164 100644 Binary files a/tests/mlppp-oobr.pcap and b/tests/mlppp-oobr.pcap differ diff --git a/tests/mpls-label-heapoverflow.pcap b/tests/mpls-label-heapoverflow.pcap index b73f80b4..f52b1e97 100644 Binary files a/tests/mpls-label-heapoverflow.pcap and b/tests/mpls-label-heapoverflow.pcap differ diff --git a/tests/nfs-attr-oobr.pcap b/tests/nfs-attr-oobr.pcap index 9769a0e0..a2e0b159 100644 Binary files a/tests/nfs-attr-oobr.pcap and b/tests/nfs-attr-oobr.pcap differ diff --git a/tests/oobr_parse_elements.pcap b/tests/oobr_parse_elements.pcap index 560317ed..bab53154 100644 Binary files a/tests/oobr_parse_elements.pcap and b/tests/oobr_parse_elements.pcap differ diff --git a/tests/otv-heapoverflow-1.pcap b/tests/otv-heapoverflow-1.pcap index 6e78e70d..301d786d 100644 Binary files a/tests/otv-heapoverflow-1.pcap and b/tests/otv-heapoverflow-1.pcap differ diff --git a/tests/otv-heapoverflow-2.pcap b/tests/otv-heapoverflow-2.pcap index 5bb3c4a7..4257ca51 100644 Binary files a/tests/otv-heapoverflow-2.pcap and b/tests/otv-heapoverflow-2.pcap differ diff --git a/tests/pktap-heap-overflow.pcap b/tests/pktap-heap-overflow.pcap index 3058b4ec..e5b475fe 100644 Binary files a/tests/pktap-heap-overflow.pcap and b/tests/pktap-heap-overflow.pcap differ diff --git a/tests/radiotap-heapoverflow.pcap b/tests/radiotap-heapoverflow.pcap index 31caddc6..398ce875 100644 Binary files a/tests/radiotap-heapoverflow.pcap and b/tests/radiotap-heapoverflow.pcap differ diff --git a/tests/snmp-heapoverflow-1.pcap b/tests/snmp-heapoverflow-1.pcap index cff25406..cf523131 100644 Binary files a/tests/snmp-heapoverflow-1.pcap and b/tests/snmp-heapoverflow-1.pcap differ diff --git a/tests/snmp-heapoverflow-2.pcap b/tests/snmp-heapoverflow-2.pcap index 11cba839..269819c5 100644 Binary files a/tests/snmp-heapoverflow-2.pcap and b/tests/snmp-heapoverflow-2.pcap differ diff --git a/tests/stp-heapoverflow-1.pcap b/tests/stp-heapoverflow-1.pcap index 3de3378c..bb466dee 100644 Binary files a/tests/stp-heapoverflow-1.pcap and b/tests/stp-heapoverflow-1.pcap differ diff --git a/tests/stp-heapoverflow-2.pcap b/tests/stp-heapoverflow-2.pcap index 0a92b00f..91678f1b 100644 Binary files a/tests/stp-heapoverflow-2.pcap and b/tests/stp-heapoverflow-2.pcap differ diff --git a/tests/stp-heapoverflow-3.pcap b/tests/stp-heapoverflow-3.pcap index a289b4b0..8865ef3c 100644 Binary files a/tests/stp-heapoverflow-3.pcap and b/tests/stp-heapoverflow-3.pcap differ diff --git a/tests/stp-heapoverflow-4.pcap b/tests/stp-heapoverflow-4.pcap index cd3b0fcc..298904a9 100644 Binary files a/tests/stp-heapoverflow-4.pcap and b/tests/stp-heapoverflow-4.pcap differ diff --git a/tests/tcp-auth-heapoverflow.pcap b/tests/tcp-auth-heapoverflow.pcap index 811548b2..16c774f1 100644 Binary files a/tests/tcp-auth-heapoverflow.pcap and b/tests/tcp-auth-heapoverflow.pcap differ diff --git a/tests/tcp_header_heapoverflow.pcap b/tests/tcp_header_heapoverflow.pcap index fdeed6c6..3ce913b9 100644 Binary files a/tests/tcp_header_heapoverflow.pcap and b/tests/tcp_header_heapoverflow.pcap differ diff --git a/tests/udp-length-heapoverflow.pcap b/tests/udp-length-heapoverflow.pcap index a8c55b65..7a6ad757 100644 Binary files a/tests/udp-length-heapoverflow.pcap and b/tests/udp-length-heapoverflow.pcap differ