diff --git a/NetworkPkg/HttpBootDxe/HttpBootConfig.c b/NetworkPkg/HttpBootDxe/HttpBootConfig.c index 0fc89ab2786..31583b7a3f2 100644 --- a/NetworkPkg/HttpBootDxe/HttpBootConfig.c +++ b/NetworkPkg/HttpBootDxe/HttpBootConfig.c @@ -634,16 +634,21 @@ HttpBootConfigFormInit ( STRING_TOKEN (STR_HTTP_BOOT_CONFIG_FORM_HELP), NULL ); - UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString); - HiiSetString ( - CallbackInfo->RegisteredHandle, - STRING_TOKEN (STR_HTTP_BOOT_CONFIG_FORM_HELP), - MenuString, - NULL - ); + // MU_CHANGE [BEGIN] - CodeQL change + if (OldMenuString != NULL) { + UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString); + HiiSetString ( + CallbackInfo->RegisteredHandle, + STRING_TOKEN (STR_HTTP_BOOT_CONFIG_FORM_HELP), + MenuString, + NULL + ); + + FreePool (OldMenuString); + } + // MU_CHANGE [END] - CodeQL change FreePool (MacString); - FreePool (OldMenuString); CallbackInfo->Initialized = TRUE; return EFI_SUCCESS; diff --git a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c index 94eb8757a29..2923660b426 100644 --- a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c +++ b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c @@ -1358,24 +1358,30 @@ Ip4Config2FormInit ( STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP), NULL ); - UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString); - HiiSetString ( - CallbackInfo->RegisteredHandle, - STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP), - MenuString, - NULL - ); - - UnicodeSPrint (PortString, 128, L"MAC:%s", MacString); - HiiSetString ( - CallbackInfo->RegisteredHandle, - STRING_TOKEN (STR_IP4_DEVICE_FORM_HELP), - PortString, - NULL - ); + // MU_CHANGE [BEGIN] - CodeQL change + if (OldMenuString != NULL) { + UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString); + HiiSetString ( + CallbackInfo->RegisteredHandle, + STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP), + MenuString, + NULL + ); + + UnicodeSPrint (PortString, 128, L"MAC:%s", MacString); + HiiSetString ( + CallbackInfo->RegisteredHandle, + STRING_TOKEN (STR_IP4_DEVICE_FORM_HELP), + PortString, + NULL + ); + + FreePool (OldMenuString); + } FreePool (MacString); - FreePool (OldMenuString); + + // MU_CHANGE [END] - CodeQL change return EFI_SUCCESS; } diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c index 48ba499b6a6..1b4eff010a7 100644 --- a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c +++ b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c @@ -1413,10 +1413,16 @@ Ip6FormExtractConfig ( goto Exit; } - // MU_CHANGE [END] - CodeQL change Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16); ConfigRequest = AllocateZeroPool (Size); - ASSERT (ConfigRequest != NULL); + + if (ConfigRequest == NULL) { + ASSERT (ConfigRequest != NULL); + Status = EFI_OUT_OF_RESOURCES; + goto Exit; + } + + // MU_CHANGE [END] - CodeQL change AllocatedRequest = TRUE; UnicodeSPrint ( ConfigRequest, @@ -2003,23 +2009,29 @@ Ip6ConfigFormInit ( NULL ) ; - UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString); - HiiSetString ( - CallbackInfo->RegisteredHandle, - STRING_TOKEN (STR_IP6_CONFIG_FORM_HELP), - MenuString, - NULL - ); - UnicodeSPrint (PortString, 128, L"MAC:%s", MacString); - HiiSetString ( - CallbackInfo->RegisteredHandle, - STRING_TOKEN (STR_IP6_DEVICE_FORM_HELP), - PortString, - NULL - ); + // MU_CHANGE [BEGIN] - CodeQL change + if (OldMenuString != NULL) { + UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString); + HiiSetString ( + CallbackInfo->RegisteredHandle, + STRING_TOKEN (STR_IP6_CONFIG_FORM_HELP), + MenuString, + NULL + ); + UnicodeSPrint (PortString, 128, L"MAC:%s", MacString); + HiiSetString ( + CallbackInfo->RegisteredHandle, + STRING_TOKEN (STR_IP6_DEVICE_FORM_HELP), + PortString, + NULL + ); + + FreePool (OldMenuString); + } FreePool (MacString); - FreePool (OldMenuString); + + // MU_CHANGE [END] - CodeQL change InitializeListHead (&Instance->Ip6NvData.ManualAddress); InitializeListHead (&Instance->Ip6NvData.GatewayAddress); diff --git a/NetworkPkg/Ip6Dxe/Ip6Output.c b/NetworkPkg/Ip6Dxe/Ip6Output.c index 1b1279c7024..e77903db513 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Output.c +++ b/NetworkPkg/Ip6Dxe/Ip6Output.c @@ -294,6 +294,10 @@ Ip6SelectInterface ( IP6_INTERFACE *IpIf; BOOLEAN Exist; + // MU_CHANGE [BEGIN] - CodeQL change + IpIf = NULL; + // MU_CHANGE [END] - CodeQL change + NET_CHECK_SIGNATURE (IpSb, IP6_SERVICE_SIGNATURE); ASSERT (Destination != NULL && Source != NULL); diff --git a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c index 5a75c17fca9..04aefa3480c 100644 --- a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c +++ b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c @@ -535,6 +535,12 @@ HttpIoSendChunkedTransfer ( } NewHeaders = AllocateZeroPool ((RequestMessage->HeaderCount + AddNewHeader) * sizeof (EFI_HTTP_HEADER)); + // MU_CHANGE [BEGIN] - CodeQL change + if (NewHeaders == NULL) { + return EFI_OUT_OF_RESOURCES; + } + + // MU_CHANGE [END] - CodeQL change CopyMem ((VOID *)NewHeaders, (VOID *)RequestMessage->Headers, RequestMessage->HeaderCount * sizeof (EFI_HTTP_HEADER)); if (AddNewHeader == 0) { // diff --git a/NetworkPkg/TcpDxe/TcpOutput.c b/NetworkPkg/TcpDxe/TcpOutput.c index d0862901fa4..b918fa09388 100644 --- a/NetworkPkg/TcpDxe/TcpOutput.c +++ b/NetworkPkg/TcpDxe/TcpOutput.c @@ -566,8 +566,14 @@ TcpGetSegmentSock ( // copy data to the segment. // Data = NetbufAllocSpace (Nbuf, Len, NET_BUF_TAIL); - ASSERT (Data != NULL); + // MU_CHANGE [BEGIN] - CodeQL change + if (Data == NULL) { + ASSERT (Data != NULL); + NetbufFree (Nbuf); + return NULL; + } + // MU_CHANGE [END] - CodeQL change DataGet = SockGetDataToSend (Tcb->Sk, 0, Len, Data); } diff --git a/NetworkPkg/VlanConfigDxe/VlanConfigImpl.c b/NetworkPkg/VlanConfigDxe/VlanConfigImpl.c index 6fae74f762e..0db9bf6949d 100644 --- a/NetworkPkg/VlanConfigDxe/VlanConfigImpl.c +++ b/NetworkPkg/VlanConfigDxe/VlanConfigImpl.c @@ -258,7 +258,13 @@ VlanCallback ( // Get Browser data // Configuration = AllocateZeroPool (sizeof (VLAN_CONFIGURATION)); - ASSERT (Configuration != NULL); + // MU_CHANGE [BEGIN] - CodeQL change + if (Configuration == NULL) { + ASSERT (Configuration != NULL); + return EFI_OUT_OF_RESOURCES; + } + + // MU_CHANGE [END] - CodeQL change HiiGetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *)Configuration); VlanConfig = PrivateData->VlanConfig;