|
 |
bdb79c |
From adfd3101494f52d71cbd8d15be9146e7570e6397 Mon Sep 17 00:00:00 2001
|
|
|
bdb79c |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
bdb79c |
Date: Fri, 22 Mar 2019 21:53:22 +0100
|
|
|
bdb79c |
Subject: [PATCH 6/8] MdeModulePkg/UdfDxe: Add boundary check for
|
|
|
bdb79c |
ComponentIdentifier decode
|
|
|
bdb79c |
MIME-Version: 1.0
|
|
|
bdb79c |
Content-Type: text/plain; charset=UTF-8
|
|
|
bdb79c |
Content-Transfer-Encoding: 8bit
|
|
|
bdb79c |
|
|
|
bdb79c |
Message-id: <20190322205323.17693-5-lersek@redhat.com>
|
|
|
bdb79c |
Patchwork-id: 85133
|
|
|
bdb79c |
O-Subject: [RHEL-7.7 ovmf PATCH 4/5] MdeModulePkg/UdfDxe: Add boundary check for
|
|
|
bdb79c |
ComponentIdentifier decode
|
|
|
bdb79c |
Bugzilla: 1691647
|
|
|
bdb79c |
Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
bdb79c |
Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
bdb79c |
|
|
|
bdb79c |
From: Hao Wu <hao.a.wu@intel.com>
|
|
|
bdb79c |
|
|
|
bdb79c |
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=828
|
|
|
bdb79c |
|
|
|
bdb79c |
Within ResolveSymlink():
|
|
|
bdb79c |
|
|
|
bdb79c |
The boundary check will validate the 'LengthofComponentIdentifier' field
|
|
|
bdb79c |
of a Path Component matches the data within the relating (Extended) File
|
|
|
bdb79c |
Entry.
|
|
|
bdb79c |
|
|
|
bdb79c |
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
|
|
|
bdb79c |
Cc: Jiewen Yao <jiewen.yao@intel.com>
|
|
|
bdb79c |
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
|
bdb79c |
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
|
|
|
bdb79c |
Reviewed-by: Paulo Alcantara <palcantara@suse.de>
|
|
|
bdb79c |
Acked-by: Star Zeng <star.zeng@intel.com>
|
|
|
bdb79c |
(cherry picked from commit 89f75aa04a97293a8ed9db2a90851a5053730cf5)
|
|
|
bdb79c |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
bdb79c |
---
|
|
|
bdb79c |
MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c | 4 ++++
|
|
|
bdb79c |
1 file changed, 4 insertions(+)
|
|
|
bdb79c |
|
|
|
bdb79c |
diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
|
|
|
bdb79c |
index 0012075..1aefed8 100644
|
|
|
bdb79c |
--- a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
|
|
|
bdb79c |
+++ b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
|
|
|
bdb79c |
@@ -2137,6 +2137,10 @@ ResolveSymlink (
|
|
|
bdb79c |
return EFI_VOLUME_CORRUPTED;
|
|
|
bdb79c |
}
|
|
|
bdb79c |
|
|
|
bdb79c |
+ if ((UINTN)PathComp->ComponentIdentifier + PathCompLength > (UINTN)EndData) {
|
|
|
bdb79c |
+ return EFI_VOLUME_CORRUPTED;
|
|
|
bdb79c |
+ }
|
|
|
bdb79c |
+
|
|
|
bdb79c |
Char = FileName;
|
|
|
bdb79c |
for (Index = 1; Index < PathCompLength; Index++) {
|
|
|
bdb79c |
if (CompressionId == 16) {
|
|
|
bdb79c |
--
|
|
|
bdb79c |
1.8.3.1
|
|
|
bdb79c |
|