MdeModulePkg/FrameBufferBltLib: Fix copying of unaligned memory

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiConfig.c

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index a588403017355547b8ce0d61830a456e3a2802af..62df367da78afb23e62d729ccb5a7a1f1638ba2d 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -205,11 +205,11 @@ IScsiParseIsIdFromString (
 \r
   IsIdStr = (CHAR16 *) String;\r
 \r
-  if (StrLen (IsIdStr) != 6) {\r
+  if (StrLen (IsIdStr) != 6 && StrLen (IsIdStr) != 12) {\r
     UnicodeSPrint (\r
       PortString,\r
       (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
-      L"Error! Input is incorrect, please input 6 hex numbers!\n"\r
+      L"Error! Only last 3 bytes are configurable, please input 6 hex numbers for last 3 bytes only or 12 hex numbers for full SSID!\n"\r
       );\r
 \r
     CreatePopUp (\r
@@ -222,6 +222,10 @@ IScsiParseIsIdFromString (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
+  if (StrLen (IsIdStr) == 12) {\r
+    IsIdStr += 6;\r
+  }\r
+\r
   for (Index = 3; Index < 6; Index++) {\r
     CopyMem (TempStr, IsIdStr, sizeof (TempStr));\r
     TempStr[2] = L'\0';\r
@@ -537,6 +541,7 @@ IScsiConvertAttemptConfigDataToIfrNvData (
     IScsiIpToStr (&Ip, FALSE, IfrNvData->SubnetMask);\r
     CopyMem (&Ip.v4, &SessionConfigData->Gateway, sizeof (EFI_IPv4_ADDRESS));\r
     IScsiIpToStr (&Ip, FALSE, IfrNvData->Gateway);\r
+    ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
     if (SessionConfigData->TargetIp.v4.Addr[0] != '\0') {\r
       CopyMem (&Ip.v4, &SessionConfigData->TargetIp, sizeof (EFI_IPv4_ADDRESS));\r
       IScsiIpToStr (&Ip, FALSE, IfrNvData->TargetIp);\r
@@ -745,14 +750,15 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
     }\r
     CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);\r
 \r
+    ZeroMem (IfrNvData->ISCSIMacAddr, sizeof (IfrNvData->ISCSIMacAddr));\r
     NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
       NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
       IScsiMacAddrToStr (\r
-      &NicInfo->PermanentAddress,\r
-      NicInfo->HwAddressSize,\r
-      NicInfo->VlanId,\r
-      MacString\r
-      );\r
+        &NicInfo->PermanentAddress,\r
+        NicInfo->HwAddressSize,\r
+        NicInfo->VlanId,\r
+        MacString\r
+        );\r
       CopyMem (\r
         IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),\r
         MacString,\r
@@ -760,7 +766,12 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
         );\r
 \r
       *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';\r
-     } \r
+    }\r
+\r
+    StringLen = StrLen (IfrNvData->ISCSIMacAddr);\r
+    if (StringLen > 0) {\r
+      *(IfrNvData->ISCSIMacAddr + StringLen - 1) = L'\0';\r
+    }\r
   }\r
 }\r
 \r
@@ -3411,6 +3422,9 @@ IScsiFormCallback (
   ISCSI_CONFIG_IFR_NVDATA     OldIfrNvData;\r
   EFI_STATUS                  Status;\r
   EFI_INPUT_KEY               Key;\r
+  ISCSI_NIC_INFO              *NicInfo;\r
+\r
+  NicInfo = NULL;\r
 \r
   if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
     //\r
@@ -3581,10 +3595,36 @@ IScsiFormCallback (
     case KEY_IP_MODE:\r
       switch (Value->u8) {\r
       case IP_MODE_IP6:\r
+        NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex); \r
+        if(NicInfo == NULL) {\r
+          break;\r
+        }\r
+\r
+        if(!NicInfo->Ipv6Available) {                  \r
+             //\r
+          // Current NIC doesn't Support IPv6, hence use IPv4.    \r
+          //    \r
+          IfrNvData->IpMode = IP_MODE_IP4;\r
+               \r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Current NIC doesn't Support IPv6!",\r
+            NULL\r
+            );\r
+        }\r
+         \r
       case IP_MODE_IP4:\r
+        ZeroMem (IfrNvData->LocalIp, sizeof (IfrNvData->LocalIp));\r
+        ZeroMem (IfrNvData->SubnetMask, sizeof (IfrNvData->SubnetMask));\r
+        ZeroMem (IfrNvData->Gateway, sizeof (IfrNvData->Gateway));\r
         ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
         Private->Current->AutoConfigureMode = 0;\r
-\r
+        ZeroMem (&Private->Current->SessionConfigData.LocalIp, sizeof (EFI_IP_ADDRESS));\r
+        ZeroMem (&Private->Current->SessionConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+        ZeroMem (&Private->Current->SessionConfigData.Gateway, sizeof (EFI_IP_ADDRESS));\r
+        ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (EFI_IP_ADDRESS));\r
+        \r
         break;\r
       }\r
 \r