[edk2-devel] [PATCH EDK2 v1 1/1] NetworkPkg/Ip4Dxe:Null-checking before dereference

[wenyi,xie via groups.io]

Null-checking first before a pointer is dereferenced.

Cc: Maciej Rabeda <maciej.rabeda at linux.intel.com>
Cc: Siyuan Fu <siyuan.fu at intel.com>
Signed-off-by: Wenyi Xie <xiewenyi2 at huawei.com>
---
 NetworkPkg/Ip4Dxe/Ip4Config2Nv.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c
index e0b6a4d4a92f..b96e11bdabba 100644
--- a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c
@@ -397,16 +397,16 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   UINTN                           DnsCount;
   EFI_IPv4_ADDRESS                *DnsAddress;
 
+  if ((IfrNvData == NULL) || (Instance == NULL)) {
+    return EFI_INVALID_PARAMETER;
+  }
+
   Status      = EFI_SUCCESS;
   Ip4Config2  = &Instance->Ip4Config2;
   Ip4Info     = NULL;
   DnsAddress  = NULL;
   GatewaySize = sizeof (EFI_IPv4_ADDRESS);
 
-  if ((IfrNvData == NULL) || (Instance == NULL)) {
-    return EFI_INVALID_PARAMETER;
-  }
-
   NET_CHECK_SIGNATURE (Instance, IP4_CONFIG2_INSTANCE_SIGNATURE);
 
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);
@@ -571,6 +571,10 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
   UINTN          DataSize;
   EFI_INPUT_KEY  Key;
 
+  if ((Instance == NULL) || (IfrFormNvData == NULL)) {
+    return EFI_INVALID_PARAMETER;
+  }
+
   Status    = EFI_SUCCESS;
   Ip4Cfg2   = &Instance->Ip4Config2;
   Ip4NvData = &Instance->Ip4NvData;
@@ -581,10 +585,6 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
   TimeoutEvent    = NULL;
   SetAddressEvent = NULL;
 
-  if ((Instance == NULL) || (IfrFormNvData == NULL)) {
-    return EFI_INVALID_PARAMETER;
-  }
-
   if (IfrFormNvData->Configure != TRUE) {
     return EFI_SUCCESS;
   }
-- 
2.20.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#99247): https://edk2.groups.io/g/devel/message/99247
Mute This Topic: https://groups.io/mt/96598978/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-