[PATCH V2] ShellPkg/Pci.c: Update supported link speed to PCI4.0

[PATCH V2] ShellPkg/Pci.c: Update supported link speed to PCI4.0

[Gao, Zhichao]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1955

Refer PCI express base specification Reversion 4.0, Version
1.0, Table 7-32, Supported Link Speeds Vector bit 3 indicate
the speed 16 GT/s. Add it to shell command 'pci ...'.

Change the MaxLinkSpeed other values' result from 'Unknown'
to 'Reserved'.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Oleksiy <oleksiyy@ami.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---

V2:
Update the copyright.

And remind that this patch isn't update the code to match
PCI 5.0. I didn't find edk repo update the related code to
PCI 5.0. Please let me know if there is a requirement to update
this code to PCI 5.0.

 ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
index ba9caa7743..b58ce3c2f0 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
@@ -1,7 +1,7 @@
 /** @file
   Main file for Pci shell Debug1 function.
 
-  Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.<BR>
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -4515,8 +4515,11 @@ ExplainPcieLinkCap (
     case 3:
       MaxLinkSpeed = L"8.0 GT/s";
       break;
+    case 4:
+      MaxLinkSpeed = L"16.0 GT/s";
+      break;
     default:
-      MaxLinkSpeed = L"Unknown";
+      MaxLinkSpeed = L"Reserved";
       break;
   }
   ShellPrintEx (-1, -1,
@@ -4672,6 +4675,9 @@ ExplainPcieLinkStatus (
     case 3:
       CurLinkSpeed = L"8.0 GT/s";
       break;
+    case 4:
+      CurLinkSpeed = L"16.0 GT/s";
+      break;
     default:
       CurLinkSpeed = L"Reserved";
       break;
-- 
2.21.0.windows.1

[PATCH V2] ShellPkg/UefiHandleParsingLib: Fix incorrect reallocate pool

[Gao, Zhichao]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1965

For function InsertNewGuidNameMapping, it rellocate the
mGuidList with new size
"mGuidListCount+1 * sizeof(GUID_INFO_BLOCK)". That isn't
its purpose and would cause a overflow operation in
"mGuidList[mGuidListCount - 1].xxx = xxx". Its purpose
is to increase 1 block size of mGuidList. Change it to
"(mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK)".

Adjust the coding style of this function.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Andrew Fish <afish@apple.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---

V2:
Update the copyright.

 .../UefiHandleParsingLib/UefiHandleParsingLib.c    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index f179c41092..43c19b9a91 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -1,7 +1,7 @@
 /** @file
   Provides interface to advanced shell functionality for parsing both handle and protocol database.
 
-  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
   (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -2462,17 +2462,21 @@ InsertNewGuidNameMapping(
   IN CONST DUMP_PROTOCOL_INFO DumpFunc OPTIONAL
   )
 {
-  ASSERT(Guid   != NULL);
-  ASSERT(NameID != 0);
+  ASSERT (Guid   != NULL);
+  ASSERT (NameID != 0);
 
-  mGuidList = ReallocatePool(mGuidListCount * sizeof(GUID_INFO_BLOCK), mGuidListCount+1 * sizeof(GUID_INFO_BLOCK), mGuidList);
+  mGuidList = ReallocatePool (
+                mGuidListCount * sizeof (GUID_INFO_BLOCK),
+                (mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK),
+                mGuidList
+                );
   if (mGuidList == NULL) {
     mGuidListCount = 0;
     return (EFI_OUT_OF_RESOURCES);
   }
   mGuidListCount++;
 
-  mGuidList[mGuidListCount - 1].GuidId   = AllocateCopyPool(sizeof(EFI_GUID), Guid);
+  mGuidList[mGuidListCount - 1].GuidId   = AllocateCopyPool (sizeof (EFI_GUID), Guid);
   mGuidList[mGuidListCount - 1].StringId = NameID;
   mGuidList[mGuidListCount - 1].DumpInfo = DumpFunc;
 
-- 
2.21.0.windows.1

[PATCH V2] ShellPkg/UefiShellDriver1CommandsLib: Make array big enough

[Gao, Zhichao]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1941

The two CHAR16 array ChildCountStr and DeviceCountStr is
defined to hold the decimal string data of UINTN. The max
of UINTN is 18446744073709551615 and it contain 20 characters.
So make their size to 21 CHAR16s to hold the string data with
a null-terminate.
UnicodeValueToStringS regard the value input as INT64, and
21 CHARs is enough to hold the lowest value with minus '-'.
Although the value shouldn't be such big.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Oleksiy <oleksiyy@ami.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---

V2:
Update the copyright.

 ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
index 794b737bd1..27cd278cf0 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
@@ -2,7 +2,7 @@
   Main file for Drivers shell Driver1 function.
 
   (C) Copyright 2012-2015 Hewlett-Packard Development Company, L.P.<BR>
-  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -263,8 +263,8 @@ ShellCommandRunDrivers (
   EFI_HANDLE          *HandleWalker;
   UINTN               ChildCount;
   UINTN               DeviceCount;
-  CHAR16              ChildCountStr[3];
-  CHAR16              DeviceCountStr[3];
+  CHAR16              ChildCountStr[21];
+  CHAR16              DeviceCountStr[21];
   CHAR16              *Temp2;
   CONST CHAR16        *FullDriverName;
   CHAR16              *TruncatedDriverName;
-- 
2.21.0.windows.1

FW: [edk2-devel] [PATCH V2] ShellPkg/UefiShellDriver1CommandsLib: Make array big enough

[Gao, Zhichao]

Ping. Please help to review it.

Thanks,
Zhichao

-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Gao, Zhichao
Sent: Monday, July 22, 2019 2:58 PM
To: devel@edk2.groups.io
Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>; Oleksiy <oleksiyy@ami.com>
Subject: [edk2-devel] [PATCH V2] ShellPkg/UefiShellDriver1CommandsLib: Make array big enough

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1941

The two CHAR16 array ChildCountStr and DeviceCountStr is defined to hold the decimal string data of UINTN. The max of UINTN is 18446744073709551615 and it contain 20 characters.
So make their size to 21 CHAR16s to hold the string data with a null-terminate.
UnicodeValueToStringS regard the value input as INT64, and
21 CHARs is enough to hold the lowest value with minus '-'.
Although the value shouldn't be such big.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Oleksiy <oleksiyy@ami.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---

V2:
Update the copyright.

 ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
index 794b737bd1..27cd278cf0 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
@@ -2,7 +2,7 @@
   Main file for Drivers shell Driver1 function.
 
   (C) Copyright 2012-2015 Hewlett-Packard Development Company, L.P.<BR>
-  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2019, Intel Corporation. All rights 
+ reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -263,8 +263,8 @@ ShellCommandRunDrivers (
   EFI_HANDLE          *HandleWalker;
   UINTN               ChildCount;
   UINTN               DeviceCount;
-  CHAR16              ChildCountStr[3];
-  CHAR16              DeviceCountStr[3];
+  CHAR16              ChildCountStr[21];
+  CHAR16              DeviceCountStr[21];
   CHAR16              *Temp2;
   CONST CHAR16        *FullDriverName;
   CHAR16              *TruncatedDriverName;
--
2.21.0.windows.1

Re: [edk2-devel] [PATCH V2] ShellPkg/UefiShellDriver1CommandsLib: Make array big enough

[Gao, Zhichao]

Ping again.

Thanks,
Zhichao

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Gao, Zhichao
> Sent: Friday, July 26, 2019 3:47 PM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> oleksiyy@ami.com
> Subject: FW: [edk2-devel] [PATCH V2]
> ShellPkg/UefiShellDriver1CommandsLib: Make array big enough
> 
> Ping. Please help to review it.
> 
> Thanks,
> Zhichao
> 
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Gao, Zhichao
> Sent: Monday, July 22, 2019 2:58 PM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Oleksiy <oleksiyy@ami.com>
> Subject: [edk2-devel] [PATCH V2] ShellPkg/UefiShellDriver1CommandsLib:
> Make array big enough
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1941
> 
> The two CHAR16 array ChildCountStr and DeviceCountStr is defined to hold
> the decimal string data of UINTN. The max of UINTN is
> 18446744073709551615 and it contain 20 characters.
> So make their size to 21 CHAR16s to hold the string data with a null-
> terminate.
> UnicodeValueToStringS regard the value input as INT64, and
> 21 CHARs is enough to hold the lowest value with minus '-'.
> Although the value shouldn't be such big.
> 
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Oleksiy <oleksiyy@ami.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
> 
> V2:
> Update the copyright.
> 
>  ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> index 794b737bd1..27cd278cf0 100644
> --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> @@ -2,7 +2,7 @@
>    Main file for Drivers shell Driver1 function.
> 
>    (C) Copyright 2012-2015 Hewlett-Packard Development Company, L.P.<BR>
> -  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2010 - 2019, Intel Corporation. All rights
> + reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -263,8 +263,8 @@ ShellCommandRunDrivers (
>    EFI_HANDLE          *HandleWalker;
>    UINTN               ChildCount;
>    UINTN               DeviceCount;
> -  CHAR16              ChildCountStr[3];
> -  CHAR16              DeviceCountStr[3];
> +  CHAR16              ChildCountStr[21];
> +  CHAR16              DeviceCountStr[21];
>    CHAR16              *Temp2;
>    CONST CHAR16        *FullDriverName;
>    CHAR16              *TruncatedDriverName;
> --
> 2.21.0.windows.1
> 
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH V2] ShellPkg/UefiShellDriver1CommandsLib: Make array big enough

[Augustine, Linson]

Reviewed-by: Linson Augustine <Linson.augustine@intel.com>

Regards,
-Linson

-----Original Message-----
From: Gao, Zhichao 
Sent: Wednesday, August 14, 2019 2:03 PM
To: devel@edk2.groups.io; Gao, Zhichao <zhichao.gao@intel.com>
Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>; oleksiyy@ami.com; Augustine, Linson <linson.augustine@intel.com>
Subject: RE: [edk2-devel] [PATCH V2] ShellPkg/UefiShellDriver1CommandsLib: Make array big enough

Ping again.

Thanks,
Zhichao

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of 
> Gao, Zhichao
> Sent: Friday, July 26, 2019 3:47 PM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray 
> <ray.ni@intel.com>; oleksiyy@ami.com
> Subject: FW: [edk2-devel] [PATCH V2]
> ShellPkg/UefiShellDriver1CommandsLib: Make array big enough
> 
> Ping. Please help to review it.
> 
> Thanks,
> Zhichao
> 
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of 
> Gao, Zhichao
> Sent: Monday, July 22, 2019 2:58 PM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray 
> <ray.ni@intel.com>; Oleksiy <oleksiyy@ami.com>
> Subject: [edk2-devel] [PATCH V2] ShellPkg/UefiShellDriver1CommandsLib:
> Make array big enough
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1941
> 
> The two CHAR16 array ChildCountStr and DeviceCountStr is defined to 
> hold the decimal string data of UINTN. The max of UINTN is
> 18446744073709551615 and it contain 20 characters.
> So make their size to 21 CHAR16s to hold the string data with a null- 
> terminate.
> UnicodeValueToStringS regard the value input as INT64, and
> 21 CHARs is enough to hold the lowest value with minus '-'.
> Although the value shouldn't be such big.
> 
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Oleksiy <oleksiyy@ami.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
> 
> V2:
> Update the copyright.
> 
>  ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> index 794b737bd1..27cd278cf0 100644
> --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> @@ -2,7 +2,7 @@
>    Main file for Drivers shell Driver1 function.
> 
>    (C) Copyright 2012-2015 Hewlett-Packard Development Company, 
> L.P.<BR>
> -  Copyright (c) 2010 - 2018, Intel Corporation. All rights 
> reserved.<BR>
> +  Copyright (c) 2010 - 2019, Intel Corporation. All rights 
> + reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -263,8 +263,8 @@ ShellCommandRunDrivers (
>    EFI_HANDLE          *HandleWalker;
>    UINTN               ChildCount;
>    UINTN               DeviceCount;
> -  CHAR16              ChildCountStr[3];
> -  CHAR16              DeviceCountStr[3];
> +  CHAR16              ChildCountStr[21];
> +  CHAR16              DeviceCountStr[21];
>    CHAR16              *Temp2;
>    CONST CHAR16        *FullDriverName;
>    CHAR16              *TruncatedDriverName;
> --
> 2.21.0.windows.1
> 
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH V2] ShellPkg/UefiShellDriver1CommandsLib: Make array big enough

[Carsey, Jaben]

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

Thanks
-Jaben


> -----Original Message-----
> From: Augustine, Linson
> Sent: Wednesday, August 14, 2019 1:41 AM
> To: Gao, Zhichao <zhichao.gao@intel.com>; devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> oleksiyy@ami.com
> Subject: RE: [edk2-devel] [PATCH V2]
> ShellPkg/UefiShellDriver1CommandsLib: Make array big enough
> 
> Reviewed-by: Linson Augustine <Linson.augustine@intel.com>
> 
> Regards,
> -Linson
> 
> -----Original Message-----
> From: Gao, Zhichao
> Sent: Wednesday, August 14, 2019 2:03 PM
> To: devel@edk2.groups.io; Gao, Zhichao <zhichao.gao@intel.com>
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> oleksiyy@ami.com; Augustine, Linson <linson.augustine@intel.com>
> Subject: RE: [edk2-devel] [PATCH V2]
> ShellPkg/UefiShellDriver1CommandsLib: Make array big enough
> 
> Ping again.
> 
> Thanks,
> Zhichao
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Gao, Zhichao
> > Sent: Friday, July 26, 2019 3:47 PM
> > To: devel@edk2.groups.io
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> > <ray.ni@intel.com>; oleksiyy@ami.com
> > Subject: FW: [edk2-devel] [PATCH V2]
> > ShellPkg/UefiShellDriver1CommandsLib: Make array big enough
> >
> > Ping. Please help to review it.
> >
> > Thanks,
> > Zhichao
> >
> > -----Original Message-----
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Gao, Zhichao
> > Sent: Monday, July 22, 2019 2:58 PM
> > To: devel@edk2.groups.io
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> > <ray.ni@intel.com>; Oleksiy <oleksiyy@ami.com>
> > Subject: [edk2-devel] [PATCH V2] ShellPkg/UefiShellDriver1CommandsLib:
> > Make array big enough
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1941
> >
> > The two CHAR16 array ChildCountStr and DeviceCountStr is defined to
> > hold the decimal string data of UINTN. The max of UINTN is
> > 18446744073709551615 and it contain 20 characters.
> > So make their size to 21 CHAR16s to hold the string data with a null-
> > terminate.
> > UnicodeValueToStringS regard the value input as INT64, and
> > 21 CHARs is enough to hold the lowest value with minus '-'.
> > Although the value shouldn't be such big.
> >
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Oleksiy <oleksiyy@ami.com>
> > Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> > ---
> >
> > V2:
> > Update the copyright.
> >
> >  ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> > b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> > index 794b737bd1..27cd278cf0 100644
> > --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> > +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
> > @@ -2,7 +2,7 @@
> >    Main file for Drivers shell Driver1 function.
> >
> >    (C) Copyright 2012-2015 Hewlett-Packard Development Company,
> > L.P.<BR>
> > -  Copyright (c) 2010 - 2018, Intel Corporation. All rights
> > reserved.<BR>
> > +  Copyright (c) 2010 - 2019, Intel Corporation. All rights
> > + reserved.<BR>
> >    SPDX-License-Identifier: BSD-2-Clause-Patent
> >
> >  **/
> > @@ -263,8 +263,8 @@ ShellCommandRunDrivers (
> >    EFI_HANDLE          *HandleWalker;
> >    UINTN               ChildCount;
> >    UINTN               DeviceCount;
> > -  CHAR16              ChildCountStr[3];
> > -  CHAR16              DeviceCountStr[3];
> > +  CHAR16              ChildCountStr[21];
> > +  CHAR16              DeviceCountStr[21];
> >    CHAR16              *Temp2;
> >    CONST CHAR16        *FullDriverName;
> >    CHAR16              *TruncatedDriverName;
> > --
> > 2.21.0.windows.1
> >
> >
> >
> >
> >
> > 

FW: [edk2-devel] [PATCH V2] ShellPkg/UefiHandleParsingLib: Fix incorrect reallocate pool

[Gao, Zhichao]

Ping. Please help to review it.

Thanks,
Zhichao

-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Gao, Zhichao
Sent: Monday, July 22, 2019 2:58 PM
To: devel@edk2.groups.io
Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>; Andrew Fish <afish@apple.com>
Subject: [edk2-devel] [PATCH V2] ShellPkg/UefiHandleParsingLib: Fix incorrect reallocate pool

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1965

For function InsertNewGuidNameMapping, it rellocate the mGuidList with new size
"mGuidListCount+1 * sizeof(GUID_INFO_BLOCK)". That isn't its purpose and would cause a overflow operation in "mGuidList[mGuidListCount - 1].xxx = xxx". Its purpose is to increase 1 block size of mGuidList. Change it to "(mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK)".

Adjust the coding style of this function.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Andrew Fish <afish@apple.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---

V2:
Update the copyright.

 .../UefiHandleParsingLib/UefiHandleParsingLib.c    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index f179c41092..43c19b9a91 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -1,7 +1,7 @@
 /** @file
   Provides interface to advanced shell functionality for parsing both handle and protocol database.
 
-  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2019, Intel Corporation. All rights 
+ reserved.<BR>
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
   (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent @@ -2462,17 +2462,21 @@ InsertNewGuidNameMapping(
   IN CONST DUMP_PROTOCOL_INFO DumpFunc OPTIONAL
   )
 {
-  ASSERT(Guid   != NULL);
-  ASSERT(NameID != 0);
+  ASSERT (Guid   != NULL);
+  ASSERT (NameID != 0);
 
-  mGuidList = ReallocatePool(mGuidListCount * sizeof(GUID_INFO_BLOCK), mGuidListCount+1 * sizeof(GUID_INFO_BLOCK), mGuidList);
+  mGuidList = ReallocatePool (
+                mGuidListCount * sizeof (GUID_INFO_BLOCK),
+                (mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK),
+                mGuidList
+                );
   if (mGuidList == NULL) {
     mGuidListCount = 0;
     return (EFI_OUT_OF_RESOURCES);
   }
   mGuidListCount++;
 
-  mGuidList[mGuidListCount - 1].GuidId   = AllocateCopyPool(sizeof(EFI_GUID), Guid);
+  mGuidList[mGuidListCount - 1].GuidId   = AllocateCopyPool (sizeof (EFI_GUID), Guid);
   mGuidList[mGuidListCount - 1].StringId = NameID;
   mGuidList[mGuidListCount - 1].DumpInfo = DumpFunc;
 
--
2.21.0.windows.1

Re: [edk2-devel] [PATCH V2] ShellPkg/UefiHandleParsingLib: Fix incorrect reallocate pool

[Gao, Zhichao]

Hi Ray,

Please help to review this patch.

Thanks,
Zhichao

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Gao, Zhichao
> Sent: Monday, July 22, 2019 2:58 PM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Andrew Fish <afish@apple.com>
> Subject: [edk2-devel] [PATCH V2] ShellPkg/UefiHandleParsingLib: Fix
> incorrect reallocate pool
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1965
> 
> For function InsertNewGuidNameMapping, it rellocate the mGuidList with
> new size
> "mGuidListCount+1 * sizeof(GUID_INFO_BLOCK)". That isn't its purpose and
> would cause a overflow operation in "mGuidList[mGuidListCount - 1].xxx =
> xxx". Its purpose is to increase 1 block size of mGuidList. Change it to
> "(mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK)".
> 
> Adjust the coding style of this function.
> 
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
> 
> V2:
> Update the copyright.
> 
>  .../UefiHandleParsingLib/UefiHandleParsingLib.c    | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> index f179c41092..43c19b9a91 100644
> --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> @@ -1,7 +1,7 @@
>  /** @file
>    Provides interface to advanced shell functionality for parsing both handle
> and protocol database.
> 
> -  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2010 - 2019, Intel Corporation. All rights
> + reserved.<BR>
>    (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
>    (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent @@ -2462,17 +2462,21 @@
> InsertNewGuidNameMapping(
>    IN CONST DUMP_PROTOCOL_INFO DumpFunc OPTIONAL
>    )
>  {
> -  ASSERT(Guid   != NULL);
> -  ASSERT(NameID != 0);
> +  ASSERT (Guid   != NULL);
> +  ASSERT (NameID != 0);
> 
> -  mGuidList = ReallocatePool(mGuidListCount * sizeof(GUID_INFO_BLOCK),
> mGuidListCount+1 * sizeof(GUID_INFO_BLOCK), mGuidList);
> +  mGuidList = ReallocatePool (
> +                mGuidListCount * sizeof (GUID_INFO_BLOCK),
> +                (mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK),
> +                mGuidList
> +                );
>    if (mGuidList == NULL) {
>      mGuidListCount = 0;
>      return (EFI_OUT_OF_RESOURCES);
>    }
>    mGuidListCount++;
> 
> -  mGuidList[mGuidListCount - 1].GuidId   =
> AllocateCopyPool(sizeof(EFI_GUID), Guid);
> +  mGuidList[mGuidListCount - 1].GuidId   = AllocateCopyPool (sizeof
> (EFI_GUID), Guid);
>    mGuidList[mGuidListCount - 1].StringId = NameID;
>    mGuidList[mGuidListCount - 1].DumpInfo = DumpFunc;
> 
> --
> 2.21.0.windows.1
> 
> 
> 

Re: [edk2-devel] [PATCH V2] ShellPkg/UefiHandleParsingLib: Fix incorrect reallocate pool

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Monday, September 2, 2019 1:51 AM
> To: devel@edk2.groups.io; Gao, Zhichao <zhichao.gao@intel.com>
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>; Andrew Fish <afish@apple.com>
> Subject: RE: [edk2-devel] [PATCH V2] ShellPkg/UefiHandleParsingLib: Fix incorrect reallocate pool
> 
> Hi Ray,
> 
> Please help to review this patch.
> 
> Thanks,
> Zhichao
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Gao, Zhichao
> > Sent: Monday, July 22, 2019 2:58 PM
> > To: devel@edk2.groups.io
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> > Andrew Fish <afish@apple.com>
> > Subject: [edk2-devel] [PATCH V2] ShellPkg/UefiHandleParsingLib: Fix
> > incorrect reallocate pool
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1965
> >
> > For function InsertNewGuidNameMapping, it rellocate the mGuidList with
> > new size
> > "mGuidListCount+1 * sizeof(GUID_INFO_BLOCK)". That isn't its purpose and
> > would cause a overflow operation in "mGuidList[mGuidListCount - 1].xxx =
> > xxx". Its purpose is to increase 1 block size of mGuidList. Change it to
> > "(mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK)".
> >
> > Adjust the coding style of this function.
> >
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Andrew Fish <afish@apple.com>
> > Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> > ---
> >
> > V2:
> > Update the copyright.
> >
> >  .../UefiHandleParsingLib/UefiHandleParsingLib.c    | 14 +++++++++-----
> >  1 file changed, 9 insertions(+), 5 deletions(-)
> >
> > diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > index f179c41092..43c19b9a91 100644
> > --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > @@ -1,7 +1,7 @@
> >  /** @file
> >    Provides interface to advanced shell functionality for parsing both handle
> > and protocol database.
> >
> > -  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
> > +  Copyright (c) 2010 - 2019, Intel Corporation. All rights
> > + reserved.<BR>
> >    (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
> >    (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
> >    SPDX-License-Identifier: BSD-2-Clause-Patent @@ -2462,17 +2462,21 @@
> > InsertNewGuidNameMapping(
> >    IN CONST DUMP_PROTOCOL_INFO DumpFunc OPTIONAL
> >    )
> >  {
> > -  ASSERT(Guid   != NULL);
> > -  ASSERT(NameID != 0);
> > +  ASSERT (Guid   != NULL);
> > +  ASSERT (NameID != 0);
> >
> > -  mGuidList = ReallocatePool(mGuidListCount * sizeof(GUID_INFO_BLOCK),
> > mGuidListCount+1 * sizeof(GUID_INFO_BLOCK), mGuidList);
> > +  mGuidList = ReallocatePool (
> > +                mGuidListCount * sizeof (GUID_INFO_BLOCK),
> > +                (mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK),
> > +                mGuidList
> > +                );
> >    if (mGuidList == NULL) {
> >      mGuidListCount = 0;
> >      return (EFI_OUT_OF_RESOURCES);
> >    }
> >    mGuidListCount++;
> >
> > -  mGuidList[mGuidListCount - 1].GuidId   =
> > AllocateCopyPool(sizeof(EFI_GUID), Guid);
> > +  mGuidList[mGuidListCount - 1].GuidId   = AllocateCopyPool (sizeof
> > (EFI_GUID), Guid);
> >    mGuidList[mGuidListCount - 1].StringId = NameID;
> >    mGuidList[mGuidListCount - 1].DumpInfo = DumpFunc;
> >
> > --
> > 2.21.0.windows.1
> >
> >
> >