1. Patchew
  2. EDK2
  3. View series

[edk2] [patch] NetworkPkg: Add check logic for iSCSI driver.

Zhang Lubo posted 1 patch 7 years ago
Failed in applying to current master (apply log)
NetworkPkg/IScsiDxe/IScsiConfig.c            | 30 ++++++++++++++--------------
NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h |  2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
[edk2] [patch] NetworkPkg: Add check logic for iSCSI driver.
Posted by Zhang Lubo 7 years ago 
Need to check variable of mPrivate whether is
null before used and redefine the array length
of target address for keyword.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
---
 NetworkPkg/IScsiDxe/IScsiConfig.c            | 30 ++++++++++++++--------------
 NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 56a8685..a588403 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -742,28 +742,28 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
           ISCSI_CHAP_SECRET_STORAGE
           );
       }
     }
     CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);
-  }
 
-  NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {
-    NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);
-    IScsiMacAddrToStr (
-    &NicInfo->PermanentAddress,
-    NicInfo->HwAddressSize,
-    NicInfo->VlanId,
-    MacString
-    );
-    CopyMem (
-      IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),
-      MacString,
-      StrLen (MacString) * sizeof (CHAR16)
+    NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {
+      NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);
+      IScsiMacAddrToStr (
+      &NicInfo->PermanentAddress,
+      NicInfo->HwAddressSize,
+      NicInfo->VlanId,
+      MacString
       );
+      CopyMem (
+        IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),
+        MacString,
+        StrLen (MacString) * sizeof (CHAR16)
+        );
 
