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 verifier #632

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update verifier #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39874a1
First pass
Alan-Jowett Jan 15, 2025
cf8254a
Re-implement UBPF_FUZZER_CONSTRAINT_CHECK
Alan-Jowett Jan 16, 2025
7b537c9
Switch to updated verifier
Alan-Jowett Jan 21, 2025
780b010
Switch to latest ebpf-verifier
Alan-Jowett Jan 21, 2025
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/ebpf-verifier
Open in desktop
Submodule ebpf-verifier updated 86 files
+4 −3 .github/workflows/coverage.yml
+5 −1 README.md
+1 −1 ebpf-samples
+1 −1 external/bpf_conformance
+1 −1 external/libbtf
+258 −185 src/asm_cfg.cpp
+99 −71 src/asm_files.cpp
+5 −0 src/asm_files.hpp
+1 −2 src/asm_marshal.cpp
+174 −112 src/asm_ostream.cpp
+0 −58 src/asm_ostream.hpp
+8 −24 src/asm_parse.cpp
+1 −20 src/asm_parse.hpp
+28 −162 src/asm_syntax.hpp
+8 −7 src/asm_unmarshal.cpp
+15 −15 src/assertions.cpp
+27 −19 src/config.hpp
+3 −14 src/crab/array_domain.cpp
+0 −4 src/crab/array_domain.hpp
+84 −532 src/crab/cfg.hpp
+441 −0 src/crab/ebpf_checker.cpp
+67 −2,686 src/crab/ebpf_domain.cpp
+35 −140 src/crab/ebpf_domain.hpp
+2,442 −0 src/crab/ebpf_transformer.cpp
+57 −88 src/crab/fwd_analyzer.cpp
+7 −3 src/crab/fwd_analyzer.hpp
+2 −1 src/crab/interval.hpp
+94 −0 src/crab/label.hpp
+86 −58 src/crab/split_dbm.cpp
+5 −8 src/crab/split_dbm.hpp
+9 −10 src/crab/thresholds.cpp
+1 −1 src/crab/thresholds.hpp
+1 −1 src/crab/type_domain.cpp
+2 −0 src/crab/type_domain.hpp
+1 −1 src/crab/type_encoding.hpp
+5 −4 src/crab/var_factory.cpp
+1 −0 src/crab/variable.hpp
+26 −8 src/crab/wto.cpp
+12 −4 src/crab/wto.hpp
+8 −7 src/crab_utils/debug.hpp
+96 −145 src/crab_utils/graph_ops.hpp
+7 −7 src/crab_utils/heap.hpp
+0 −5 src/crab_utils/stats.cpp
+23 −4 src/crab_utils/stats.hpp
+80 −284 src/crab_verifier.cpp
+65 −49 src/crab_verifier.hpp
+1 −1 src/ebpf_verifier.hpp
+1 −1 src/linux/gpl/spec_prototypes.cpp
+20 −18 src/linux/linux_platform.cpp
+2 −0 src/linux/linux_platform.hpp
+52 −30 src/main/check.cpp
+22 −19 src/main/linux_verifier.cpp
+1 −1 src/main/run_yaml.cpp
+0 −16 src/main/utils.hpp
+73 −0 src/program.hpp
+17 −11 src/spec_type_descriptors.hpp
+1 −1 src/string_constraints.hpp
+58 −109 src/test/ebpf_yaml.cpp
+1 −2 src/test/ebpf_yaml.hpp
+1 −1 src/test/test_conformance.cpp
+12 −10 src/test/test_marshal.cpp
+0 −1 src/test/test_print.cpp
+85 −63 src/test/test_verify.cpp
+25 −61 src/test/test_wto.cpp
+1 −1 src/test/test_yaml.cpp
+6 −79 test-data/add.yaml
+35 −46 test-data/assign.yaml
+86 −86 test-data/atomic.yaml
+7 −14 test-data/call.yaml
+4 −4 test-data/calllocal.yaml
+7 −14 test-data/callx.yaml
+11 −20 test-data/full64.yaml
+61 −136 test-data/jump.yaml
+62 −106 test-data/loop.yaml
+34 −53 test-data/movsx.yaml
+43 −16 test-data/packet.yaml
+41 −60 test-data/pointer.yaml
+11 −20 test-data/sdivmod.yaml
+7 −10 test-data/sext.yaml
+70 −309 test-data/shift.yaml
+12 −14 test-data/stack.yaml
+3 −4 test-data/subtract.yaml
+12 −22 test-data/udivmod.yaml
+38 −41 test-data/uninit.yaml
+6 −6 test-data/unop.yaml
+196 −224 test-data/unsigned.yaml
52 changes: 36 additions & 16 deletions libfuzzer/libfuzz_harness.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ EbpfProgramType g_ubpf_program_type = {
.is_privileged = false,
};

