Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump external/Catch2 from 8898cc6 to 119a7bb in the generic group across 1 directory #3972

Closed
wants to merge 1 commit into from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 31, 2024

Bumps the generic group with 1 update in the / directory: external/Catch2.

Updates external/Catch2 from 8898cc6 to 119a7bb

Commits
  • 119a7bb Cleanup clang-tidy warning about enum sizes
  • 9c5a4cf Enable CMake project folders for better target organization
  • e260288 Allow disabling use of __builtin_constant_p in internal macros
  • 7c2e1fb Update Intel Mac builds to macos-13 images for MacOS GitHub Actions
  • a6ee7e2 Use isatty() when using GNU libc
  • 0b2af56 Explicitly cast values of different types
  • 69d62ab Provide overloads for {Unordered}RangeEquals taking a std::initializer_list
  • 1e0ccb1 Use default parameter for comparison instead of overloads in {Unordered}Range...
  • 5ad66ad Fix typos in comments
  • fa43b77 v3.7.1
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

Bumps the generic group with 1 update in the / directory: [external/Catch2](https://github.com/catchorg/Catch2).


Updates `external/Catch2` from `8898cc6` to `119a7bb`
- [Release notes](https://github.com/catchorg/Catch2/releases)
- [Commits](catchorg/Catch2@8898cc6...119a7bb)

---
updated-dependencies:
- dependency-name: external/Catch2
  dependency-type: direct:production
  dependency-group: generic
...

Signed-off-by: dependabot[bot] <[email protected]>
@dthaler
Copy link
Collaborator

dthaler commented Oct 31, 2024

This PR will be moot once PR #3973 is merged so closing this PR.

@dthaler dthaler closed this Oct 31, 2024
Copy link
Contributor Author

dependabot bot commented on behalf of github Oct 31, 2024

This pull request was built based on a group rule. Closing it will not ignore any of these versions in future pull requests.

To ignore these dependencies, configure ignore rules in dependabot.yml

@dependabot dependabot bot deleted the dependabot/submodules/generic-d3efd6b9d5 branch October 31, 2024 17:33
@shpalani
Copy link
Collaborator

shpalani commented Oct 31, 2024

Looking at the stack trace in crashdump in netebpfext_unit.exe:

0:016> k
 # Child-SP          RetAddr               Call Site
00 000000e4`cebf5a78 00007ffe`6b2f464c     ntdll!ZwWaitForMultipleObjects+0x14 [minkernel\ntdll\daytona\objfre\amd64\usrstubs.asm @ 947] 
01 000000e4`cebf5a80 00007ffe`6b2f454e     KERNELBASE!WaitForMultipleObjectsEx+0xec [minkernel\kernelbase\synch.c @ 1551] 
02 000000e4`cebf5d70 00007ffe`6c7021e1     KERNELBASE!WaitForMultipleObjects+0xe [minkernel\kernelbase\synch.c @ 1403] 
03 000000e4`cebf5db0 00007ffe`6c701dad     kernel32!WerpReportFaultInternal+0x425 [onecore\windows\feedback\core\faultrep\lib\faultrep.cpp @ 997] 
04 000000e4`cebf5ed0 00007ffe`6c701d1e     kernel32!WerpReportFault+0x81 [onecore\windows\feedback\core\faultrep\lib\faultrep.cpp @ 1308] 
05 000000e4`cebf5f10 00007ffe`6b340134     kernel32!BasepReportFault+0x1e [clientcore\base\win32\client\wer.c @ 45] 
06 000000e4`cebf5f40 00007ffe`6d988a15     KERNELBASE!UnhandledExceptionFilter+0x344 [minkernel\kernelbase\xcpt.c @ 685] 
07 (Inline Function) --------`--------     ntdll!RtlpThreadExceptionFilter+0x9b [minkernel\ntdll\rtlstrt.c @ 956] 
08 000000e4`cebf6060 00007ffe`6d96f076     ntdll!RtlUserThreadStart$filt$0+0xac [minkernel\ntdll\rtlstrt.c @ 1153] 
09 000000e4`cebf60a0 00007ffe`6d98480f     ntdll!__C_specific_handler+0x96 [minkernel\crts\crtw32\misc\riscchandler.c @ 446] 
0a 000000e4`cebf6110 00007ffe`6d91192e     ntdll!RtlpExecuteHandlerForException+0xf [minkernel\ntos\rtl\amd64\xcptmisc.asm @ 132] 
0b 000000e4`cebf6140 00007ffe`6d92fb01     ntdll!RtlDispatchException+0x26e [minkernel\ntos\rtl\amd64\exdsptch.c @ 653] 
0c 000000e4`cebf6900 00007ffe`6b2cf14c     ntdll!RtlRaiseException+0x1f1 [minkernel\ntos\rtl\amd64\raise.c @ 240] 
0d 000000e4`cebf70f0 00007ff7`97461aa6     KERNELBASE!RaiseException+0x6c [minkernel\kernelbase\xcpt.c @ 936] 
0e 000000e4`cebf71d0 00007ffe`3b446e31     netebpfext_unit!std::allocator<char>::allocate+0x16 [C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.41.34120\include\xmemory @ 954] 
0f 000000e4`cebf7200 00007ffe`3b445610     ucrtbased!_VCrtDbgReportW+0x841 [minkernel\crts\ucrt\src\appcrt\misc\dbgrptt.cpp @ 613] 
10 000000e4`cebff340 00007ffe`3b432fa1     ucrtbased!_CrtDbgReportW+0x60 [minkernel\crts\ucrt\src\appcrt\misc\dbgrpt.cpp @ 278] 
11 000000e4`cebff3a0 00007ffe`3b433153     ucrtbased!issue_debug_notification+0x31 [minkernel\crts\ucrt\src\appcrt\internal\report_runtime_error.cpp @ 25] 
12 000000e4`cebff3f0 00007ffe`3b44ae2d     ucrtbased!__acrt_report_runtime_error+0x13 [minkernel\crts\ucrt\src\appcrt\internal\report_runtime_error.cpp @ 154] 
13 000000e4`cebff450 00007ffe`3b450c6f     ucrtbased!abort+0x1d [minkernel\crts\ucrt\src\appcrt\startup\abort.cpp @ 61] 
14 000000e4`cebff490 00007ffe`3b44eba1     ucrtbased!common_assert_to_stderr<wchar_t>+0xbf [minkernel\crts\ucrt\src\appcrt\startup\assert.cpp @ 187] 
15 000000e4`cebff4f0 00007ffe`3b4518af     ucrtbased!common_assert<wchar_t>+0x41 [minkernel\crts\ucrt\src\appcrt\startup\assert.cpp @ 415] 
16 000000e4`cebff530 00007ff7`974e762d     ucrtbased!_wassert+0x2f [minkernel\crts\ucrt\src\appcrt\startup\assert.cpp @ 444] 
17 000000e4`cebff560 00007ff7`974e741b     netebpfext_unit!Catch::operator<<+0x5d [D:\a\ebpf-for-windows\ebpf-for-windows\external\Catch2\src\catch2\internal\catch_lazy_expr.cpp @ 20] 
18 000000e4`cebff590 00007ff7`9748d73e     netebpfext_unit!Catch::Detail::CaseInsensitiveLess::operator()+0x5b [D:\a\ebpf-for-windows\ebpf-for-windows\external\Catch2\src\catch2\internal\catch_case_insensitive_comparisons.cpp @ 19] 
19 000000e4`cebff5c0 00007ff7`97479810     netebpfext_unit!Catch::RunContext::populateReaction+0x1e [D:\a\ebpf-for-windows\ebpf-for-windows\external\Catch2\src\catch2\internal\catch_run_context.cpp @ 661] 
1a 000000e4`cebff620 00007ff7`97466aad     netebpfext_unit!Catch::AssertionReaction::AssertionReaction
1b 000000e4`cebff670 00007ff7`97447388     netebpfext_unit!sock_addr_thread_function+0x29d [D:\a\ebpf-for-windows\ebpf-for-windows\tests\netebpfext_unit\netebpfext_unit.cpp @ 558] 
1c 000000e4`cebff810 00007ff7`97441206     netebpfext_unit!std::invoke<void (__cdecl*)(std::stop_token,_netebpf_ext_helper *,_fwp_classify_parameters *,enum _sock_addr_test_type,unsigned short,unsigned short),std::stop_token,_netebpf_ext_helper *,_fwp_classify_parameters *,enum _sock_addr_test_type,unsigned short,unsigned short>+0x118
1d 000000e4`cebff8b0 00007ffe`3b453010     netebpfext_unit!std::thread::_Invoke<std::tuple<void (__cdecl*)(std::stop_token,_netebpf_ext_helper *,_fwp_classify_parameters *,enum _sock_addr_test_type,unsigned short,unsigned short),std::stop_token,_netebpf_ext_helper *,_fwp_classify_parameters *,enum _sock_addr_test_type,unsigned short,unsigned short>,0,1,2,3,4,5,6>+0x156 [C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.41.34120\include\thread @ 63] 
1e 000000e4`cebff970 00007ffe`6c6f4cb0     ucrtbased!thread_start<unsigned int (__cdecl*)(void *),1>+0xb0 [minkernel\crts\ucrt\src\appcrt\startup\thread.cpp @ 97] 
1f 000000e4`cebff9d0 00007ffe`6d95ecdb     kernel32!BaseThreadInitThunk+0x10 [clientcore\base\win32\client\thread.c @ 75] 
20 000000e4`cebffa00 00000000`00000000     ntdll!RtlUserThreadStart+0x2b [minkernel\ntdll\rtlstrt.c @ 1152] 
windbg>
0:016> ? 0xd204
Evaluate expression: 53764 = 00000000`0000d204
0:016> ? 0x1002
Evaluate expression: 4098 = 00000000`00001002
0:016> ? 0x4d2
Evaluate expression: 1234 = 00000000`000004d2
0:016> dv
  catchAssertionHandler = class Catch::AssertionHandler
                  token = 0x000000e4`cebff850
                 helper = 0x000000e4`cc90e460
             parameters = 0x000000e4`cc90e340
                   type = SOCK_ADDR_TEST_TYPE_CONNECT (0n0)
             start_port = 0x4d2
               end_port = 0x4d2
fault_injection_enabled = false
            port_number = 0xd204
                 result = 0x1002
void
sock_addr_thread_function(
    std::stop_token token,
    _In_ netebpf_ext_helper_t* helper,
    _In_ fwp_classify_parameters_t* parameters,
    sock_addr_test_type_t type,
    uint16_t start_port,
    uint16_t end_port)
{
    FWP_ACTION_TYPE result;
    uint16_t port_number;

    bool fault_injection_enabled = cxplat_fault_injection_is_enabled();

    if (start_port != end_port) {
        port_number = start_port - 1;
    } else {
        port_number = htons(parameters->destination_port);
    }

    while (!token.stop_requested()) {
        // If start_port and end_port are same, then the port number for each
        // invocation will remain the same.
        if (start_port != end_port) {
            port_number++;
            if (port_number > end_port) {
                port_number = start_port;
            }
            parameters->destination_port = htons(port_number);
        }

        switch (type) {
        case SOCK_ADDR_TEST_TYPE_RECV_ACCEPT:
            result = helper->test_cgroup_inet4_recv_accept(parameters);
            break;
        case SOCK_ADDR_TEST_TYPE_CONNECT:
        default:
            result = helper->test_cgroup_inet4_connect(parameters);
            break;
        }

        **REQUIRE((result == _get_fwp_sock_addr_action(port_number) || fault_injection_enabled));**
    }
}

@agarwalishita
Copy link

Looking at the stack trace, catch2 is still being searched at the previous path for netebpfext_unit in here : netebpfext_unit!Catch::operator<<+0x5d [D:\a\ebpf-for-windows\ebpf-for-windows\external\Catch2\src\catch2\internal\catch_lazy_expr.cpp @ 20]

so, do I need to update path in catch_wrapper.hpp? as I am not sure from where is the above path picked up

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file submodules Pull requests that update Submodules code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants