Skip to content

Commit 2cf8fa1

Browse files
Bump external/ebpf-verifier from df34181 to 2018df9 (#3600)
* Bump external/ebpf-verifier from `df34181` to `2018df9` Bumps [external/ebpf-verifier](https://github.com/vbpf/ebpf-verifier) from `df34181` to `2018df9`. - [Release notes](https://github.com/vbpf/ebpf-verifier/releases) - [Commits](vbpf/prevail@df34181...2018df9) --- updated-dependencies: - dependency-name: external/ebpf-verifier dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Fix build failures due to breaking change Signed-off-by: Dave Thaler <dthaler1968@gmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Dave Thaler <dthaler1968@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dave Thaler <dthaler1968@gmail.com>
1 parent 7b3f682 commit 2cf8fa1

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

external/ebpf-verifier

libs/api/Verifier.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ _ebpf_api_elf_verify_program_from_stream(
683683
}
684684
auto& program = std::get<InstructionSeq>(programOrError);
685685

686-
verifier_options.no_simplify = true;
686+
verifier_options.simplify = false;
687687
bool res =
688688
ebpf_verify_program(output, program, raw_program.info, &verifier_options, (ebpf_verifier_stats_t*)stats);
689689
if (!res) {

libs/service/verifier_service.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ _analyze(raw_program& raw_prog, const char** error_message, uint32_t* error_mess
3232
if (!res) {
3333
// On failure, retry to get the more detailed error message.
3434
std::ostringstream oss;
35-
options.no_simplify = true;
35+
options.simplify = false;
3636
options.print_failures = true;
3737
// Until https://github.com/vbpf/ebpf-verifier/issues/643 is fixed, don't set options.assume_assertions to true.
3838
(void)ebpf_verify_program(oss, prog, raw_prog.info, &options, &stats);

0 commit comments

Comments
 (0)