From 915978c4d3aa8f484badd39dd18765157086d35e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 16:28:12 +0000 Subject: [PATCH 1/2] Bump ebpf-samples from `498d2f7` to `325cce1` Bumps [ebpf-samples](https://github.com/vbpf/ebpf-samples) from `498d2f7` to `325cce1`. - [Release notes](https://github.com/vbpf/ebpf-samples/releases) - [Commits](https://github.com/vbpf/ebpf-samples/compare/498d2f7ae80d8dcd0cc47defd4104c0901d1afa8...325cce1bc528a8b70e02ea914d407b4e4f89731d) --- updated-dependencies: - dependency-name: ebpf-samples dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- ebpf-samples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebpf-samples b/ebpf-samples index 498d2f7ae..325cce1bc 160000 --- a/ebpf-samples +++ b/ebpf-samples @@ -1 +1 @@ -Subproject commit 498d2f7ae80d8dcd0cc47defd4104c0901d1afa8 +Subproject commit 325cce1bc528a8b70e02ea914d407b4e4f89731d From 80ada1c8b96263a924990a95576633223d355fbe Mon Sep 17 00:00:00 2001 From: Dave Thaler Date: Tue, 15 Oct 2024 19:21:17 -0700 Subject: [PATCH 2/2] Update test that used to fail to pass Now that the issue is fixed Signed-off-by: Dave Thaler --- src/test/test_verify.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/test/test_verify.cpp b/src/test/test_verify.cpp index 7c3160b3c..962091c4b 100644 --- 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")