std::optional<Invariants> stored_invariants;

/**
* @brief This function is called by the verifier when parsing an ELF file to determine the type of the program being
* loaded based on the section and path.
Expand Down Expand Up @@ -359,20 +361,29 @@ try {

// Enable termination checking and pre-invariant storage.
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");
options.verbosity_opts.simplify = false;
options.verbosity_opts.print_invariants = g_ubpf_fuzzer_options.get("UBPF_FUZZER_PRINT_VERIFIER_REPORT");
options.verbosity_opts.print_failures = g_ubpf_fuzzer_options.get("UBPF_FUZZER_PRINT_VERIFIER_REPORT");

ebpf_verifier_stats_t stats;

std::ostringstream error_stream;

// Convert the instruction sequence to a control-flow graph.
auto program = Program::from_sequence(prog, info, options.cfg_opts);

// 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);
stored_invariants.emplace(analyze(program));

bool result = stored_invariants->verified(program);

if (g_ubpf_fuzzer_options.get("UBPF_FUZZER_PRINT_VERIFIER_REPORT")) {
auto report = stored_invariants->check_assertions(program);
print_warnings(error_stream, report);

print_invariants(error_stream, program, false, *stored_invariants);

std::cout << "verifier stats:" << std::endl;
std::cout << "total_unreachable: " << stats.total_unreachable << std::endl;
std::cout << "total_warnings: " << stats.total_warnings << std::endl;
std::cout << "max_loop_count: " << stats.max_loop_count << std::endl;
std::cout << "result: " << result << std::endl;
Expand Down Expand Up @@ -525,7 +536,6 @@ ubpf_debug_function(
std::cout << std::endl;
}


if (g_ubpf_fuzzer_options.get("UBPF_FUZZER_CONSTRAINT_CHECK")) {
ubpf_context_t* ubpf_context = reinterpret_cast<ubpf_context_t*>(context);
UNREFERENCED_PARAMETER(stack_start);
Expand All @@ -536,13 +546,13 @@ ubpf_debug_function(
const ebpf_inst* inst = reinterpret_cast<const ebpf_inst*>(ubpf_context->program_start);
inst += program_counter;

std::string label;
std::string stack_frame_prefix;

for (size_t i = 0; i < g_pc_stack.size(); i++) {
label += std::to_string(g_pc_stack[i]) + "/";
for (size_t i = 1; i < g_pc_stack.size(); i++) {
stack_frame_prefix += std::to_string(g_pc_stack[i]) + "/";
}

label += std::to_string(program_counter) + ":-1";
crab::label_t label{program_counter, -1, stack_frame_prefix};

// Local call.
if (inst->opcode == EBPF_OP_CALL && inst->src == 1) {
Expand All @@ -555,7 +565,7 @@ ubpf_debug_function(
g_pc_stack.pop_back();
}
}


if (program_counter == 0) {
return;
Expand Down Expand Up @@ -604,15 +614,25 @@ ubpf_debug_function(
}
}

// Call ebpf_check_constraints_at_label with the set of string constraints at this label.

std::ostringstream os;
string_invariant inv;
inv.maybe_inv = constraints;

if (!ebpf_check_constraints_at_label(os, label, constraints)) {
// Call the verifier to check the constraints at the given label.
if (!stored_invariants->is_valid_before(label, inv)) {
std::cerr << "Label: " << label << std::endl;
std::cerr << os.str() << std::endl;
std::cerr << "Verifier state: " << std::endl;
std::cerr << stored_invariants->invariant_at(label);
std::cerr << std::endl;

std::cerr << "Actual state: " << std::endl;
std::cerr << inv << std::endl;

throw std::runtime_error("ebpf_check_constraints_at_label failed");
}

// if (!ebpf_check_constraints_at_label(os, label, constraints)) {
// }
}
}

Expand Down
Loading