* [PATCH] MdeModulePkg DxeCapsuleLibFmp: Refine the code to check FmpImageSize.
@ 2018-07-26 7:30 Star Zeng
2018-07-27 1:32 ` Yao, Jiewen
0 siblings, 1 reply; 2+ messages in thread
From: Star Zeng @ 2018-07-26 7:30 UTC (permalink / raw)
To: edk2-devel; +Cc: Star Zeng, Jiewen Yao
The code to check FmpImageSize again OFFSET_OF
(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance)
can be refined to check against FmpImageHeaderSize.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
index a1347b5ce67c..ee3adce2a2f2 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
@@ -268,10 +268,6 @@ ValidateFmpCapsule (
}
FmpImageSize = (UINTN)EndOfPayload - ItemOffsetList[Index];
- if (FmpImageSize < OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance)) {
- DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) < EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER\n", FmpImageSize));
- return EFI_INVALID_PARAMETER;
- }
FmpImageHeaderSize = sizeof(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER);
if ((ImageHeader->Version > EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION) ||
(ImageHeader->Version < 1)) {
@@ -281,6 +277,10 @@ ValidateFmpCapsule (
if (ImageHeader->Version < EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION) {
FmpImageHeaderSize = OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance);
}
+ if (FmpImageSize < FmpImageHeaderSize) {
+ DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) < FmpImageHeaderSize(0x%x)\n", FmpImageSize, FmpImageHeaderSize));
+ return EFI_INVALID_PARAMETER;
+ }
// No overflow
if (FmpImageSize != (UINT64)FmpImageHeaderSize + (UINT64)ImageHeader->UpdateImageSize + (UINT64)ImageHeader->UpdateVendorCodeSize) {
--
2.7.0.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] MdeModulePkg DxeCapsuleLibFmp: Refine the code to check FmpImageSize.
2018-07-26 7:30 [PATCH] MdeModulePkg DxeCapsuleLibFmp: Refine the code to check FmpImageSize Star Zeng
@ 2018-07-27 1:32 ` Yao, Jiewen
0 siblings, 0 replies; 2+ messages in thread
From: Yao, Jiewen @ 2018-07-27 1:32 UTC (permalink / raw)
To: Zeng, Star, edk2-devel@lists.01.org; +Cc: Zeng, Star
Reviewed-by: jiewen.yao@intel.com
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Star
> Zeng
> Sent: Thursday, July 26, 2018 3:30 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [edk2] [PATCH] MdeModulePkg DxeCapsuleLibFmp: Refine the code to
> check FmpImageSize.
>
> The code to check FmpImageSize again OFFSET_OF
> (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER,
> UpdateHardwareInstance)
> can be refined to check against FmpImageHeaderSize.
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
> MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
> b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
> index a1347b5ce67c..ee3adce2a2f2 100644
> --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
> +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
> @@ -268,10 +268,6 @@ ValidateFmpCapsule (
> }
> FmpImageSize = (UINTN)EndOfPayload - ItemOffsetList[Index];
>
> - if (FmpImageSize <
> OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER,
> UpdateHardwareInstance)) {
> - DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) <
> EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER\n",
> FmpImageSize));
> - return EFI_INVALID_PARAMETER;
> - }
> FmpImageHeaderSize =
> sizeof(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER);
> if ((ImageHeader->Version >
> EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION) ||
> (ImageHeader->Version < 1)) {
> @@ -281,6 +277,10 @@ ValidateFmpCapsule (
> if (ImageHeader->Version <
> EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION) {
> FmpImageHeaderSize =
> OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER,
> UpdateHardwareInstance);
> }
> + if (FmpImageSize < FmpImageHeaderSize) {
> + DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) <
> FmpImageHeaderSize(0x%x)\n", FmpImageSize, FmpImageHeaderSize));
> + return EFI_INVALID_PARAMETER;
> + }
>
> // No overflow
> if (FmpImageSize != (UINT64)FmpImageHeaderSize +
> (UINT64)ImageHeader->UpdateImageSize +
> (UINT64)ImageHeader->UpdateVendorCodeSize) {
> --
> 2.7.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-27 1:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-26 7:30 [PATCH] MdeModulePkg DxeCapsuleLibFmp: Refine the code to check FmpImageSize Star Zeng
2018-07-27 1:32 ` Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox