[PATCH] ShellPkg/Shell: Update CRC32 in the EFI System Table header

[PATCH] ShellPkg/Shell: Update CRC32 in the EFI System Table header

[Cinnamon Shia]

Update CRC32 in the EFI System Table header after shell changes the
value of gST->ConsoleOutHandle and gST->ConOut

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Cinnamon Shia <cinnamon.shia@hpe.com>
---
 ShellPkg/Application/Shell/ConsoleLogger.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ShellPkg/Application/Shell/ConsoleLogger.c b/ShellPkg/Application/Shell/ConsoleLogger.c
index 9b64303..07b3f81 100644
--- a/ShellPkg/Application/Shell/ConsoleLogger.c
+++ b/ShellPkg/Application/Shell/ConsoleLogger.c
@@ -3,6 +3,7 @@
 
   (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
   Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2016 Hewlett-Packard Development Company, L.P.<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
@@ -91,6 +92,16 @@ ConsoleLoggerInstall(
   gST->ConsoleOutHandle = gImageHandle;
   gST->ConOut           = &(*ConsoleInfo)->OurConOut;
 
+  //
+  // Update the CRC32 in the EFI System Table header
+  //
+  CpuBreakpoint();
+  gST->Hdr.CRC32 = 0;
+  gBS->CalculateCrc32 (
+        (UINT8 *)&gST->Hdr,
+        gST->Hdr.HeaderSize,
+        &gST->Hdr.CRC32
+        );
   return (Status);
 }
 
@@ -126,6 +137,16 @@ ConsoleLoggerUninstall(
   gST->ConsoleOutHandle = ConsoleInfo->OldConHandle;
   gST->ConOut = ConsoleInfo->OldConOut;
 
+  //
+  // Update the CRC32 in the EFI System Table header
+  //
+  gST->Hdr.CRC32 = 0;
+  gBS->CalculateCrc32 (
+        (UINT8 *)&gST->Hdr,
+        gST->Hdr.HeaderSize,
+        &gST->Hdr.CRC32
+        );
+
   return (gBS->UninstallProtocolInterface(gImageHandle, &gEfiSimpleTextOutProtocolGuid, (VOID*)&ConsoleInfo->OurConOut));
 }
 
-- 
2.10.0.windows.1

Re: [PATCH] ShellPkg/Shell: Update CRC32 in the EFI System Table header

[Carsey, Jaben]

Why add a CpuBreakPoint()?

> -----Original Message-----
> From: Cinnamon Shia [mailto:cinnamon.shia@hpe.com]
> Sent: Monday, October 03, 2016 9:14 AM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> <ruiyu.ni@intel.com>; Cinnamon Shia <cinnamon.shia@hpe.com>
> Subject: [PATCH] ShellPkg/Shell: Update CRC32 in the EFI System Table
> header
> Importance: High
> 
> Update CRC32 in the EFI System Table header after shell changes the
> value of gST->ConsoleOutHandle and gST->ConOut
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Cinnamon Shia <cinnamon.shia@hpe.com>
> ---
>  ShellPkg/Application/Shell/ConsoleLogger.c | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
> 
> diff --git a/ShellPkg/Application/Shell/ConsoleLogger.c
> b/ShellPkg/Application/Shell/ConsoleLogger.c
> index 9b64303..07b3f81 100644
> --- a/ShellPkg/Application/Shell/ConsoleLogger.c
> +++ b/ShellPkg/Application/Shell/ConsoleLogger.c
> @@ -3,6 +3,7 @@
> 
>    (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
>    Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
> +  (C) Copyright 2016 Hewlett-Packard Development Company, L.P.<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
> @@ -91,6 +92,16 @@ ConsoleLoggerInstall(
>    gST->ConsoleOutHandle = gImageHandle;
>    gST->ConOut           = &(*ConsoleInfo)->OurConOut;
> 
> +  //
> +  // Update the CRC32 in the EFI System Table header
> +  //
> +  CpuBreakpoint();
> +  gST->Hdr.CRC32 = 0;
> +  gBS->CalculateCrc32 (
> +        (UINT8 *)&gST->Hdr,
> +        gST->Hdr.HeaderSize,
> +        &gST->Hdr.CRC32
> +        );
>    return (Status);
>  }
> 
> @@ -126,6 +137,16 @@ ConsoleLoggerUninstall(
>    gST->ConsoleOutHandle = ConsoleInfo->OldConHandle;
>    gST->ConOut = ConsoleInfo->OldConOut;
> 
> +  //
> +  // Update the CRC32 in the EFI System Table header
> +  //
> +  gST->Hdr.CRC32 = 0;
> +  gBS->CalculateCrc32 (
> +        (UINT8 *)&gST->Hdr,
> +        gST->Hdr.HeaderSize,
> +        &gST->Hdr.CRC32
> +        );
> +
>    return (gBS->UninstallProtocolInterface(gImageHandle,
> &gEfiSimpleTextOutProtocolGuid, (VOID*)&ConsoleInfo->OurConOut));
>  }
> 
> --
> 2.10.0.windows.1

Re: [PATCH] ShellPkg/Shell: Update CRC32 in the EFI System Table header

[Shia, Cinnamon]

Oops. Will fix it in diff v2.

Thanks,
Cinnamon Shia

-----Original Message-----
From: Carsey, Jaben [mailto:jaben.carsey@intel.com] 
Sent: Tuesday, October 4, 2016 12:27 AM
To: Shia, Cinnamon <cinnamon.shia@hpe.com>; edk2-devel@lists.01.org
Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
Subject: RE: [PATCH] ShellPkg/Shell: Update CRC32 in the EFI System Table header

Why add a CpuBreakPoint()?

> -----Original Message-----
> From: Cinnamon Shia [mailto:cinnamon.shia@hpe.com]
> Sent: Monday, October 03, 2016 9:14 AM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu 
> <ruiyu.ni@intel.com>; Cinnamon Shia <cinnamon.shia@hpe.com>
> Subject: [PATCH] ShellPkg/Shell: Update CRC32 in the EFI System Table 
> header
> Importance: High
> 
> Update CRC32 in the EFI System Table header after shell changes the 
> value of gST->ConsoleOutHandle and gST->ConOut
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Cinnamon Shia <cinnamon.shia@hpe.com>
> ---
>  ShellPkg/Application/Shell/ConsoleLogger.c | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
> 
> diff --git a/ShellPkg/Application/Shell/ConsoleLogger.c
> b/ShellPkg/Application/Shell/ConsoleLogger.c
> index 9b64303..07b3f81 100644
> --- a/ShellPkg/Application/Shell/ConsoleLogger.c
> +++ b/ShellPkg/Application/Shell/ConsoleLogger.c
> @@ -3,6 +3,7 @@
> 
>    (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
>    Copyright (c) 2009 - 2015, Intel Corporation. All rights 
> reserved.<BR>
> +  (C) Copyright 2016 Hewlett-Packard Development Company, L.P.<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 @@ -91,6 +92,16 @@ ConsoleLoggerInstall(
>    gST->ConsoleOutHandle = gImageHandle;
>    gST->ConOut           = &(*ConsoleInfo)->OurConOut;
> 
> +  //
> +  // Update the CRC32 in the EFI System Table header  //  
> + CpuBreakpoint();
> +  gST->Hdr.CRC32 = 0;
> +  gBS->CalculateCrc32 (
> +        (UINT8 *)&gST->Hdr,
> +        gST->Hdr.HeaderSize,
> +        &gST->Hdr.CRC32
> +        );
>    return (Status);
>  }
> 
> @@ -126,6 +137,16 @@ ConsoleLoggerUninstall(
>    gST->ConsoleOutHandle = ConsoleInfo->OldConHandle;
>    gST->ConOut = ConsoleInfo->OldConOut;
> 
> +  //
> +  // Update the CRC32 in the EFI System Table header  //
> +  gST->Hdr.CRC32 = 0;
> +  gBS->CalculateCrc32 (
> +        (UINT8 *)&gST->Hdr,
> +        gST->Hdr.HeaderSize,
> +        &gST->Hdr.CRC32
> +        );
> +
>    return (gBS->UninstallProtocolInterface(gImageHandle,
> &gEfiSimpleTextOutProtocolGuid, (VOID*)&ConsoleInfo->OurConOut));  }
> 
> --
> 2.10.0.windows.1