[edk2] [PATCH] SignedCapsulePkg SystemCapsuleLib: Change some dbg level to DEBUG_INFO

Star Zeng posted 1 patch 6 years, 7 months ago
Failed in applying to current master (apply log)
.../Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c         | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
[edk2] [PATCH] SignedCapsulePkg SystemCapsuleLib: Change some dbg level to DEBUG_INFO
Posted by Star Zeng 6 years, 7 months ago
This debug message should be info instead of error. This patch is to
change the debug level to DEBUG_INFO.
DEBUG((DEBUG_ERROR, "checking FV....0x%08x - 0x%x\n",
       FvHeader, FvHeader->FvLength));    // "Mark"

This comment is inaccurate. This patch is to remove it.
//
// Check section
//

This debug message should be removed as FvHeader may have been out of
range FdStart and FdSize, and the loop will go to "Mark" above again if
FvHeader is not out of range FdStart and FdSize, and then that debug
message will be shown. This patch is to remove this debug message.
DEBUG((DEBUG_ERROR, "Next FV....0x%08x - 0x%x\n",
       FvHeader, FvHeader->FvLength));

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Amy Chan <amy.chan@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 .../Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c         | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c b/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
index 876d2257b365..5cb97bf93118 100644
--- a/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
+++ b/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
@@ -6,7 +6,7 @@
   CapsuleAuthenticateSystemFirmware(), ExtractAuthenticatedImage() will receive
   untrusted input and do basic validation.
 
-  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2016 - 2018, 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
@@ -188,7 +188,7 @@ GetFfsByName (
       FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)((UINTN)FvHeader + SIZE_4KB);
       continue;
     }
-    DEBUG((DEBUG_ERROR, "checking FV....0x%08x - 0x%x\n", FvHeader, FvHeader->FvLength));
+    DEBUG((DEBUG_INFO, "checking FV....0x%08x - 0x%x\n", FvHeader, FvHeader->FvLength));
     FvFound = TRUE;
     if (FvHeader->FvLength > FvSize) {
       DEBUG((DEBUG_ERROR, "GetFfsByName - FvSize: 0x%08x, MaxSize - 0x%08x\n", (UINTN)FvHeader->FvLength, (UINTN)FvSize));
@@ -225,9 +225,6 @@ GetFfsByName (
 
       if (CompareGuid(FileName, &FfsHeader->Name) &&
           ((Type == EFI_FV_FILETYPE_ALL) || (FfsHeader->Type == Type))) {
-        //
-        // Check section
-        //
         *OutFfsBuffer = FfsHeader;
         *OutFfsBufferSize = FfsSize;
         return TRUE;
@@ -248,7 +245,6 @@ GetFfsByName (
     // Next FV
     //
     FvHeader = (VOID *)(UINTN)((UINTN)FvHeader + FvHeader->FvLength);
-    DEBUG((DEBUG_ERROR, "Next FV....0x%08x - 0x%x\n", FvHeader, FvHeader->FvLength));
   }
 
   if (!FvFound) {
-- 
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] SignedCapsulePkg SystemCapsuleLib: Change some dbg level to DEBUG_INFO
Posted by Chiu, Chasel 6 years, 6 months ago
Thanks!
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>


-----Original Message-----
From: Zeng, Star 
Sent: Wednesday, April 4, 2018 4:39 PM
To: edk2-devel@lists.01.org
Cc: Zeng, Star <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Chan, Amy <amy.chan@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
Subject: [PATCH] SignedCapsulePkg SystemCapsuleLib: Change some dbg level to DEBUG_INFO

This debug message should be info instead of error. This patch is to change the debug level to DEBUG_INFO.
DEBUG((DEBUG_ERROR, "checking FV....0x%08x - 0x%x\n",
       FvHeader, FvHeader->FvLength));    // "Mark"

This comment is inaccurate. This patch is to remove it.
//
// Check section
//

This debug message should be removed as FvHeader may have been out of range FdStart and FdSize, and the loop will go to "Mark" above again if FvHeader is not out of range FdStart and FdSize, and then that debug message will be shown. This patch is to remove this debug message.
DEBUG((DEBUG_ERROR, "Next FV....0x%08x - 0x%x\n",
       FvHeader, FvHeader->FvLength));

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Amy Chan <amy.chan@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 .../Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c         | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c b/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
index 876d2257b365..5cb97bf93118 100644
--- a/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
+++ b/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleL
+++ ib.c
@@ -6,7 +6,7 @@
   CapsuleAuthenticateSystemFirmware(), ExtractAuthenticatedImage() will receive
   untrusted input and do basic validation.
 
-  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2016 - 2018, 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 @@ -188,7 +188,7 @@ GetFfsByName (
       FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)((UINTN)FvHeader + SIZE_4KB);
       continue;
     }
-    DEBUG((DEBUG_ERROR, "checking FV....0x%08x - 0x%x\n", FvHeader, FvHeader->FvLength));
+    DEBUG((DEBUG_INFO, "checking FV....0x%08x - 0x%x\n", FvHeader, 
+ FvHeader->FvLength));
     FvFound = TRUE;
     if (FvHeader->FvLength > FvSize) {
       DEBUG((DEBUG_ERROR, "GetFfsByName - FvSize: 0x%08x, MaxSize - 0x%08x\n", (UINTN)FvHeader->FvLength, (UINTN)FvSize)); @@ -225,9 +225,6 @@ GetFfsByName (
 
       if (CompareGuid(FileName, &FfsHeader->Name) &&
           ((Type == EFI_FV_FILETYPE_ALL) || (FfsHeader->Type == Type))) {
-        //
-        // Check section
-        //
         *OutFfsBuffer = FfsHeader;
         *OutFfsBufferSize = FfsSize;
         return TRUE;
@@ -248,7 +245,6 @@ GetFfsByName (
     // Next FV
     //
     FvHeader = (VOID *)(UINTN)((UINTN)FvHeader + FvHeader->FvLength);
-    DEBUG((DEBUG_ERROR, "Next FV....0x%08x - 0x%x\n", FvHeader, FvHeader->FvLength));
   }
 
   if (!FvFound) {
--
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] SignedCapsulePkg SystemCapsuleLib: Change some dbg level to DEBUG_INFO
Posted by Yao, Jiewen 6 years, 6 months ago
Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: Zeng, Star
> Sent: Wednesday, April 4, 2018 4:39 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Chiu, Chasel <chasel.chiu@intel.com>; Chan, Amy <amy.chan@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [PATCH] SignedCapsulePkg SystemCapsuleLib: Change some dbg level to
> DEBUG_INFO
> 
> This debug message should be info instead of error. This patch is to
> change the debug level to DEBUG_INFO.
> DEBUG((DEBUG_ERROR, "checking FV....0x%08x - 0x%x\n",
>        FvHeader, FvHeader->FvLength));    // "Mark"
> 
> This comment is inaccurate. This patch is to remove it.
> //
> // Check section
> //
> 
> This debug message should be removed as FvHeader may have been out of
> range FdStart and FdSize, and the loop will go to "Mark" above again if
> FvHeader is not out of range FdStart and FdSize, and then that debug
> message will be shown. This patch is to remove this debug message.
> DEBUG((DEBUG_ERROR, "Next FV....0x%08x - 0x%x\n",
>        FvHeader, FvHeader->FvLength));
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Amy Chan <amy.chan@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  .../Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c         | 8
> ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git
> a/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
> b/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
> index 876d2257b365..5cb97bf93118 100644
> --- a/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
> +++
> b/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
> @@ -6,7 +6,7 @@
>    CapsuleAuthenticateSystemFirmware(), ExtractAuthenticatedImage() will
> receive
>    untrusted input and do basic validation.
> 
> -  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2016 - 2018, 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
> @@ -188,7 +188,7 @@ GetFfsByName (
>        FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)((UINTN)FvHeader +
> SIZE_4KB);
>        continue;
>      }
> -    DEBUG((DEBUG_ERROR, "checking FV....0x%08x - 0x%x\n", FvHeader,
> FvHeader->FvLength));
> +    DEBUG((DEBUG_INFO, "checking FV....0x%08x - 0x%x\n", FvHeader,
> FvHeader->FvLength));
>      FvFound = TRUE;
>      if (FvHeader->FvLength > FvSize) {
>        DEBUG((DEBUG_ERROR, "GetFfsByName - FvSize: 0x%08x, MaxSize -
> 0x%08x\n", (UINTN)FvHeader->FvLength, (UINTN)FvSize));
> @@ -225,9 +225,6 @@ GetFfsByName (
> 
>        if (CompareGuid(FileName, &FfsHeader->Name) &&
>            ((Type == EFI_FV_FILETYPE_ALL) || (FfsHeader->Type == Type))) {
> -        //
> -        // Check section
> -        //
>          *OutFfsBuffer = FfsHeader;
>          *OutFfsBufferSize = FfsSize;
>          return TRUE;
> @@ -248,7 +245,6 @@ GetFfsByName (
>      // Next FV
>      //
>      FvHeader = (VOID *)(UINTN)((UINTN)FvHeader + FvHeader->FvLength);
> -    DEBUG((DEBUG_ERROR, "Next FV....0x%08x - 0x%x\n", FvHeader,
> FvHeader->FvLength));
>    }
> 
>    if (!FvFound) {
> --
> 2.7.0.windows.1

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