iovisor / ubpf / 28966034061

79%

Build Type

push

github

Committed by web-flow

Commit Message

Loader and verifier fixes for clang/LLVM BPF outputLoader verifier fixes (#802)

* verifier: accept sub-programs that end in an unconditional jump

check_for_self_contained_sub_programs() accepted a local-call sub-program
only if it ended in EXIT or had an unconditional jump as its penultimate
instruction, rejecting one whose final instruction is itself the jump.
clang produces this layout when a function's tail is a loop back-edge:
every exit path leaves through an EXIT in the loop body and the last
instruction is a JA back to the top.

This change accepts a trailing JA/JA32 as a terminator in addition to the
penultimate-jump check for more common layouts.

Signed-off-by: Alex Forster <alex@alexforster.com>
Co-Authored-By: Claude <noreply@anthropic.com>

* Recompute un-relocated intra-section bpf-to-bpf call targets after link

clang emits calls between static functions in the same section with a
PC-relative imm and no relocation entry. The imm is computed against the
.o instruction layout, but the loader lands functions in symbol-table
order, which differs from .o offset order whenever the main function is
not first in its section. When the two orders differ the imm is stale and
the call jumps to the wrong function.

Add a fixup pass after the relocation pass that finds these un-relocated
local calls, decodes the original target offset from the raw imm, locates
the target by its section start, and rewrites the imm from the landed
positions the same way the relocation pass does. Call sites that already
carry a relocation (SHT_REL or SHT_RELA) are detected and skipped. The
loader still only applies SHT_REL; SHT_RELA is scanned here only so a call
carrying one is recognized as relocated and left alone rather than
re-decoded into a wrong target.

The added test exercises the no-relocation path; the skip and error
branches are not covered.

Signed-off-by: Alex Forster <alex@alexforster.com>
Co-Authored-By: Claude <noreply@anthropic.com>

* loader: accept... (continued)

Coverage Stats

139 of 168 new or added lines in 3 files covered. (82.74%)

97 existing lines in 9 files now uncovered.

8041 of 10231 relevant lines covered (78.59%)

1238738.07 hits per line