diff --git a/src/agent/libclusterfuzz/data/parsed-traces/rust_assert.json b/src/agent/libclusterfuzz/data/parsed-traces/rust_assert.json index a67e8c81ed..e3e790c875 100644 --- a/src/agent/libclusterfuzz/data/parsed-traces/rust_assert.json +++ b/src/agent/libclusterfuzz/data/parsed-traces/rust_assert.json @@ -243,15 +243,6 @@ "source_file_path": "libra/json-rpc/src/fuzzing.rs", "source_file_line": 45 }, - { - "line": "#9 0x5586679065f3 in rust_fuzzer_test_input libra/testsuite/libra-fuzzer/fuzz/google-oss-fuzz/fuzzer_builder.rs:14:4", - "address": 94035751495155, - "function_name": "rust_fuzzer_test_input", - "function_offset": 4, - "source_file_name": "fuzzer_builder.rs", - "source_file_path": "libra/testsuite/libra-fuzzer/fuzz/google-oss-fuzz/fuzzer_builder.rs", - "source_file_line": 14 - }, { "line": "#10 0x55866cbe9e86 in __rust_maybe_catch_panic /rustc/b8cedc00407a4c56a3bda1ed605c6fc166655447/src/libpanic_unwind/lib.rs:86:7", "address": 94035838410374, @@ -274,14 +265,12 @@ "minimized_stack": [ "#7 0x55866847004f in libra_config::utils::get_available_port::h7d7baacfb554bae8 libra/config/src/utils.rs:27:4", "#8 0x558668cd1fbd in libra_json_rpc::fuzzing::fuzzer::hde487212e06dd4fd libra/json-rpc/src/fuzzing.rs:45:15", - "#9 0x5586679065f3 in rust_fuzzer_test_input libra/testsuite/libra-fuzzer/fuzz/google-oss-fuzz/fuzzer_builder.rs:14:4", "#10 0x55866cbe9e86 in __rust_maybe_catch_panic /rustc/b8cedc00407a4c56a3bda1ed605c6fc166655447/src/libpanic_unwind/lib.rs:86:7", "#13 0x558668255b41 in LLVMFuzzerTestOneInput /rust/registry/src/github.com-1ecc6299db9ec823/libfuzzer-sys-0.3.2/src/lib.rs:25:21" ], "minimized_stack_function_names": [ "libra_config::utils::get_available_port::h7d7baacfb554bae8", "libra_json_rpc::fuzzing::fuzzer::hde487212e06dd4fd", - "rust_fuzzer_test_input", "__rust_maybe_catch_panic", "lib.rs" ] diff --git a/src/agent/libclusterfuzz/data/parsed-traces/rust_oom.json b/src/agent/libclusterfuzz/data/parsed-traces/rust_oom.json index bd09520173..4085bef2ca 100644 --- a/src/agent/libclusterfuzz/data/parsed-traces/rust_oom.json +++ b/src/agent/libclusterfuzz/data/parsed-traces/rust_oom.json @@ -410,15 +410,6 @@ "source_file_path": "mp4parse-rust/mp4parse_capi/src/lib.rs", "source_file_line": 451 }, - { - "line": "#19 0x55fcb921f598 in rust_fuzzer_test_input mp4parse-rust/mp4parse_capi/fuzz/fuzz_targets/avif.rs:28:12", - "address": 94543926130072, - "function_name": "rust_fuzzer_test_input", - "function_offset": 12, - "source_file_name": "avif.rs", - "source_file_path": "mp4parse-rust/mp4parse_capi/fuzz/fuzz_targets/avif.rs", - "source_file_line": 28 - }, { "line": "#23 0x55fcb941e0df in LLVMFuzzerTestOneInput /rust/registry/src/github.com-1ecc6299db9ec823/libfuzzer-sys-0.3.2/src/lib.rs:25:22", "address": 94543928221919, @@ -439,7 +430,6 @@ "#16 0x55fcb9396625 in mp4parse_capi::mp4parse_new_common_safe::h0ca2c54532ffc785 mp4parse-rust/mp4parse_capi/src/lib.rs:482:5", "#17 0x55fcb9395c07 in mp4parse_capi::mp4parse_new_common::h5bcbdbc95c2c6730 mp4parse-rust/mp4parse_capi/src/lib.rs:467:15", "#18 0x55fcb9395c07 in mp4parse_avif_new mp4parse-rust/mp4parse_capi/src/lib.rs:451:5", - "#19 0x55fcb921f598 in rust_fuzzer_test_input mp4parse-rust/mp4parse_capi/fuzz/fuzz_targets/avif.rs:28:12", "#23 0x55fcb941e0df in LLVMFuzzerTestOneInput /rust/registry/src/github.com-1ecc6299db9ec823/libfuzzer-sys-0.3.2/src/lib.rs:25:22" ], "minimized_stack_function_names": [ @@ -452,7 +442,6 @@ "mp4parse_capi::mp4parse_new_common_safe::h0ca2c54532ffc785", "mp4parse_capi::mp4parse_new_common::h5bcbdbc95c2c6730", "mp4parse_avif_new", - "rust_fuzzer_test_input", "lib.rs" ] } diff --git a/src/agent/libclusterfuzz/src/generated.rs b/src/agent/libclusterfuzz/src/generated.rs index a213d6d15d..5385e69396 100644 --- a/src/agent/libclusterfuzz/src/generated.rs +++ b/src/agent/libclusterfuzz/src/generated.rs @@ -125,6 +125,7 @@ pub const STACK_FRAME_IGNORE_REGEXES: &[&str] = &[ r"^print_trailer", r"^realloc", r"^rust_begin_unwind", + r"^rust_fuzzer_test_input", r"^rust_oom", r"^scanf", r"^show_stack", @@ -172,6 +173,7 @@ pub const STACK_FRAME_IGNORE_REGEXES: &[&str] = &[ r".*stdext::exception::what", r".*v8::base::OS::Abort", r".* base/callback", + r".* /rust(|c)/", r".*/AOSP\-toolchain/", r".*/bindings/ToV8\.h", r".*/crosstool/", @@ -203,6 +205,7 @@ pub const STACK_FRAME_IGNORE_REGEXES: &[&str] = &[ r"^syslog::LogMessage", r"^print_address_description", r"^_etext", + r"^_swift_stdlib_", r".*libc\.so", r".*libc\+\+\.so", r".*libc\+\+_shared\.so",