Merge branch 'vbpf:main' into issue728

vbpf · Oct 17, 2024 · 0f5e838 · 0f5e838
2 parents fc5d74a + 80ada1c
commit 0f5e838
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/ebpf-samples b/ebpf-samples
diff --git a/src/test/test_verify.cpp b/src/test/test_verify.cpp
@@ -510,6 +510,7 @@ TEST_SECTION("build", "tail_call.o", "xdp_prog")
 TEST_SECTION("build", "map_in_map.o", ".text")
 TEST_SECTION("build", "map_in_map_anonymous.o", ".text")
 TEST_SECTION("build", "map_in_map_legacy.o", ".text")
+TEST_SECTION("build", "store_map_value_in_map.o", ".text")
 TEST_SECTION("build", "twomaps.o", ".text");
 TEST_SECTION("build", "twostackvars.o", ".text");
 TEST_SECTION("build", "twotypes.o", ".text");
@@ -537,10 +538,6 @@ TEST_SECTION_REJECT("build", "ringbuf_uninit.o", ".text");
 // If the verifier is later updated to accept them, these should
 // be changed to TEST_SECTION().
 
-// Issue: https://github.com/vbpf/ebpf-verifier/issues/620
-// Inserting value from map 1 into map 2 should be supported, but fails.
-TEST_SECTION_FAIL("build", "store_map_value_in_map.o", ".text")
-
 // Unsupported: ebpf-function
 TEST_SECTION_FAIL("prototype-kernel", "xdp_ddos01_blacklist_kern.o", ".text")
+10 −0		CMakeLists.txt
+ −		build/bpf2bpf.o
+ −		build/correlated_branch.o
+ −		build/correlated_branch2.o
+ −		build/store_map_value_in_map.o
+1 −0		src/bpf2bpf.c
+89 −0		src/correlated_branch.c
+81 −0		src/correlated_branch2.c
+33 −0		src/store_map_value_in_map.c