Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update submodules #607

Merged
merged 1 commit into from
Nov 11, 2024
Merged

Update submodules #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/bpf_conformance
Open in desktop
Submodule bpf_conformance updated 6 files
+3 −3 .github/workflows/Build.yml
+1 −1 .github/workflows/CICD.yml
+4 −4 .github/workflows/codeql-analysis.yml
+2 −2 .github/workflows/dependency-review.yml
+2 −2 .github/workflows/scorecards.yml
+1 −1 external/elfio
2 changes: 1 addition & 1 deletion external/ebpf-verifier
Open in desktop
Submodule ebpf-verifier updated 73 files
+43 −26 README.md
+0 −0 external/CLI11/CLI11.hpp
+1 −1 external/bpf_conformance
+1 −1 scripts/.check-license.ignore
+304 −0 scripts/format-code
+337 −0 scripts/format-code.ps1
+4 −0 scripts/pre-commit
+34 −28 src/asm_cfg.cpp
+12 −14 src/asm_files.cpp
+2 −2 src/asm_files.hpp
+2 −4 src/asm_marshal.cpp
+104 −87 src/asm_ostream.cpp
+4 −18 src/asm_ostream.hpp
+23 −3 src/asm_parse.cpp
+7 −2 src/asm_parse.hpp
+94 −16 src/asm_syntax.hpp
+1 −1 src/asm_unmarshal.cpp
+1 −1 src/asm_unmarshal.hpp
+69 −66 src/assertions.cpp
+0 −18 src/config.cpp
+29 −14 src/config.hpp
+1 −2 src/crab/add_bottom.hpp
+4 −4 src/crab/array_domain.cpp
+10 −10 src/crab/bitset_domain.cpp
+7 −7 src/crab/bitset_domain.hpp
+57 −47 src/crab/cfg.hpp
+90 −44 src/crab/ebpf_domain.cpp
+21 −17 src/crab/ebpf_domain.hpp
+23 −26 src/crab/fwd_analyzer.cpp
+1 −1 src/crab/fwd_analyzer.hpp
+30 −30 src/crab/split_dbm.cpp
+1 −1 src/crab/split_dbm.hpp
+11 −13 src/crab/thresholds.cpp
+3 −3 src/crab/thresholds.hpp
+9 −25 src/crab/type_domain.cpp
+3 −9 src/crab/type_domain.hpp
+1 −1 src/crab/wto.cpp
+15 −0 src/crab/wto.hpp
+4 −4 src/crab_utils/adapt_sgraph.hpp
+1 −1 src/crab_utils/debug.cpp
+1 −1 src/crab_utils/debug.hpp
+21 −21 src/crab_utils/graph_ops.hpp
+16 −17 src/crab_utils/stats.cpp
+1 −1 src/crab_utils/stats.hpp
+59 −84 src/crab_verifier.cpp
+9 −8 src/crab_verifier.hpp
+11 −0 src/ebpf_base.h
+2 −2 src/linux/gpl/spec_prototypes.cpp
+12 −11 src/linux/linux_platform.cpp
+15 −15 src/main/check.cpp
+1 −1 src/main/linux_verifier.cpp
+1 −1 src/main/run_yaml.cpp
+5 −3 src/main/utils.hpp
+9 −4 src/spec_type_descriptors.hpp
+4 −4 src/test/conformance_check.cpp
+68 −62 src/test/ebpf_yaml.cpp
+4 −4 src/test/ebpf_yaml.hpp
+5 −5 src/test/test_conformance.cpp
+14 −13 src/test/test_marshal.cpp
+1 −2 src/test/test_print.cpp
+79 −79 src/test/test_verify.cpp
+3 −3 src/test/test_wto.cpp
+8 −44 test-data/add.yaml
+18 −0 test-data/assign.yaml
+40 −0 test-data/atomic.yaml
+15 −3 test-data/call.yaml
+35 −0 test-data/calllocal.yaml
+10 −1 test-data/callx.yaml
+3 −0 test-data/jump.yaml
+65 −16 test-data/loop.yaml
+68 −0 test-data/pointer.yaml
+23 −0 test-data/stack.yaml
+12 −6 test-data/subtract.yaml
11 changes: 4 additions & 7 deletions libfuzzer/libfuzz_harness.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,24 +355,21 @@ try {
InstructionSeq& prog = std::get<InstructionSeq>(prog_or_error);

// Start with the default verifier options.
ebpf_verifier_options_t options = ebpf_verifier_default_options;
ebpf_verifier_options_t options{};

// Enable termination checking and pre-invariant storage.
options.check_termination = true;
options.cfg_opts.check_for_termination = true;
options.cfg_opts.simplify = false;
options.print_invariants = g_ubpf_fuzzer_options.get("UBPF_FUZZER_PRINT_VERIFIER_REPORT");
options.print_failures = g_ubpf_fuzzer_options.get("UBPF_FUZZER_PRINT_VERIFIER_REPORT");
options.store_pre_invariants = g_ubpf_fuzzer_options.get("UBPF_FUZZER_CONSTRAINT_CHECK");

// Disable simplification so that the verifier can provide more fine grained invariant information for each
// instruction.
options.simplify = false;

ebpf_verifier_stats_t stats;

std::ostringstream error_stream;

// Verify the program. This will return false or throw an exception if the program is invalid.
bool result = ebpf_verify_program(error_stream, prog, raw_prog.info, &options, &stats);
bool result = ebpf_verify_program(error_stream, prog, raw_prog.info, options, &stats);
if (g_ubpf_fuzzer_options.get("UBPF_FUZZER_PRINT_VERIFIER_REPORT")) {
std::cout << "verifier stats:" << std::endl;
std::cout << "total_unreachable: " << stats.total_unreachable << std::endl;
Expand Down
Loading