From: "Gao, Zhichao" <zhichao.gao@intel.com>
To: devel@edk2.groups.io
Cc: Hao A Wu <hao.a.wu@intel.com>, Ray Ni <ray.ni@intel.com>,
Laszlo Ersek <lersek@redhat.com>
Subject: [PATCH V2 2/3] MdeModulePkg/PartitionDxe: Skip the MBR that add for CD-ROM
Date: Wed, 8 Jul 2020 10:27:21 +0800 [thread overview]
Message-ID: <20200708022722.27024-3-zhichao.gao@intel.com> (raw)
In-Reply-To: <20200708022722.27024-1-zhichao.gao@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2823
Refer to
http://manpages.ubuntu.com/manpages/bionic/man8/mkudffs.8.html.
Some Linux ISOs may have the MBR table for compatibility reasons
for Windows. The MBR tale would contain the partition entry with
start LBA0 and whole media size. There are two methods to check
the filesystem in the CD-ROM:
1. MBR partition check (Windows)
2. Whole disk check (MAC OS)
UEFI doesn't have the MBR check for UDF and Eltorito. But it may
pass the MBR check for such table and fail to detect the filesystem
of UDF. Skip the MBR check if the MBR is added for Windows
compatiblity so that the partition driver can continue UDF and
ElTorito check.
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
.../Universal/Disk/PartitionDxe/Mbr.c | 38 ++++++++++++++++---
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
index aa0b6cadcc..b5cb56842a 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
@@ -39,6 +39,7 @@ PartitionValidMbr (
UINT32 StartingLBA;
UINT32 EndingLBA;
UINT32 NewEndingLBA;
+ UINT32 SizeInLBA;
INTN Index1;
INTN Index2;
BOOLEAN MbrValid;
@@ -51,13 +52,35 @@ PartitionValidMbr (
//
MbrValid = FALSE;
for (Index1 = 0; Index1 < MAX_MBR_PARTITIONS; Index1++) {
- if (Mbr->Partition[Index1].OSIndicator == 0x00 || UNPACK_UINT32 (Mbr->Partition[Index1].SizeInLBA) == 0) {
+ StartingLBA = UNPACK_UINT32 (Mbr->Partition[Index1].StartingLBA);
+ SizeInLBA = UNPACK_UINT32 (Mbr->Partition[Index1].SizeInLBA);
+
+ //
+ // If the MBR with partition entry contains itself, i.e. start with LBA0,
+ // and have the same size with the media, we treat it as a El Torito partition.
+ //
+ if ((StartingLBA == 0) &&
+ (SizeInLBA != 0) &&
+ (SizeInLBA == (LastLba + 1))) {
+ //
+ // Refer to the http://manpages.ubuntu.com/manpages/bionic/man8/mkudffs.8.html
+ // "WHOLE DISK VS PARTITION"
+ // Some linux ISOs may put the MBR table in the first 512 bytes for compatibility reasons with Windows.
+ // Linux kernel ignores MBR table if contains partition which starts at sector 0.
+ // Skip it because we don't have the partition check for UDF(El Torito compatible).
+ // It would continue to do the whole disk check in the UDF routine.
+ //
+ DEBUG ((DEBUG_INFO, "PartitionValidMbr: The MBR table has partition entry start at sector 0.\n"));
+
+ return FALSE;
+ }
+
+ if (Mbr->Partition[Index1].OSIndicator == 0x00 || SizeInLBA == 0) {
continue;
}
MbrValid = TRUE;
- StartingLBA = UNPACK_UINT32 (Mbr->Partition[Index1].StartingLBA);
- EndingLBA = StartingLBA + UNPACK_UINT32 (Mbr->Partition[Index1].SizeInLBA) - 1;
+ EndingLBA = StartingLBA + SizeInLBA - 1;
if (EndingLBA > LastLba) {
//
// Compatibility Errata:
@@ -77,12 +100,15 @@ PartitionValidMbr (
}
for (Index2 = Index1 + 1; Index2 < MAX_MBR_PARTITIONS; Index2++) {
- if (Mbr->Partition[Index2].OSIndicator == 0x00 || UNPACK_UINT32 (Mbr->Partition[Index2].SizeInLBA) == 0) {
+ StartingLBA = UNPACK_UINT32 (Mbr->Partition[Index2].StartingLBA);
+ SizeInLBA = UNPACK_UINT32 (Mbr->Partition[Index2].SizeInLBA);
+
+ if (Mbr->Partition[Index2].OSIndicator == 0x00 || SizeInLBA == 0) {
continue;
}
- NewEndingLBA = UNPACK_UINT32 (Mbr->Partition[Index2].StartingLBA) + UNPACK_UINT32 (Mbr->Partition[Index2].SizeInLBA) - 1;
- if (NewEndingLBA >= StartingLBA && UNPACK_UINT32 (Mbr->Partition[Index2].StartingLBA) <= EndingLBA) {
+ NewEndingLBA = StartingLBA + SizeInLBA - 1;
+ if (NewEndingLBA >= StartingLBA && StartingLBA <= EndingLBA) {
//
// This region overlaps with the Index1'th region
//
--
2.21.0.windows.1
next prev parent reply other threads:[~2020-07-08 2:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 2:27 [PATCH V2 0/3] MdeModulePkg/PartitionDxe: Fix the partition check issue Gao, Zhichao
2020-07-08 2:27 ` [PATCH V2 1/3] MdeModulePkg/PartitionDxe: Correct the MBR last block value Gao, Zhichao
2020-07-13 5:58 ` Ni, Ray
2020-07-13 7:19 ` Gao, Zhichao
2020-07-08 2:27 ` Gao, Zhichao [this message]
2020-07-13 6:44 ` [PATCH V2 2/3] MdeModulePkg/PartitionDxe: Skip the MBR that add for CD-ROM Ni, Ray
2020-07-13 8:14 ` Gao, Zhichao
2020-07-08 2:27 ` [PATCH V2 3/3] MdeModulePkg/PartitionDxe: Add already start check for child hanldes Gao, Zhichao
2020-07-08 15:59 ` [PATCH V2 0/3] MdeModulePkg/PartitionDxe: Fix the partition check issue Laszlo Ersek
2020-07-09 5:03 ` Wu, Hao A
2020-07-10 0:40 ` Gao, Zhichao
2020-07-10 0:50 ` Wu, Hao A
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200708022722.27024-3-zhichao.gao@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox