Check for alloc failure. Fixes nmap#698

good-bay · Oct 5, 2023 · 4615b28 · 4615b28
1 parent 908a6d8
commit 4615b28
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/packetWin7/npf/npf/Openclos.c b/packetWin7/npf/npf/Openclos.c
@@ -1934,6 +1934,17 @@ NPF_CreateFilterModule(
 			bAllocFailed = TRUE;
 			break;
 		}
+
+		pFiltMod->AdapterName.MaximumLength = AdapterName->MaximumLength - DEVICE_PATH_BYTES;
+		pFiltMod->AdapterName.Buffer = ExAllocatePoolWithTag(NPF_NONPAGED, pFiltMod->AdapterName.MaximumLength, NPF_UNICODE_BUFFER_TAG);
+		if (pFiltMod->AdapterName.Buffer == NULL)
+		{
+			INFO_DBG("Failed to allocate AdapterName buffer\n");
+			bAllocFailed = TRUE;
+			break;
+		}
+		pFiltMod->AdapterName.Length = 0;
+		RtlAppendUnicodeToString(&pFiltMod->AdapterName, AdapterName->Buffer + DEVICE_PATH_CCH);
 	} while (0);
 
 	if (bAllocFailed) {
@@ -1951,11 +1962,6 @@ NPF_CreateFilterModule(
 	// or for Loopback when creating the fake module.
 	pFiltMod->MaxFrameSize = 1514;
 
-	pFiltMod->AdapterName.MaximumLength = AdapterName->MaximumLength - DEVICE_PATH_BYTES;
-	pFiltMod->AdapterName.Buffer = ExAllocatePoolWithTag(NPF_NONPAGED, pFiltMod->AdapterName.MaximumLength, NPF_UNICODE_BUFFER_TAG);
-	pFiltMod->AdapterName.Length = 0;
-	RtlAppendUnicodeToString(&pFiltMod->AdapterName, AdapterName->Buffer + DEVICE_PATH_CCH);
-
 	//
 	//allocate the spinlock for the OID requests
 	//