-    *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';
-   }
+      *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';
+     } 
+  }
 }
 
 /**
   Convert the IFR data to iSCSI configuration data.
 
diff --git a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
index f89f320..22119ad 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -160,11 +160,11 @@ typedef struct {
   CHAR16  ISCSIIsId[ISID_CONFIGURABLE_STORAGE];
   CHAR16  ISCSIInitiatorIpAddress[IP4_STR_MAX_SIZE];
   CHAR16  ISCSIInitiatorNetmask[IP4_STR_MAX_SIZE];
   CHAR16  ISCSIInitiatorGateway[IP4_STR_MAX_SIZE];
   CHAR16  ISCSITargetName[ISCSI_NAME_MAX_SIZE];
-  CHAR16  ISCSITargetIpAddress[IP_STR_MAX_SIZE];
+  CHAR16  ISCSITargetIpAddress[ISCSI_TARGET_URI_MAX_SIZE];
   CHAR16  ISCSILun[ISCSI_LUN_STR_MAX_LEN];
   CHAR16  ISCSIChapUsername[ISCSI_CHAP_NAME_STORAGE];
   CHAR16  ISCSIChapSecret[ISCSI_CHAP_SECRET_STORAGE];
   CHAR16  ISCSIReverseChapUsername[ISCSI_CHAP_NAME_STORAGE];
   CHAR16  ISCSIReverseChapSecret[ISCSI_CHAP_SECRET_STORAGE];
-- 
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [patch] NetworkPkg: Add check logic for iSCSI driver.
Posted by Wu, Jiaxin 7 years ago 
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>

Thanks,
Jiaxin

> -----Original Message-----
> From: Zhang, Lubo
> Sent: Thursday, April 6, 2017 4:58 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Ye, Ting <ting.ye@intel.com>; Fu,
> Siyuan <siyuan.fu@intel.com>
> Subject: [patch] NetworkPkg: Add check logic for iSCSI driver.
> 
> Need to check variable of mPrivate whether is
> null before used and redefine the array length
> of target address for keyword.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Fu Siyuan <siyuan.fu@intel.com>
> ---
>  NetworkPkg/IScsiDxe/IScsiConfig.c            | 30 ++++++++++++++--------------
>  NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h |  2 +-
>  2 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c
> b/NetworkPkg/IScsiDxe/IScsiConfig.c
> index 56a8685..a588403 100644
> --- a/NetworkPkg/IScsiDxe/IScsiConfig.c
> +++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
> @@ -742,28 +742,28 @@
> IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
>            ISCSI_CHAP_SECRET_STORAGE
>            );
>        }
>      }
>      CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList,
> ATTEMPT_NAME_LIST_SIZE);
> -  }
> 
> -  NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {
> -    NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);
> -    IScsiMacAddrToStr (
> -    &NicInfo->PermanentAddress,
> -    NicInfo->HwAddressSize,
> -    NicInfo->VlanId,
> -    MacString
> -    );
> -    CopyMem (
> -      IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),
> -      MacString,
> -      StrLen (MacString) * sizeof (CHAR16)
> +    NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {
> +      NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);
> +      IScsiMacAddrToStr (
> +      &NicInfo->PermanentAddress,
> +      NicInfo->HwAddressSize,
> +      NicInfo->VlanId,
> +      MacString
>        );
> +      CopyMem (
> +        IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),
> +        MacString,
> +        StrLen (MacString) * sizeof (CHAR16)
> +        );
> 
> -    *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';
> -   }
> +      *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';
> +     }
> +  }
>  }
> 
>  /**
>    Convert the IFR data to iSCSI configuration data.
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
> b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
> index f89f320..22119ad 100644
> --- a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
> +++ b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
> @@ -160,11 +160,11 @@ typedef struct {
>    CHAR16  ISCSIIsId[ISID_CONFIGURABLE_STORAGE];
>    CHAR16  ISCSIInitiatorIpAddress[IP4_STR_MAX_SIZE];
>    CHAR16  ISCSIInitiatorNetmask[IP4_STR_MAX_SIZE];
>    CHAR16  ISCSIInitiatorGateway[IP4_STR_MAX_SIZE];
>    CHAR16  ISCSITargetName[ISCSI_NAME_MAX_SIZE];
> -  CHAR16  ISCSITargetIpAddress[IP_STR_MAX_SIZE];
> +  CHAR16  ISCSITargetIpAddress[ISCSI_TARGET_URI_MAX_SIZE];
>    CHAR16  ISCSILun[ISCSI_LUN_STR_MAX_LEN];
>    CHAR16  ISCSIChapUsername[ISCSI_CHAP_NAME_STORAGE];
>    CHAR16  ISCSIChapSecret[ISCSI_CHAP_SECRET_STORAGE];
>    CHAR16  ISCSIReverseChapUsername[ISCSI_CHAP_NAME_STORAGE];
>    CHAR16  ISCSIReverseChapSecret[ISCSI_CHAP_SECRET_STORAGE];
> --
> 1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [patch] NetworkPkg: Add check logic for iSCSI driver.
Posted by Ye, Ting 7 years ago 
Reviewed-by: Ye Ting <ting.ye@intel.com> 

-----Original Message-----
From: Zhang, Lubo 
Sent: Thursday, April 06, 2017 4:58 PM
To: edk2-devel@lists.01.org
Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>
Subject: [patch] NetworkPkg: Add check logic for iSCSI driver.

Need to check variable of mPrivate whether is null before used and redefine the array length of target address for keyword.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
---
 NetworkPkg/IScsiDxe/IScsiConfig.c            | 30 ++++++++++++++--------------
 NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 56a8685..a588403 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -742,28 +742,28 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
           ISCSI_CHAP_SECRET_STORAGE
           );
       }
     }
     CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);
-  }
 
-  NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {
-    NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);
-    IScsiMacAddrToStr (
-    &NicInfo->PermanentAddress,
-    NicInfo->HwAddressSize,
-    NicInfo->VlanId,
-    MacString
-    );
-    CopyMem (
-      IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),
-      MacString,
-      StrLen (MacString) * sizeof (CHAR16)
+    NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {
+      NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);
+      IScsiMacAddrToStr (
+      &NicInfo->PermanentAddress,
+      NicInfo->HwAddressSize,
+      NicInfo->VlanId,
+      MacString
       );
+      CopyMem (
+        IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),
+        MacString,
+        StrLen (MacString) * sizeof (CHAR16)
+        );
 
-    *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';
-   }
+      *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';
+     }
+  }
 }
 
 /**
   Convert the IFR data to iSCSI configuration data.
 
diff --git a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
index f89f320..22119ad 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/NetworkPkg/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -160,11 +160,11 @@ typedef struct {
   CHAR16  ISCSIIsId[ISID_CONFIGURABLE_STORAGE];
   CHAR16  ISCSIInitiatorIpAddress[IP4_STR_MAX_SIZE];
   CHAR16  ISCSIInitiatorNetmask[IP4_STR_MAX_SIZE];
   CHAR16  ISCSIInitiatorGateway[IP4_STR_MAX_SIZE];
   CHAR16  ISCSITargetName[ISCSI_NAME_MAX_SIZE];
-  CHAR16  ISCSITargetIpAddress[IP_STR_MAX_SIZE];
+  CHAR16  ISCSITargetIpAddress[ISCSI_TARGET_URI_MAX_SIZE];
   CHAR16  ISCSILun[ISCSI_LUN_STR_MAX_LEN];
   CHAR16  ISCSIChapUsername[ISCSI_CHAP_NAME_STORAGE];
   CHAR16  ISCSIChapSecret[ISCSI_CHAP_SECRET_STORAGE];
   CHAR16  ISCSIReverseChapUsername[ISCSI_CHAP_NAME_STORAGE];
   CHAR16  ISCSIReverseChapSecret[ISCSI_CHAP_SECRET_STORAGE];
--
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.