Update ebpf-verifer and fix name changes (#1128)

* Update ebpf-verifer and fix name changes

Signed-off-by: Alan Jowett <alan.jowett@microsoft.com>

* Fix failing branch

Signed-off-by: Alan Jowett <alan.jowett@microsoft.com>

Co-authored-by: Alan Jowett <alan.jowett@microsoft.com>

external/ebpf-verifier

@@ -1 +1 @@
-Subproject commit 3a82b04f06b3c73101a8b019c02cd6bd0ff7a1f3
+Subproject commit 1c74906e18dc89d4cb771ced3f8c82a4aea8b410

libs/execution_context/ebpf_general_helpers.c

@@ -41,37 +41,37 @@ ebpf_helper_function_prototype_t ebpf_core_helper_function_prototype_array[] = {
     {BPF_FUNC_csum_diff,
      "bpf_csum_diff",
      EBPF_RETURN_TYPE_INTEGER,
-     {EBPF_ARGUMENT_TYPE_PTR_TO_MEM_OR_NULL,
+     {EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM_OR_NULL,
       EBPF_ARGUMENT_TYPE_CONST_SIZE_OR_ZERO,
-      EBPF_ARGUMENT_TYPE_PTR_TO_MEM_OR_NULL,
+      EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM_OR_NULL,
       EBPF_ARGUMENT_TYPE_CONST_SIZE_OR_ZERO,
       EBPF_ARGUMENT_TYPE_ANYTHING}},
     {BPF_FUNC_ringbuf_output,
      "bpf_ringbuf_output",
      EBPF_RETURN_TYPE_INTEGER,
      {EBPF_ARGUMENT_TYPE_PTR_TO_MAP,
-      EBPF_ARGUMENT_TYPE_PTR_TO_MEM,
+      EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM,
       EBPF_ARGUMENT_TYPE_CONST_SIZE,
       EBPF_ARGUMENT_TYPE_ANYTHING}},
     {BPF_FUNC_trace_printk2,
      "bpf_trace_printk2",
      EBPF_RETURN_TYPE_INTEGER,
-     {EBPF_ARGUMENT_TYPE_PTR_TO_MEM, EBPF_ARGUMENT_TYPE_CONST_SIZE}},
+     {EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM, EBPF_ARGUMENT_TYPE_CONST_SIZE}},
     {BPF_FUNC_trace_printk3,
      "bpf_trace_printk3",
      EBPF_RETURN_TYPE_INTEGER,
-     {EBPF_ARGUMENT_TYPE_PTR_TO_MEM, EBPF_ARGUMENT_TYPE_CONST_SIZE, EBPF_ARGUMENT_TYPE_ANYTHING}},
+     {EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM, EBPF_ARGUMENT_TYPE_CONST_SIZE, EBPF_ARGUMENT_TYPE_ANYTHING}},
     {BPF_FUNC_trace_printk4,
      "bpf_trace_printk4",
      EBPF_RETURN_TYPE_INTEGER,
-     {EBPF_ARGUMENT_TYPE_PTR_TO_MEM,
+     {EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM,
       EBPF_ARGUMENT_TYPE_CONST_SIZE,
       EBPF_ARGUMENT_TYPE_ANYTHING,
       EBPF_ARGUMENT_TYPE_ANYTHING}},
     {BPF_FUNC_trace_printk5,
      "bpf_trace_printk5",
      EBPF_RETURN_TYPE_INTEGER,
-     {EBPF_ARGUMENT_TYPE_PTR_TO_MEM,
+     {EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM,
       EBPF_ARGUMENT_TYPE_CONST_SIZE,
       EBPF_ARGUMENT_TYPE_ANYTHING,
       EBPF_ARGUMENT_TYPE_ANYTHING,

tests/end_to_end/netsh_test.cpp

@@ -225,10 +225,10 @@ TEST_CASE("show verification droppacket_unsafe.o", "[netsh][verification]")
                   "\n"
                   "; ./tests/sample/unsafe/droppacket_unsafe.c:37\n"
                   ";     if (ip_header->Protocol == IPPROTO_UDP) {\n"
-                  "2: Upper bound must be at most packet_size (valid_access(r1.offset+9, width=1))\n"
+                  "2: Upper bound must be at most packet_size (valid_access(r1.offset+9, width=1) for read)\n"
                   "; ./tests/sample/unsafe/droppacket_unsafe.c:38\n"
                   ";         if (ntohs(udp_header->length) <= sizeof(UDP_HEADER)) {\n"
-                  "4: Upper bound must be at most packet_size (valid_access(r1.offset+24, width=2))\n"
+                  "4: Upper bound must be at most packet_size (valid_access(r1.offset+24, width=2) for read)\n"
                   "\n"
                   "2 errors\n"
                   "\n");

tests/sample/ext/inc/sample_ext_program_info.h

@@ -28,17 +28,17 @@ static ebpf_helper_function_prototype_t _sample_ebpf_extension_helper_function_p
     {SAMPLE_EXT_HELPER_FUNCTION_START + 2,
      "sample_ebpf_extension_find",
      EBPF_RETURN_TYPE_INTEGER,
-     {EBPF_ARGUMENT_TYPE_PTR_TO_MEM,
+     {EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM,
       EBPF_ARGUMENT_TYPE_CONST_SIZE,
-      EBPF_ARGUMENT_TYPE_PTR_TO_MEM,
+      EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM,
       EBPF_ARGUMENT_TYPE_CONST_SIZE}},
     {SAMPLE_EXT_HELPER_FUNCTION_START + 3,
      "sample_ebpf_extension_replace",
      EBPF_RETURN_TYPE_INTEGER,
-     {EBPF_ARGUMENT_TYPE_PTR_TO_MEM,
+     {EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM,
       EBPF_ARGUMENT_TYPE_CONST_SIZE,
       EBPF_ARGUMENT_TYPE_ANYTHING,
-      EBPF_ARGUMENT_TYPE_PTR_TO_MEM,
+      EBPF_ARGUMENT_TYPE_PTR_TO_READABLE_MEM,
       EBPF_ARGUMENT_TYPE_CONST_SIZE}}};
 
 static ebpf_program_info_t _sample_ebpf_extension_program_info = {