[netebpfext] Add per-provider WFP handles to avoid improper use from parallel invocations #3866
+205
−49
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matthewige
changed the title
matthewige
changed the title
matthewige
requested review from
dthaler,
poornagmsft,
Alan-Jowett,
saxena-anurag,
shankarseal,
dv-msft,
gtrevi,
shpalani,
mtfriesen and
rectified95
as code owners
shankarseal
reviewed
Sep 28, 2024
| @@ -643,6 +662,26 @@ net_ebpf_ext_uninitialize_ndis_handles() | |||
| } | |||
| } | |||
|
|
|||
| NTSTATUS | |||
| net_ebpf_extension_open_wfp_engine_handle(HANDLE* wfp_engine_handle) | |||
shankarseal
reviewed
Sep 28, 2024
| } | ||
|
|
||
| NTSTATUS | ||
| net_ebpf_extension_close_wfp_engine_handle(HANDLE wfp_engine_handle) |
There was a problem hiding this comment.
Add SAL _In_ because HANDLE is technically a pointer. There are many precedence of _In_ Handle elsewhere in the project.
shankarseal
reviewed
Sep 28, 2024
| @@ -222,6 +236,11 @@ net_ebpf_ext_bind_unregister_providers() | |||
| net_ebpf_extension_program_info_provider_unregister(_ebpf_bind_program_info_provider_context); | |||
| _ebpf_bind_program_info_provider_context = NULL; | |||
| } | |||
| if (_net_ebpf_extension_bind_wfp_engine_handle) { | |||
shankarseal
reviewed
Sep 28, 2024
| @@ -19,6 +19,8 @@ typedef struct _bind_context_header | |||
| // WFP filter related globals for bind hook. | |||
| // | |||
|
|
|||
| static HANDLE _net_ebpf_extension_bind_wfp_engine_handle = NULL; | |||
There was a problem hiding this comment.
Consider storing the engine handle in net_ebpf_extension_wfp_filter_context_t and opening it inside net_ebpf_extension_wfp_filter_context_create.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Issue:
Our KM stress tests revealed an issue in our netebpfext code. There is a single global WFP handle, but multiple threads could use this at the same time (such as two programs attaching in parallel), leading to errors in the WFP APIs.
Fix:
Closes #3607
Testing
Existing tests validate this functionality.
Documentation
None.
Installation
None.