Re: [edk2] [patch] NetworkPkg: Fix assert issue in iSCSI driver

2016-08-01 Thread Fu, Siyuan 
Reviewed-by: Fu Siyuan 



> -Original Message-
> From: Zhang, Lubo
> Sent: Monday, August 1, 2016 4:38 PM
> To: edk2-devel@lists.01.org
> Cc: Fu, Siyuan ; Ye, Ting ; Wu,
> Jiaxin 
> Subject: [patch] NetworkPkg: Fix assert issue in iSCSI driver
> 
> The bug is caused by using already freed memory.
> If there is already an attempt and execute
> 'reconnect -r' command, all the AttemptConfig structure
> will be freed, but the mCallbackInfo->Current is not
> configured as null and this pointer will be used again in
> IScsiFormExtractConfig.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Zhang Lubo 
> Cc: Fu Siyuan 
> Cc: Ye Ting 
> Cc: Wu Jiaxin 
> ---
>  NetworkPkg/IScsiDxe/IScsiMisc.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c
> b/NetworkPkg/IScsiDxe/IScsiMisc.c
> index deebf5d..a39c268 100644
> --- a/NetworkPkg/IScsiDxe/IScsiMisc.c
> +++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
> @@ -898,10 +898,12 @@ IScsiCleanDriverData (
> 
>  EXIT:
> 
>gBS->CloseEvent (Private->ExitBootServiceEvent);
> 
> +  mCallbackInfo->Current = NULL;
> +
>FreePool (Private);
>return Status;
>  }
> 
>  /**
> --
> 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: Fix assert issue in iSCSI driver

2016-08-01 Thread Ye, Ting 
Reviewed-by: Ye Ting  

-Original Message-
From: Zhang, Lubo 
Sent: Monday, August 01, 2016 4:38 PM
To: edk2-devel@lists.01.org
Cc: Fu, Siyuan ; Ye, Ting ; Wu, Jiaxin 

Subject: [patch] NetworkPkg: Fix assert issue in iSCSI driver

The bug is caused by using already freed memory.
If there is already an attempt and execute 'reconnect -r' command, all the 
AttemptConfig structure will be freed, but the mCallbackInfo->Current is not 
configured as null and this pointer will be used again in 
IScsiFormExtractConfig.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo 
Cc: Fu Siyuan 
Cc: Ye Ting 
Cc: Wu Jiaxin 
---
 NetworkPkg/IScsiDxe/IScsiMisc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c 
index deebf5d..a39c268 100644
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
@@ -898,10 +898,12 @@ IScsiCleanDriverData (
 
 EXIT:
 
   gBS->CloseEvent (Private->ExitBootServiceEvent);
 
+  mCallbackInfo->Current = NULL;
+
   FreePool (Private);
   return Status;
 }
 
 /**
--
1.9.5.msysgit.1

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

[edk2] [patch] NetworkPkg: Fix assert issue in iSCSI driver

2016-08-01 Thread Zhang Lubo 
The bug is caused by using already freed memory.
If there is already an attempt and execute
'reconnect -r' command, all the AttemptConfig structure
will be freed, but the mCallbackInfo->Current is not
configured as null and this pointer will be used again in
IScsiFormExtractConfig.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo 
Cc: Fu Siyuan 
Cc: Ye Ting 
Cc: Wu Jiaxin 
---
 NetworkPkg/IScsiDxe/IScsiMisc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
index deebf5d..a39c268 100644
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
@@ -898,10 +898,12 @@ IScsiCleanDriverData (
 
 EXIT:
 
   gBS->CloseEvent (Private->ExitBootServiceEvent);
 
+  mCallbackInfo->Current = NULL;
+
   FreePool (Private);
   return Status;
 }
 
 /**
-- 
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: Fix Assert issue in iSCSI driver.

2016-07-10 Thread Fu, Siyuan 
Reviewed-by: Fu Siyuan 


> -Original Message-
> From: Zhang, Lubo
> Sent: Friday, July 8, 2016 3:51 PM
> To: edk2-devel@lists.01.org
> Cc: Fu, Siyuan ; Ye, Ting ; Wu,
> Jiaxin 
> Subject: [patch] NetworkPkg: Fix Assert issue in iSCSI driver.
> 
> The bug existed in replacing AsciiStrToUnicodeStr with AsciiStrToUnicodeStrS,
> since MacString now is a pointer, the value sizeof(MacString)/sizeof
> (MacString[0])
> is not correct here as the third parameter.
> 
> Cc: Fu Siyuan 
> Cc: Ye Ting 
> Cc: Wu Jiaxin 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Zhang Lubo 
> ---
>  NetworkPkg/IScsiDxe/IScsiConfig.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c
> b/NetworkPkg/IScsiDxe/IScsiConfig.c
> index 8015e3d..3631e72 100644
> --- a/NetworkPkg/IScsiDxe/IScsiConfig.c
> +++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
> @@ -685,11 +685,11 @@ IScsiConvertIfrNvDataToAttemptConfigData (
>MacString = (CHAR16 *) AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN *
> sizeof (CHAR16));
>if (MacString == NULL) {
>  return EFI_OUT_OF_RESOURCES;
>}
> 
> -  AsciiStrToUnicodeStrS (Attempt->MacString, MacString, sizeof (MacString) /
> sizeof (MacString[0]));
> +  AsciiStrToUnicodeStrS (Attempt->MacString, MacString,
> ISCSI_MAX_MAC_STRING_LEN);
> 
>UnicodeSPrint (
>  mPrivate->PortString,
>  (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
>  L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP
> version: %s",
> --
> 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: Fix Assert issue in iSCSI driver.

2016-07-08 Thread Ye, Ting 
Reviewed-by: Ye Ting <ting...@intel.com> 

-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Zhang 
Lubo
Sent: Friday, July 8, 2016 3:51 PM
To: edk2-devel@lists.01.org
Cc: Ye, Ting <ting...@intel.com>; Fu, Siyuan <siyuan...@intel.com>; Wu, Jiaxin 
<jiaxin...@intel.com>
Subject: [edk2] [patch] NetworkPkg: Fix Assert issue in iSCSI driver.

The bug existed in replacing AsciiStrToUnicodeStr with AsciiStrToUnicodeStrS, 
since MacString now is a pointer, the value sizeof(MacString)/sizeof 
(MacString[0]) is not correct here as the third parameter.

Cc: Fu Siyuan <siyuan...@intel.com>
Cc: Ye Ting <ting...@intel.com>
Cc: Wu Jiaxin <jiaxin...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zh...@intel.com>
---
 NetworkPkg/IScsiDxe/IScsiConfig.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c 
b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 8015e3d..3631e72 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -685,11 +685,11 @@ IScsiConvertIfrNvDataToAttemptConfigData (
   MacString = (CHAR16 *) AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN * sizeof 
(CHAR16));
   if (MacString == NULL) {
 return EFI_OUT_OF_RESOURCES;
   }
 
-  AsciiStrToUnicodeStrS (Attempt->MacString, MacString, sizeof (MacString) / 
sizeof (MacString[0]));
+  AsciiStrToUnicodeStrS (Attempt->MacString, MacString, 
+ ISCSI_MAX_MAC_STRING_LEN);
 
   UnicodeSPrint (
 mPrivate->PortString,
 (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
 L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",
--
1.9.5.msysgit.1

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

Re: [edk2] [patch] NetworkPkg: Fix Assert issue in iSCSI driver.

2016-07-08 Thread Zeng, Star 
Reviewed-by: Star Zeng <star.z...@intel.com>

-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Zhang 
Lubo
Sent: Friday, July 8, 2016 3:51 PM
To: edk2-devel@lists.01.org
Cc: Ye, Ting <ting...@intel.com>; Fu, Siyuan <siyuan...@intel.com>; Wu, Jiaxin 
<jiaxin...@intel.com>
Subject: [edk2] [patch] NetworkPkg: Fix Assert issue in iSCSI driver.

The bug existed in replacing AsciiStrToUnicodeStr with AsciiStrToUnicodeStrS, 
since MacString now is a pointer, the value sizeof(MacString)/sizeof 
(MacString[0]) is not correct here as the third parameter.

Cc: Fu Siyuan <siyuan...@intel.com>
Cc: Ye Ting <ting...@intel.com>
Cc: Wu Jiaxin <jiaxin...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zh...@intel.com>
---
 NetworkPkg/IScsiDxe/IScsiConfig.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c 
b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 8015e3d..3631e72 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -685,11 +685,11 @@ IScsiConvertIfrNvDataToAttemptConfigData (
   MacString = (CHAR16 *) AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN * sizeof 
(CHAR16));
   if (MacString == NULL) {
 return EFI_OUT_OF_RESOURCES;
   }
 
-  AsciiStrToUnicodeStrS (Attempt->MacString, MacString, sizeof (MacString) / 
sizeof (MacString[0]));
+  AsciiStrToUnicodeStrS (Attempt->MacString, MacString, 
+ ISCSI_MAX_MAC_STRING_LEN);
 
   UnicodeSPrint (
 mPrivate->PortString,
 (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
 L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",
--
1.9.5.msysgit.1

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

Re: [edk2] [patch] NetworkPkg: Fix Assert issue in iSCSI driver.

2016-07-08 Thread Wu, Jiaxin 
Reviewed-By: Wu Jiaxin 

Best Regards!
Jiaxin

> -Original Message-
> From: Zhang, Lubo
> Sent: Friday, July 8, 2016 3:51 PM
> To: edk2-devel@lists.01.org
> Cc: Fu, Siyuan ; Ye, Ting ; Wu,
> Jiaxin 
> Subject: [patch] NetworkPkg: Fix Assert issue in iSCSI driver.
> 
> The bug existed in replacing AsciiStrToUnicodeStr with AsciiStrToUnicodeStrS,
> since MacString now is a pointer, the value sizeof(MacString)/sizeof
> (MacString[0]) is not correct here as the third parameter.
> 
> Cc: Fu Siyuan 
> Cc: Ye Ting 
> Cc: Wu Jiaxin 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Zhang Lubo 
> ---
>  NetworkPkg/IScsiDxe/IScsiConfig.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c
> b/NetworkPkg/IScsiDxe/IScsiConfig.c
> index 8015e3d..3631e72 100644
> --- a/NetworkPkg/IScsiDxe/IScsiConfig.c
> +++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
> @@ -685,11 +685,11 @@ IScsiConvertIfrNvDataToAttemptConfigData (
>MacString = (CHAR16 *) AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN *
> sizeof (CHAR16));
>if (MacString == NULL) {
>  return EFI_OUT_OF_RESOURCES;
>}
> 
> -  AsciiStrToUnicodeStrS (Attempt->MacString, MacString, sizeof (MacString)
> / sizeof (MacString[0]));
> +  AsciiStrToUnicodeStrS (Attempt->MacString, MacString,
> + ISCSI_MAX_MAC_STRING_LEN);
> 
>UnicodeSPrint (
>  mPrivate->PortString,
>  (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
>  L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP
> version: %s",
> --
> 1.9.5.msysgit.1

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

[edk2] [patch] NetworkPkg: Fix Assert issue in iSCSI driver.

2016-07-08 Thread Zhang Lubo 
The bug existed in replacing AsciiStrToUnicodeStr with AsciiStrToUnicodeStrS,
since MacString now is a pointer, the value sizeof(MacString)/sizeof 
(MacString[0])
is not correct here as the third parameter.

Cc: Fu Siyuan 
Cc: Ye Ting 
Cc: Wu Jiaxin 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo 
---
 NetworkPkg/IScsiDxe/IScsiConfig.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c 
b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 8015e3d..3631e72 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -685,11 +685,11 @@ IScsiConvertIfrNvDataToAttemptConfigData (
   MacString = (CHAR16 *) AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN * sizeof 
(CHAR16));
   if (MacString == NULL) {
 return EFI_OUT_OF_RESOURCES;
   }
 
-  AsciiStrToUnicodeStrS (Attempt->MacString, MacString, sizeof (MacString) / 
sizeof (MacString[0]));
+  AsciiStrToUnicodeStrS (Attempt->MacString, MacString, 
ISCSI_MAX_MAC_STRING_LEN);
 
   UnicodeSPrint (
 mPrivate->PortString,
 (UINTN) ISCSI_NAME_IFR_MAX_SIZE,
 L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",
-- 
1.9.5.msysgit.1

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