do not intercept OIDs to non-default port (microsoft#122)

Author: mtfriesen

src/mp/sys/miniport.c

@@ -757,7 +757,8 @@ MiniportInitializeHandler(
     RegAttributes->AttributeFlags =
         NDIS_MINIPORT_ATTRIBUTES_NDIS_WDM |
         NDIS_MINIPORT_ATTRIBUTES_SURPRISE_REMOVE_OK |
-        NDIS_MINIPORT_ATTRIBUTES_NO_PAUSE_ON_SUSPEND;
+        NDIS_MINIPORT_ATTRIBUTES_NO_PAUSE_ON_SUSPEND |
+        NDIS_MINIPORT_ATTRIBUTES_NO_OID_INTERCEPT_ON_NONDEFAULT_PORTS;
     RegAttributes->CheckForHangTimeInSeconds = 0;
     RegAttributes->InterfaceType = NdisInterfacePNPBus;
 

src/mp/sys/oid.c

@@ -39,7 +39,9 @@ CONST NDIS_OID MpSupportedOidArray[] =
     OID_PNP_SET_POWER,
     OID_PNP_QUERY_POWER,
     OID_OFFLOAD_ENCAPSULATION,
+    OID_GEN_RECEIVE_SCALE_CAPABILITIES,
     OID_GEN_RECEIVE_SCALE_PARAMETERS,
+    OID_GEN_DRIVER_VERSION,
     OID_TCP_OFFLOAD_PARAMETERS,
     OID_TCP_OFFLOAD_HW_PARAMETERS,
     OID_QUIC_CONNECTION_ENCRYPTION,
@@ -153,6 +155,7 @@ MpProcessQueryOid(
     PUINT BytesWritten = &NdisRequest->DATA.QUERY_INFORMATION.BytesWritten;
     PUINT BytesNeeded = &NdisRequest->DATA.QUERY_INFORMATION.BytesNeeded;
     BOOLEAN DoCopy = TRUE;
+    UINT16 DriverVersion;
     ULONG LocalData = 0;
     ULONG DataLength = sizeof(LocalData);
     VOID *Data = &LocalData;
@@ -222,6 +225,13 @@ MpProcessQueryOid(
             LocalData = Adapter->MtuSize + ETH_HDR_LEN;
             break;
 
+        case OID_GEN_DRIVER_VERSION:
+            DriverVersion =
+                (NDIS_MINIPORT_MAJOR_VERSION << RTL_BITS_OF(UINT8)) | NDIS_MINIPORT_MINOR_VERSION;
+            DataLength = sizeof(DriverVersion);
+            Data = &DriverVersion;
+            break;
+
         case OID_GEN_VENDOR_ID:
             LocalData = 0x00FFFFFF;
             break;

test/functional/lib/tests.cpp

@@ -917,6 +917,34 @@ LwfOidSubmitRequestFn(
     CXPLAT_THREAD_RETURN(0);
 }
 
+template <typename T>
+static
+unique_malloc_ptr<T>
+LwfOidAllocateAndSubmitRequest(
+    _In_ const unique_fnlwf_handle &Handle,
+    _In_ OID_KEY Key,
+    _Out_ UINT32 *BytesReturned
+    )
+{
+    unique_malloc_ptr<T> InformationBuffer;
+    UINT32 InformationBufferLength = 0;
+    FNLWFAPI_STATUS Result;
+
+    Result = LwfOidSubmitRequest(Handle, Key, &InformationBufferLength, NULL);
+    TEST_EQUAL_RET(FNLWFAPI_STATUS_MORE_DATA, Result, InformationBuffer);
+    TEST_TRUE_RET(InformationBufferLength > 0, InformationBuffer);
+
+    InformationBuffer.reset((T *)CxPlatAllocNonPaged(InformationBufferLength, POOL_TAG));
+    TEST_NOT_NULL_RET(InformationBuffer.get(), InformationBuffer);
+
+    Result = LwfOidSubmitRequest(Handle, Key, &InformationBufferLength, InformationBuffer.get());
+    TEST_FNLWFAPI_RET(Result, InformationBuffer);
+    TEST_TRUE_RET(InformationBufferLength > 0, InformationBuffer);
+    *BytesReturned = InformationBufferLength;
+
+    return InformationBuffer;
+}
+
 static
 bool
 WaitForWfpQuarantine(
@@ -1521,28 +1549,33 @@ MpBasicWatchdog()
 static
 VOID
 MpVerifyPortState(
-    _In_ const unique_fnlwf_handle& LwfHandle,
+    _In_ const unique_fnlwf_handle &LwfHandle,
     _In_ NDIS_PORT_NUMBER PortNumber,
     _In_ BOOLEAN ExpectFound
     )
 {
     OID_KEY OidKey;
-    InitializeOidKey(&OidKey, OID_GEN_PORT_STATE, NdisRequestQueryInformation);
-    OidKey.PortNumber = PortNumber;
+    InitializeOidKey(&OidKey, OID_GEN_ENUMERATE_PORTS, NdisRequestQueryInformation);
     NDIS_PORT_STATE PortState = {0};
-    UINT32 PortStateSize = sizeof(PortState);
+    UINT32 BytesReturned;
+    BOOLEAN Found = FALSE;
 
     //
     // Verify the port state is accurately reported to NDIS components.
     //
 
-    FNLWFAPI_STATUS Status = LwfOidSubmitRequest(LwfHandle, OidKey, &PortStateSize, &PortState);
+    auto PortArray =
+        LwfOidAllocateAndSubmitRequest<NDIS_PORT_ARRAY>(LwfHandle, OidKey, &BytesReturned);
+    TEST_NOT_NULL(PortArray.get());
 
-    if (ExpectFound) {
-        TEST_FNLWFAPI(Status);
-    } else {
-        TEST_NOT_EQUAL(FNLWFAPI_STATUS_SUCCESS, Status);
+    for (UINT64 i = 0; i < PortArray->NumberOfPorts; i++) {
+        const NDIS_PORT_CHARACTERISTICS *PortCharacteristics = (const NDIS_PORT_CHARACTERISTICS *)
+            RTL_PTR_ADD(PortArray.get(), PortArray->OffsetFirstPort + PortArray->ElementSize * i);
+
+        Found |= PortCharacteristics->PortNumber == PortNumber;
     }
+
+    TEST_EQUAL(ExpectFound, Found);
 }
 
 EXTERN_C