Cleanup map subscription on failure (#4347)

Alan-Jowett · shankarseal · commit 226646f1f03b · 2025-04-11T18:17:50.000-07:00
Signed-off-by: Alan Jowett &lt;alanjo@microsoft.com&gt;
diff --git a/libs/api/ebpf_api.cpp b/libs/api/ebpf_api.cpp
@@ -4724,14 +4724,17 @@ ebpf_map_subscribe(
                     result = EBPF_SUCCESS;
                 } else {
                     local_async_query_context->async_ioctl_failed = true;
+                    break;
                 }
             }
 
             local_subscription->async_query_contexts.insert({cpu_ids[cpu_index], std::move(local_async_query_context)});
         }
 
-        if (result == EBPF_SUCCESS) {
-            *subscription = local_subscription.release();
+        *subscription = local_subscription.release();
+        if (result != EBPF_SUCCESS) {
+            ebpf_map_unsubscribe(*subscription);
+            *subscription = nullptr;
         }
 
         EBPF_RETURN_RESULT(result);

Original file line number	Diff line number	Diff line change
`@@ -4724,14 +4724,17 @@ ebpf_map_subscribe(`
`4724`	`4724`	`result = EBPF_SUCCESS;`
`4725`	`4725`	`} else {`
`4726`	`4726`	`local_async_query_context->async_ioctl_failed = true;`
	`4727`	`+ break;`
`4727`	`4728`	`}`
`4728`	`4729`	`}`
`4729`	`4730`
`4730`	`4731`	`local_subscription->async_query_contexts.insert({cpu_ids[cpu_index], std::move(local_async_query_context)});`
`4731`	`4732`	`}`
`4732`	`4733`
`4733`		`- if (result == EBPF_SUCCESS) {`
`4734`		`- *subscription = local_subscription.release();`
	`4734`	`+ *subscription = local_subscription.release();`
	`4735`	`+ if (result != EBPF_SUCCESS) {`
	`4736`	`+ ebpf_map_unsubscribe(*subscription);`
	`4737`	`+ *subscription = nullptr;`
`4735`	`4738`	`}`
`4736`	`4739`
`4737`	`4740`	`EBPF_RETURN_RESULT(result);`