internal: include previous line on BPF context access error

Add context if the last verifier log line indicates a context access error. See #723
cilium · Jul 19, 2022 · d560e44 · d560e44
1 parent bf69929
commit d560e44
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/internal/errors.go b/internal/errors.go
@@ -128,6 +128,13 @@ func includePreviousLine(line string) bool {
 		return true
 	}
 
+	if strings.HasPrefix(line, "invalid bpf_context access") {
+		// 0: (79) r6 = *(u64 *)(r1 +0)
+		// func '__x64_sys_recvfrom' arg0 type FWD is not a struct
+		// invalid bpf_context access off=0 size=8
+		return true
+	}
+
 	return false
 }
 

diff --git a/internal/errors_test.go b/internal/errors_test.go
@@ -73,6 +73,10 @@ func TestVerifierError(t *testing.T) {
 	invalidR0 := readErrorFromFile(t, "testdata/invalid-R0.log")
 	t.Log(invalidR0)
 	qt.Assert(t, invalidR0.Error(), qt.Contains, "0: (95) exit: R0 !read_ok")
+
+	invalidCtx := readErrorFromFile(t, "testdata/invalid-ctx-access.log")
+	t.Log(invalidCtx)
+	qt.Assert(t, invalidCtx.Error(), qt.Contains, "func '__x64_sys_recvfrom' arg0 type FWD is not a struct: invalid bpf_context access off=0 size=8")
 }
 
 func ExampleVerifierError() {

diff --git a/internal/testdata/invalid-ctx-access.log b/internal/testdata/invalid-ctx-access.log