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

Jump to bottom

Enable constraints check on Linux #587

Merged
merged 3 commits into from
Oct 27, 2024
Merged

Enable constraints check on Linux #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c5204c
Enable constraints check on Linux
Oct 25, 2024
8daefe3
Fix context handling
Oct 26, 2024
203e9b9
Fix uninitialized values
Oct 26, 2024
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 .github/workflows/fuzzing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ jobs:
if: matrix.platform == 'ubuntu-24.04'
run: |
ls
./ubpf_fuzzer new_corpus -artifact_prefix=artifacts/ -use_value_profile=1 -max_total_time=300 -dict=dictionary.txt
UBPF_FUZZER_CONSTRAINT_CHECK=1 ./ubpf_fuzzer new_corpus -artifact_prefix=artifacts/ -use_value_profile=1 -max_total_time=300 -dict=dictionary.txt

- name: Run fuzzing
if: matrix.platform == 'windows-latest'
Expand Down
2 changes: 1 addition & 1 deletion external/ebpf-verifier
Open in desktop
Submodule ebpf-verifier updated 8 files
+1 −2 src/assertions.cpp
+13 −3 src/crab_verifier.hpp
+20 −12 src/test/ebpf_yaml.cpp
+1 −1 src/test/ebpf_yaml.hpp
+8 −1 test-data/add.yaml
+0 −6 test-data/jump.yaml
+19 −0 test-data/loop.yaml
+82 −0 test-data/uninit.yaml
13 changes: 9 additions & 4 deletions libfuzzer/libfuzz_harness.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ typedef struct _ubpf_context
{
uint64_t data;
uint64_t data_end;
uint64_t original_data;
uint64_t original_data_end;
uint64_t stack_start;
uint64_t stack_end;
} ubpf_context_t;
Expand All @@ -94,7 +96,7 @@ typedef struct _ubpf_context
* structure in memory.
*/
ebpf_context_descriptor_t g_ebpf_context_descriptor_ubpf = {
.size = sizeof(ubpf_context_t),
.size = offsetof(ubpf_context_t, original_data),
.data = offsetof(ubpf_context_t, data),
.end = offsetof(ubpf_context_t, data_end),
.meta = -1,
Expand Down Expand Up @@ -476,8 +478,8 @@ ubpf_classify_address(const ubpf_context_t* context, uint64_t register_value)
uintptr_t stack_end = static_cast<uintptr_t>(context->stack_end);
uintptr_t context_start = reinterpret_cast<uintptr_t>(context);
uintptr_t context_end = context_start + sizeof(ubpf_context_t);
uintptr_t packet_start = static_cast<uintptr_t>(context->data);
uintptr_t packet_end = static_cast<uintptr_t>(context->data_end);
uintptr_t packet_start = static_cast<uintptr_t>(context->original_data);
uintptr_t packet_end = static_cast<uintptr_t>(context->original_data_end);

if (register_value_ptr >= stack_start && register_value_ptr < stack_end) {
return address_type_t::Stack;
Expand Down Expand Up @@ -539,6 +541,7 @@ ubpf_debug_function(

// Build set of string constraints from the register values.
std::set<std::string> constraints;
constraints.insert("packet_size=" + std::to_string(ubpf_context->original_data_end - ubpf_context->original_data));
for (int i = 0; i < 10; i++) {
if ((register_mask & (1 << i)) == 0) {
continue;
Expand Down Expand Up @@ -608,9 +611,11 @@ ubpf_debug_function(
ubpf_context_t
ubpf_context_from(std::vector<uint8_t>& memory, std::vector<uint8_t>& ubpf_stack)
{
ubpf_context_t context;
ubpf_context_t context{};
context.data = reinterpret_cast<uint64_t>(memory.data());
context.data_end = context.data + memory.size();
context.original_data = context.data;
context.original_data_end = context.data_end;
context.stack_start = reinterpret_cast<uint64_t>(ubpf_stack.data());
context.stack_end = context.stack_start + ubpf_stack.size();
return context;
Expand Down
Loading