From df7ce74e6c75e19a528d5b4921e5b3d0260e45fe Mon Sep 17 00:00:00 2001 From: Abner Chang Date: Fri, 28 Oct 2022 18:16:55 +0800 Subject: [PATCH] RedfishPkg/RedfishDiscoverDxe: Fix memory free issue Check the memory block pointer before freeing it. Cc: Nickle Wang Cc: Igor Kulchytskyy Signed-off-by: Abner Chang Reviewed-by: Nickle Wang --- .../RedfishDiscoverDxe/RedfishDiscoverDxe.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c index 1293ddd633..042d6d5fd5 100644 --- a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c +++ b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c @@ -261,6 +261,7 @@ Tcp6GetSubnetInfo ( Tcp6 = (EFI_TCP6_PROTOCOL *)Instance->NetworkInterfaceProtocolInfo.NetworkProtocolInterface; + ZeroMem ((VOID *)&IpModedata, sizeof (EFI_IP6_MODE_DATA)); Status = Tcp6->GetModeData (Tcp6, NULL, NULL, &IpModedata, NULL, NULL); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a: Can't get IP mode data information\n", __FUNCTION__)); @@ -282,12 +283,15 @@ Tcp6GetSubnetInfo ( } Instance->SubnetAddrInfoIPv6Number = IpModedata.AddressCount; - CopyMem ( - (VOID *)Instance->SubnetAddrInfoIPv6, - (VOID *)&IpModedata.AddressList, - IpModedata.AddressCount * sizeof (EFI_IP6_ADDRESS_INFO) - ); - FreePool (IpModedata.AddressList); + if ((IpModedata.AddressCount != 0) && (IpModedata.AddressList != NULL)) { + CopyMem ( + (VOID *)Instance->SubnetAddrInfoIPv6, + (VOID *)&IpModedata.AddressList, + IpModedata.AddressCount * sizeof (EFI_IP6_ADDRESS_INFO) + ); + FreePool (IpModedata.AddressList); + } + return EFI_SUCCESS; }