Merge branch 'iovisor:main' into cross_check

iovisor · Oct 23, 2024 · 84d8178 · 84d8178
2 parents 248f3ba + 2e945f5
commit 84d8178
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/external/ebpf-verifier b/external/ebpf-verifier
diff --git a/vm/ubpf_vm.c b/vm/ubpf_vm.c
@@ -444,7 +444,7 @@ ubpf_check_shadow_stack(
     uintptr_t stack_end = stack_start + stack_length;
 
     if (access_start > access_end) {
-        // Overflow
+        // Not a stack location.
         return true;
     }
 
@@ -929,8 +929,7 @@ ubpf_exec_ex(
     do {                                                                                                  \
         if (!ubpf_check_shadow_stack(                                                                     \
                 vm, stack_start, stack_length, shadow_stack, (char*)reg[inst.src] + inst.offset, size)) { \
-            return_value = -1;                                                                            \
-            goto cleanup;                                                                                 \
+                shadow_registers &= ~REGISTER_TO_SHADOW_MASK(inst.dst);                                   \
         }                                                                                                 \
         if (!bounds_check(                                                                                \
                 vm,                                                                                       \