[PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network device MAC display issue

[PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network device MAC display issue

[Jiaxin Wu]

v2:
* Define new STR_FORM_NETWORK_DEVICE_TITLE_HEAD for L" Network Device "
instead of hard code in the code.

Network device tile (STR_FORM_NETWORK_DEVICE_TITLE) is dynamic adjusted
according the different MAC value. So, the string value shouldn't be treated
as a constant string (Network Device). Otherwise, the display will be
incorrect.

Reproduce: Device Manager->Network Device List, select to enter MAC, then to
press ESC back to previous page, then re-enter, found each enter/ESC operation,
the MAC address display +1.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
---
 MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c          | 8 ++++----
 MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
index 5098b70..d2d3d76 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
@@ -538,16 +538,16 @@ CreateDeviceManagerForm(
 
   //
   // Update the network device form titile.
   //
   if (NextShowFormId == NETWORK_DEVICE_FORM_ID) {
-    String = HiiGetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NULL);
-    NewStringLen = StrLen(mSelectedMacAddrString) * 2;
-    NewStringLen += (StrLen(String) + 2) * 2;
+    String = HiiGetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE_HEAD), NULL);
+    NewStringLen = StrLen (mSelectedMacAddrString) * 2;
+    NewStringLen += (StrLen (String) + 2) * 2;
     NewStringTitle = AllocatePool (NewStringLen);
     UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String, mSelectedMacAddrString);
-    HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);    
+    HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
     FreePool (String);
     FreePool (NewStringTitle);
   }
 
   //
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
index 061e4be..55d03d6 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
@@ -1,10 +1,10 @@
 ///** @file
 //
 //  String definitions for the Device Manager.
 //
-//  Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+//  Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
 //  This program and the accompanying materials
 //  are licensed and made available under the terms and conditions of the BSD License
 //  which accompanies this distribution.  The full text of the license may be found at
 //  http://opensource.org/licenses/bsd-license.php
 //  
@@ -40,11 +40,12 @@
                                        #language fr-FR  "Missing String"
 #string STR_EMPTY_STRING               #language en-US  ""
                                        #language fr-FR  ""
 #string STR_EXIT_STRING                #language en-US  "Press ESC to exit."
                                        #language fr-FR  "Press ESC to exit."
-#string STR_FORM_NETWORK_DEVICE_TITLE  #language en-US  "Network Device"
+#string STR_FORM_NETWORK_DEVICE_TITLE_HEAD  #language en-US  "Network Device"
+#string STR_FORM_NETWORK_DEVICE_TITLE       #language en-US  "Network Device"
                                        #language fr-FR  "Network Device"
 #string STR_FORM_NETWORK_DEVICE_HELP   #language en-US  "Network Device Help..."
                                        #language fr-FR  "Network Device Help..."
 #string STR_NETWORK_DEVICE_STRING      #language en-US  "Network Device"
                                        #language fr-FR  "Network Device"
-- 
1.9.5.msysgit.1

[Patch] MdeModulePkg/Mtftp4Dxe: Add invalid ServerIp check during MTFTP configuration

[Jiaxin Wu]

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
---
 MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 5494231..54384e1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -1,10 +1,10 @@
 /** @file
   Interface routine for Mtftp4.
   
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php<BR>
 
@@ -665,10 +665,14 @@ EfiMtftp4Configure (
     Ip       = NTOHL (Ip);
     Netmask  = NTOHL (Netmask);
     Gateway  = NTOHL (Gateway);
     ServerIp = NTOHL (ServerIp);
 
+    if (ServerIp == 0 || IP4_IS_LOCAL_BROADCAST (ServerIp)) {
+      return EFI_INVALID_PARAMETER;
+    }
+
     if (!ConfigData->UseDefaultSetting &&
         ((!IP4_IS_VALID_NETMASK (Netmask) || (Netmask != 0 && !NetIp4IsUnicast (Ip, Netmask))))) {
 
       return EFI_INVALID_PARAMETER;
     }
-- 
1.9.5.msysgit.1

Re: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network device MAC display issue

[Fu, Siyuan]

Hi, Jiaxin

Do we also need to add the lang "fr-FR" for STR_FORM_NETWORK_DEVICE_TITLE_HEAD?


-----Original Message-----
From: Wu, Jiaxin 
Sent: 2017年4月21日 10:21
To: edk2-devel@lists.01.org
Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
Subject: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network device MAC display issue

v2:
* Define new STR_FORM_NETWORK_DEVICE_TITLE_HEAD for L" Network Device "
instead of hard code in the code.

Network device tile (STR_FORM_NETWORK_DEVICE_TITLE) is dynamic adjusted according the different MAC value. So, the string value shouldn't be treated as a constant string (Network Device). Otherwise, the display will be incorrect.

Reproduce: Device Manager->Network Device List, select to enter MAC, then to press ESC back to previous page, then re-enter, found each enter/ESC operation, the MAC address display +1.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
---
 MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c          | 8 ++++----
 MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
index 5098b70..d2d3d76 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
@@ -538,16 +538,16 @@ CreateDeviceManagerForm(
 
   //
   // Update the network device form titile.
   //
   if (NextShowFormId == NETWORK_DEVICE_FORM_ID) {
-    String = HiiGetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NULL);
-    NewStringLen = StrLen(mSelectedMacAddrString) * 2;
-    NewStringLen += (StrLen(String) + 2) * 2;
+    String = HiiGetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE_HEAD), NULL);
+    NewStringLen = StrLen (mSelectedMacAddrString) * 2;
+    NewStringLen += (StrLen (String) + 2) * 2;
     NewStringTitle = AllocatePool (NewStringLen);
     UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String, mSelectedMacAddrString);
-    HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);    
+    HiiSetString (HiiHandle, STRING_TOKEN 
+ (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
     FreePool (String);
     FreePool (NewStringTitle);
   }
 
   //
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
index 061e4be..55d03d6 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
@@ -1,10 +1,10 @@
 ///** @file
 //
 //  String definitions for the Device Manager.
 //
-//  Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+//  Copyright (c) 2004 - 2017, Intel Corporation. All rights 
+reserved.<BR>
 //  This program and the accompanying materials  //  are licensed and made available under the terms and conditions of the BSD License  //  which accompanies this distribution.  The full text of the license may be found at  //  http://opensource.org/licenses/bsd-license.php
 //
@@ -40,11 +40,12 @@
                                        #language fr-FR  "Missing String"
 #string STR_EMPTY_STRING               #language en-US  ""
                                        #language fr-FR  ""
 #string STR_EXIT_STRING                #language en-US  "Press ESC to exit."
                                        #language fr-FR  "Press ESC to exit."
-#string STR_FORM_NETWORK_DEVICE_TITLE  #language en-US  "Network Device"
+#string STR_FORM_NETWORK_DEVICE_TITLE_HEAD  #language en-US  "Network Device"
+#string STR_FORM_NETWORK_DEVICE_TITLE       #language en-US  "Network Device"
                                        #language fr-FR  "Network Device"
 #string STR_FORM_NETWORK_DEVICE_HELP   #language en-US  "Network Device Help..."
                                        #language fr-FR  "Network Device Help..."
 #string STR_NETWORK_DEVICE_STRING      #language en-US  "Network Device"
                                        #language fr-FR  "Network Device"
--
1.9.5.msysgit.1

Re: [Patch] MdeModulePkg/Mtftp4Dxe: Add invalid ServerIp check during MTFTP configuration

[Fu, Siyuan]

Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>

-----Original Message-----
From: Wu, Jiaxin 
Sent: 2017年4月21日 10:21
To: edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
Subject: [Patch] MdeModulePkg/Mtftp4Dxe: Add invalid ServerIp check during MTFTP configuration

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
---
 MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 5494231..54384e1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -1,10 +1,10 @@
 /** @file
   Interface routine for Mtftp4.
   
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR> -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials  are licensed and made available under the terms and conditions of the BSD License  which accompanies this distribution.  The full text of the license may be found at  http://opensource.org/licenses/bsd-license.php<BR>
 
@@ -665,10 +665,14 @@ EfiMtftp4Configure (
     Ip       = NTOHL (Ip);
     Netmask  = NTOHL (Netmask);
     Gateway  = NTOHL (Gateway);
     ServerIp = NTOHL (ServerIp);
 
+    if (ServerIp == 0 || IP4_IS_LOCAL_BROADCAST (ServerIp)) {
+      return EFI_INVALID_PARAMETER;
+    }
+
     if (!ConfigData->UseDefaultSetting &&
         ((!IP4_IS_VALID_NETMASK (Netmask) || (Netmask != 0 && !NetIp4IsUnicast (Ip, Netmask))))) {
 
       return EFI_INVALID_PARAMETER;
     }
--
1.9.5.msysgit.1

Re: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network device MAC display issue

[Wu, Jiaxin]

I think it's not necessary.

Eric, what do you think?

Thanks,
Jiaxin 

> -----Original Message-----
> From: Fu, Siyuan
> Sent: Friday, April 21, 2017 10:25 AM
> To: Wu, Jiaxin <jiaxin.wu@intel.com>; edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>
> Subject: RE: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the
> network device MAC display issue
> 
> Hi, Jiaxin
> 
> Do we also need to add the lang "fr-FR" for
> STR_FORM_NETWORK_DEVICE_TITLE_HEAD?
> 
> 
> -----Original Message-----
> From: Wu, Jiaxin
> Sent: 2017年4月21日 10:21
> To: edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>; Fu,
> Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network
> device MAC display issue
> 
> v2:
> * Define new STR_FORM_NETWORK_DEVICE_TITLE_HEAD for L" Network
> Device "
> instead of hard code in the code.
> 
> Network device tile (STR_FORM_NETWORK_DEVICE_TITLE) is dynamic
> adjusted according the different MAC value. So, the string value shouldn't be
> treated as a constant string (Network Device). Otherwise, the display will be
> incorrect.
> 
> Reproduce: Device Manager->Network Device List, select to enter MAC,
> then to press ESC back to previous page, then re-enter, found each
> enter/ESC operation, the MAC address display +1.
> 
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Fu Siyuan <siyuan.fu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
> ---
>  MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c          | 8
> ++++----
>  MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni | 5
> +++--
>  2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> index 5098b70..d2d3d76 100644
> --- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> +++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> @@ -538,16 +538,16 @@ CreateDeviceManagerForm(
> 
>    //
>    // Update the network device form titile.
>    //
>    if (NextShowFormId == NETWORK_DEVICE_FORM_ID) {
> -    String = HiiGetString (HiiHandle, STRING_TOKEN
> (STR_FORM_NETWORK_DEVICE_TITLE), NULL);
> -    NewStringLen = StrLen(mSelectedMacAddrString) * 2;
> -    NewStringLen += (StrLen(String) + 2) * 2;
> +    String = HiiGetString (HiiHandle, STRING_TOKEN
> (STR_FORM_NETWORK_DEVICE_TITLE_HEAD), NULL);
> +    NewStringLen = StrLen (mSelectedMacAddrString) * 2;
> +    NewStringLen += (StrLen (String) + 2) * 2;
>      NewStringTitle = AllocatePool (NewStringLen);
>      UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String,
> mSelectedMacAddrString);
> -    HiiSetString (HiiHandle, STRING_TOKEN
> (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
> +    HiiSetString (HiiHandle, STRING_TOKEN
> + (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
>      FreePool (String);
>      FreePool (NewStringTitle);
>    }
> 
>    //
> diff --git
> a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> index 061e4be..55d03d6 100644
> ---
> a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> +++
> b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> @@ -1,10 +1,10 @@
>  ///** @file
>  //
>  //  String definitions for the Device Manager.
>  //
> -//  Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
> +//  Copyright (c) 2004 - 2017, Intel Corporation. All rights
> +reserved.<BR>
>  //  This program and the accompanying materials  //  are licensed and made
> available under the terms and conditions of the BSD License  //  which
> accompanies this distribution.  The full text of the license may be found at  //
> http://opensource.org/licenses/bsd-license.php
>  //
> @@ -40,11 +40,12 @@
>                                         #language fr-FR  "Missing String"
>  #string STR_EMPTY_STRING               #language en-US  ""
>                                         #language fr-FR  ""
>  #string STR_EXIT_STRING                #language en-US  "Press ESC to exit."
>                                         #language fr-FR  "Press ESC to exit."
> -#string STR_FORM_NETWORK_DEVICE_TITLE  #language en-US  "Network
> Device"
> +#string STR_FORM_NETWORK_DEVICE_TITLE_HEAD  #language en-US
> "Network Device"
> +#string STR_FORM_NETWORK_DEVICE_TITLE       #language en-US
> "Network Device"
>                                         #language fr-FR  "Network Device"
>  #string STR_FORM_NETWORK_DEVICE_HELP   #language en-US  "Network
> Device Help..."
>                                         #language fr-FR  "Network Device Help..."
>  #string STR_NETWORK_DEVICE_STRING      #language en-US  "Network
> Device"
>                                         #language fr-FR  "Network Device"
> --
> 1.9.5.msysgit.1

Re: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network device MAC display issue

[Fu, Siyuan]

Jiaxin,

I think the HiiGetString() will return NULL pointer if the string is not present, then the code will ASSERT in the following StrLen() function.
  @retval NULL   The string specified by StringId is not present in the string package.
  @retval Other  The string was returned.

Siyuan

-----Original Message-----
From: Wu, Jiaxin 
Sent: 2017年4月21日 10:27
To: Fu, Siyuan <siyuan.fu@intel.com>; edk2-devel@lists.01.org
Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>
Subject: RE: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network device MAC display issue

I think it's not necessary.

Eric, what do you think?

Thanks,
Jiaxin 

> -----Original Message-----
> From: Fu, Siyuan
> Sent: Friday, April 21, 2017 10:25 AM
> To: Wu, Jiaxin <jiaxin.wu@intel.com>; edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>
> Subject: RE: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the 
> network device MAC display issue
> 
> Hi, Jiaxin
> 
> Do we also need to add the lang "fr-FR" for 
> STR_FORM_NETWORK_DEVICE_TITLE_HEAD?
> 
> 
> -----Original Message-----
> From: Wu, Jiaxin
> Sent: 2017年4月21日 10:21
> To: edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>; 
> Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network 
> device MAC display issue
> 
> v2:
> * Define new STR_FORM_NETWORK_DEVICE_TITLE_HEAD for L" Network Device 
> "
> instead of hard code in the code.
> 
> Network device tile (STR_FORM_NETWORK_DEVICE_TITLE) is dynamic 
> adjusted according the different MAC value. So, the string value 
> shouldn't be treated as a constant string (Network Device). Otherwise, 
> the display will be incorrect.
> 
> Reproduce: Device Manager->Network Device List, select to enter MAC, 
> then to press ESC back to previous page, then re-enter, found each 
> enter/ESC operation, the MAC address display +1.
> 
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Fu Siyuan <siyuan.fu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
> ---
>  MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c          | 8
> ++++----
>  MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni | 5
> +++--
>  2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> index 5098b70..d2d3d76 100644
> --- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> +++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> @@ -538,16 +538,16 @@ CreateDeviceManagerForm(
> 
>    //
>    // Update the network device form titile.
>    //
>    if (NextShowFormId == NETWORK_DEVICE_FORM_ID) {
> -    String = HiiGetString (HiiHandle, STRING_TOKEN
> (STR_FORM_NETWORK_DEVICE_TITLE), NULL);
> -    NewStringLen = StrLen(mSelectedMacAddrString) * 2;
> -    NewStringLen += (StrLen(String) + 2) * 2;
> +    String = HiiGetString (HiiHandle, STRING_TOKEN
> (STR_FORM_NETWORK_DEVICE_TITLE_HEAD), NULL);
> +    NewStringLen = StrLen (mSelectedMacAddrString) * 2;
> +    NewStringLen += (StrLen (String) + 2) * 2;
>      NewStringTitle = AllocatePool (NewStringLen);
>      UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String, 
> mSelectedMacAddrString);
> -    HiiSetString (HiiHandle, STRING_TOKEN
> (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
> +    HiiSetString (HiiHandle, STRING_TOKEN 
> + (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
>      FreePool (String);
>      FreePool (NewStringTitle);
>    }
> 
>    //
> diff --git
> a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> index 061e4be..55d03d6 100644
> ---
> a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> +++
> b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> @@ -1,10 +1,10 @@
>  ///** @file
>  //
>  //  String definitions for the Device Manager.
>  //
> -//  Copyright (c) 2004 - 2015, Intel Corporation. All rights 
> reserved.<BR>
> +//  Copyright (c) 2004 - 2017, Intel Corporation. All rights 
> +reserved.<BR>
>  //  This program and the accompanying materials  //  are licensed and 
> made available under the terms and conditions of the BSD License  //  
> which accompanies this distribution.  The full text of the license may 
> be found at  // http://opensource.org/licenses/bsd-license.php
>  //
> @@ -40,11 +40,12 @@
>                                         #language fr-FR  "Missing String"
>  #string STR_EMPTY_STRING               #language en-US  ""
>                                         #language fr-FR  ""
>  #string STR_EXIT_STRING                #language en-US  "Press ESC to exit."
>                                         #language fr-FR  "Press ESC to exit."
> -#string STR_FORM_NETWORK_DEVICE_TITLE  #language en-US  "Network 
> Device"
> +#string STR_FORM_NETWORK_DEVICE_TITLE_HEAD  #language en-US
> "Network Device"
> +#string STR_FORM_NETWORK_DEVICE_TITLE       #language en-US
> "Network Device"
>                                         #language fr-FR  "Network Device"
>  #string STR_FORM_NETWORK_DEVICE_HELP   #language en-US  "Network
> Device Help..."
>                                         #language fr-FR  "Network Device Help..."
>  #string STR_NETWORK_DEVICE_STRING      #language en-US  "Network
> Device"
>                                         #language fr-FR  "Network Device"
> --
> 1.9.5.msysgit.1

Re: [Patch] MdeModulePkg/Mtftp4Dxe: Add invalid ServerIp check during MTFTP configuration

[Ye, Ting]

Reviewed-by: Ye Ting <ting.ye@intel.com> 

-----Original Message-----
From: Wu, Jiaxin 
Sent: Friday, April 21, 2017 10:21 AM
To: edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
Subject: [Patch] MdeModulePkg/Mtftp4Dxe: Add invalid ServerIp check during MTFTP configuration

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
---
 MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 5494231..54384e1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -1,10 +1,10 @@
 /** @file
   Interface routine for Mtftp4.
   
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR> -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials  are licensed and made available under the terms and conditions of the BSD License  which accompanies this distribution.  The full text of the license may be found at  http://opensource.org/licenses/bsd-license.php<BR>
 
@@ -665,10 +665,14 @@ EfiMtftp4Configure (
     Ip       = NTOHL (Ip);
     Netmask  = NTOHL (Netmask);
     Gateway  = NTOHL (Gateway);
     ServerIp = NTOHL (ServerIp);
 
+    if (ServerIp == 0 || IP4_IS_LOCAL_BROADCAST (ServerIp)) {
+      return EFI_INVALID_PARAMETER;
+    }
+
     if (!ConfigData->UseDefaultSetting &&
         ((!IP4_IS_VALID_NETMASK (Netmask) || (Netmask != 0 && !NetIp4IsUnicast (Ip, Netmask))))) {
 
       return EFI_INVALID_PARAMETER;
     }
--
1.9.5.msysgit.1

Re: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network device MAC display issue

[Wu, Jiaxin]

Thanks Siyuan, the new patch has been sent out to handle the NULL string.



> -----Original Message-----
> From: Fu, Siyuan
> Sent: Friday, April 21, 2017 10:36 AM
> To: Wu, Jiaxin <jiaxin.wu@intel.com>; edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>
> Subject: RE: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the
> network device MAC display issue
> 
> Jiaxin,
> 
> I think the HiiGetString() will return NULL pointer if the string is not present,
> then the code will ASSERT in the following StrLen() function.
>   @retval NULL   The string specified by StringId is not present in the string
> package.
>   @retval Other  The string was returned.
> 
> Siyuan
> 
> -----Original Message-----
> From: Wu, Jiaxin
> Sent: 2017年4月21日 10:27
> To: Fu, Siyuan <siyuan.fu@intel.com>; edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>
> Subject: RE: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the
> network device MAC display issue
> 
> I think it's not necessary.
> 
> Eric, what do you think?
> 
> Thanks,
> Jiaxin
> 
> > -----Original Message-----
> > From: Fu, Siyuan
> > Sent: Friday, April 21, 2017 10:25 AM
> > To: Wu, Jiaxin <jiaxin.wu@intel.com>; edk2-devel@lists.01.org
> > Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>
> > Subject: RE: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the
> > network device MAC display issue
> >
> > Hi, Jiaxin
> >
> > Do we also need to add the lang "fr-FR" for
> > STR_FORM_NETWORK_DEVICE_TITLE_HEAD?
> >
> >
> > -----Original Message-----
> > From: Wu, Jiaxin
> > Sent: 2017年4月21日 10:21
> > To: edk2-devel@lists.01.org
> > Cc: Dong, Eric <eric.dong@intel.com>; Ye, Ting <ting.ye@intel.com>;
> > Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> > Subject: [PATCH v2] MdeModulePkg/DeviceManagerUiLib: Fix the network
> > device MAC display issue
> >
> > v2:
> > * Define new STR_FORM_NETWORK_DEVICE_TITLE_HEAD for L" Network
> Device
> > "
> > instead of hard code in the code.
> >
> > Network device tile (STR_FORM_NETWORK_DEVICE_TITLE) is dynamic
> > adjusted according the different MAC value. So, the string value
> > shouldn't be treated as a constant string (Network Device). Otherwise,
> > the display will be incorrect.
> >
> > Reproduce: Device Manager->Network Device List, select to enter MAC,
> > then to press ESC back to previous page, then re-enter, found each
> > enter/ESC operation, the MAC address display +1.
> >
> > Cc: Eric Dong <eric.dong@intel.com>
> > Cc: Ye Ting <ting.ye@intel.com>
> > Cc: Fu Siyuan <siyuan.fu@intel.com>
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
> > ---
> >  MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c          | 8
> > ++++----
> >  MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni |
> 5
> > +++--
> >  2 files changed, 7 insertions(+), 6 deletions(-)
> >
> > diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> > b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> > index 5098b70..d2d3d76 100644
> > --- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> > +++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
> > @@ -538,16 +538,16 @@ CreateDeviceManagerForm(
> >
> >    //
> >    // Update the network device form titile.
> >    //
> >    if (NextShowFormId == NETWORK_DEVICE_FORM_ID) {
> > -    String = HiiGetString (HiiHandle, STRING_TOKEN
> > (STR_FORM_NETWORK_DEVICE_TITLE), NULL);
> > -    NewStringLen = StrLen(mSelectedMacAddrString) * 2;
> > -    NewStringLen += (StrLen(String) + 2) * 2;
> > +    String = HiiGetString (HiiHandle, STRING_TOKEN
> > (STR_FORM_NETWORK_DEVICE_TITLE_HEAD), NULL);
> > +    NewStringLen = StrLen (mSelectedMacAddrString) * 2;
> > +    NewStringLen += (StrLen (String) + 2) * 2;
> >      NewStringTitle = AllocatePool (NewStringLen);
> >      UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String,
> > mSelectedMacAddrString);
> > -    HiiSetString (HiiHandle, STRING_TOKEN
> > (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
> > +    HiiSetString (HiiHandle, STRING_TOKEN
> > + (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
> >      FreePool (String);
> >      FreePool (NewStringTitle);
> >    }
> >
> >    //
> > diff --git
> > a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> > b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> > index 061e4be..55d03d6 100644
> > ---
> > a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> > +++
> > b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
> > @@ -1,10 +1,10 @@
> >  ///** @file
> >  //
> >  //  String definitions for the Device Manager.
> >  //
> > -//  Copyright (c) 2004 - 2015, Intel Corporation. All rights
> > reserved.<BR>
> > +//  Copyright (c) 2004 - 2017, Intel Corporation. All rights
> > +reserved.<BR>
> >  //  This program and the accompanying materials  //  are licensed and
> > made available under the terms and conditions of the BSD License  //
> > which accompanies this distribution.  The full text of the license may
> > be found at  // http://opensource.org/licenses/bsd-license.php
> >  //
> > @@ -40,11 +40,12 @@
> >                                         #language fr-FR  "Missing String"
> >  #string STR_EMPTY_STRING               #language en-US  ""
> >                                         #language fr-FR  ""
> >  #string STR_EXIT_STRING                #language en-US  "Press ESC to exit."
> >                                         #language fr-FR  "Press ESC to exit."
> > -#string STR_FORM_NETWORK_DEVICE_TITLE  #language en-US  "Network
> > Device"
> > +#string STR_FORM_NETWORK_DEVICE_TITLE_HEAD  #language en-US
> > "Network Device"
> > +#string STR_FORM_NETWORK_DEVICE_TITLE       #language en-US
> > "Network Device"
> >                                         #language fr-FR  "Network Device"
> >  #string STR_FORM_NETWORK_DEVICE_HELP   #language en-US  "Network
> > Device Help..."
> >                                         #language fr-FR  "Network Device Help..."
> >  #string STR_NETWORK_DEVICE_STRING      #language en-US  "Network
> > Device"
> >                                         #language fr-FR  "Network Device"
> > --
> > 1.9.5.msysgit.1