mirror of
https://git.yoctoproject.org/poky
synced 2026-09-20 03:49:32 +02:00
ovmf: fix CVE-2024-38796
Backport fix from upstream to resolve CVE-2024-38796
c95233b852
(From OE-Core rev: 01743182b7a4bcbd47157a49da7af7b41546434c)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
ae41df7b37
commit
7bd9a000b6
@@ -0,0 +1,36 @@
|
|||||||
|
From 5f7bd3f3c4747d5bb2733f017f8c5b93b63a74e3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Doug Flick <dougflick@microsoft.com>
|
||||||
|
Date: Fri, 22 Nov 2024 13:03:33 +0800
|
||||||
|
Subject: [PATCH] MdePkg: Fix overflow issue in BasePeCoffLib
|
||||||
|
|
||||||
|
The RelocDir->Size is a UINT32 value, and RelocDir->VirtualAddress is
|
||||||
|
also a UINT32 value. The current code does not check for overflow when
|
||||||
|
adding RelocDir->Size to RelocDir->VirtualAddress. This patch adds a
|
||||||
|
check to ensure that the addition does not overflow.
|
||||||
|
|
||||||
|
Signed-off-by: Doug Flick <dougflick@microsoft.com>
|
||||||
|
Authored-by: sriraamx gobichettipalayam <sri..@intel.com>
|
||||||
|
|
||||||
|
CVE: CVE-2024-38796
|
||||||
|
Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/c95233b8525ca6828921affd1496146cff262e65]
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
MdePkg/Library/BasePeCoffLib/BasePeCoff.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
|
||||||
|
index 86ff2e7..128090d 100644
|
||||||
|
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
|
||||||
|
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
|
||||||
|
@@ -1054,7 +1054,7 @@ PeCoffLoaderRelocateImage (
|
||||||
|
RelocDir = &Hdr.Te->DataDirectory[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
- if ((RelocDir != NULL) && (RelocDir->Size > 0)) {
|
||||||
|
+ if ((RelocDir != NULL) && (RelocDir->Size > 0) && (RelocDir->Size - 1 < MAX_UINT32 - RelocDir->VirtualAddress)) {
|
||||||
|
RelocBase = (EFI_IMAGE_BASE_RELOCATION *)PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress, TeStrippedOffset);
|
||||||
|
RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *)PeCoffLoaderImageAddress (
|
||||||
|
ImageContext,
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
@@ -24,6 +24,7 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
|
|||||||
file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
|
file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
|
||||||
file://0003-debug-prefix-map.patch \
|
file://0003-debug-prefix-map.patch \
|
||||||
file://0004-reproducible.patch \
|
file://0004-reproducible.patch \
|
||||||
|
file://0001-MdePkg-Fix-overflow-issue-in-BasePeCoffLib.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
PV = "edk2-stable202402"
|
PV = "edk2-stable202402"
|
||||||
|
|||||||
Reference in New Issue
Block a user