[PATCH] MdeModulePkg CapsuleApp: Fix NestedCapsuleHeader->Flags assigned wrong

[PATCH] MdeModulePkg CapsuleApp: Fix NestedCapsuleHeader->Flags assigned wrong

[Star Zeng]

(FwType == ESRT_FW_TYPE_DEVICEFIRMWARE) ? system : device
should be
(FwType == ESRT_FW_TYPE_SYSTEMFIRMWARE) ? system : device

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Ming Shao <ming.shao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Application/CapsuleApp/CapsuleApp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
index e1e48befc2de..3a1a0a1cb2e6 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
@@ -431,7 +431,7 @@ CreateNestedFmp (
   ZeroMem(NestedCapsuleHeader, NESTED_CAPSULE_HEADER_SIZE);
   CopyGuid(&NestedCapsuleHeader->CapsuleGuid, ImageTypeId);
   NestedCapsuleHeader->HeaderSize = NESTED_CAPSULE_HEADER_SIZE;
-  NestedCapsuleHeader->Flags = (FwType == ESRT_FW_TYPE_DEVICEFIRMWARE) ? SYSTEM_FIRMWARE_FLAG : DEVICE_FIRMWARE_FLAG;
+  NestedCapsuleHeader->Flags = (FwType == ESRT_FW_TYPE_SYSTEMFIRMWARE) ? SYSTEM_FIRMWARE_FLAG : DEVICE_FIRMWARE_FLAG;
   NestedCapsuleHeader->CapsuleImageSize = (UINT32)FullCapsuleBufferSize;
 
   CopyMem((UINT8 *)NestedCapsuleHeader + NestedCapsuleHeader->HeaderSize, CapsuleBuffer, FileSize);
-- 
2.7.0.windows.1

Re: [PATCH] MdeModulePkg CapsuleApp: Fix NestedCapsuleHeader->Flags assigned wrong

[Yao, Jiewen]

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: Zeng, Star
> Sent: Tuesday, July 10, 2018 6:24 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Shao,
> Ming <ming.shao@intel.com>
> Subject: [PATCH] MdeModulePkg CapsuleApp: Fix NestedCapsuleHeader->Flags
> assigned wrong
> 
> (FwType == ESRT_FW_TYPE_DEVICEFIRMWARE) ? system : device
> should be
> (FwType == ESRT_FW_TYPE_SYSTEMFIRMWARE) ? system : device
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Ming Shao <ming.shao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  MdeModulePkg/Application/CapsuleApp/CapsuleApp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
> b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
> index e1e48befc2de..3a1a0a1cb2e6 100644
> --- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
> +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
> @@ -431,7 +431,7 @@ CreateNestedFmp (
>    ZeroMem(NestedCapsuleHeader, NESTED_CAPSULE_HEADER_SIZE);
>    CopyGuid(&NestedCapsuleHeader->CapsuleGuid, ImageTypeId);
>    NestedCapsuleHeader->HeaderSize = NESTED_CAPSULE_HEADER_SIZE;
> -  NestedCapsuleHeader->Flags = (FwType ==
> ESRT_FW_TYPE_DEVICEFIRMWARE) ? SYSTEM_FIRMWARE_FLAG :
> DEVICE_FIRMWARE_FLAG;
> +  NestedCapsuleHeader->Flags = (FwType ==
> ESRT_FW_TYPE_SYSTEMFIRMWARE) ? SYSTEM_FIRMWARE_FLAG :
> DEVICE_FIRMWARE_FLAG;
>    NestedCapsuleHeader->CapsuleImageSize = (UINT32)FullCapsuleBufferSize;
> 
>    CopyMem((UINT8 *)NestedCapsuleHeader +
> NestedCapsuleHeader->HeaderSize, CapsuleBuffer, FileSize);
> --
> 2.7.0.windows.1