Case 1 - Within DuplicateFid() & DuplicateFe(): The call to AllocateCopyPool() may return NULL. Add ASSERTs as checks.
Case 2 - Within UdfRead(): Add ASSERT to ensure 'NewFileEntryData' returned from FindFileEntry() will not be NULL pointer. Case 3 - Within GetAllocationDescriptorLsn(): The return value of 'GetPdFromLongAd (Volume, ParentIcb)' may be NULL, and it will be passed into function GetShortAdLsn() which will dereference it. Add ASSERT in GetShortAdLsn() as check. Case 4 - Within ReadFile(): Add ASSERT to ensure 'Data' returned from GetAedAdsData() will not be NULL pointer. Case 5 - Within InternalFindFile(): If both 'Parent->FileIdentifierDesc' and 'Icb' are NULL, then possible NULL pointer dereference will happen in ReadDirectoryEntry(). Add additional check to resolve. Cc: Paulo Alcantara <[email protected]> Cc: Ruiyu Ni <[email protected]> Cc: Star Zeng <[email protected]> Cc: Eric Dong <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Hao Wu <[email protected]> --- MdeModulePkg/Universal/Disk/UdfDxe/File.c | 1 + MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/File.c b/MdeModulePkg/Universal/Disk/UdfDxe/File.c index 01361141bb..82db75475b 100644 --- a/MdeModulePkg/Universal/Disk/UdfDxe/File.c +++ b/MdeModulePkg/Universal/Disk/UdfDxe/File.c @@ -427,6 +427,7 @@ UdfRead ( if (EFI_ERROR (Status)) { goto Error_Find_Fe; } + ASSERT (NewFileEntryData != NULL); if (IS_FE_SYMLINK (NewFileEntryData)) { Status = ResolveSymlink ( diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c index 4609580b30..02a73a9eb9 100644 --- a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c +++ b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c @@ -297,6 +297,8 @@ GetShortAdLsn ( IN UDF_SHORT_ALLOCATION_DESCRIPTOR *ShortAd ) { + ASSERT (PartitionDesc != NULL); + return (UINT64)PartitionDesc->PartitionStartingLocation + ShortAd->ExtentPosition; } @@ -480,6 +482,8 @@ DuplicateFid ( *NewFileIdentifierDesc = (UDF_FILE_IDENTIFIER_DESCRIPTOR *)AllocateCopyPool ( (UINTN) GetFidDescriptorLength (FileIdentifierDesc), FileIdentifierDesc); + + ASSERT (*NewFileIdentifierDesc != NULL); } // @@ -494,6 +498,8 @@ DuplicateFe ( ) { *NewFileEntry = AllocateCopyPool (Volume->FileEntrySize, FileEntry); + + ASSERT (*NewFileEntry != NULL); } // @@ -1028,6 +1034,7 @@ ReadFile ( if (EFI_ERROR (Status)) { goto Error_Get_Aed; } + ASSERT (Data != NULL); AdOffset = 0; continue; @@ -1209,6 +1216,13 @@ InternalFindFile ( VOID *CompareFileEntry; // + // Check if both Parent->FileIdentifierDesc and Icb are NULL. + // + if ((Parent->FileIdentifierDesc == NULL) && (Icb == NULL)) { + return EFI_INVALID_PARAMETER; + } + + // // Check if parent file is really directory. // if (!IS_FE_DIRECTORY (Parent->FileEntry)) { @@ -1220,6 +1234,10 @@ InternalFindFile ( // FE/EFE and FID descriptors. // if (StrCmp (FileName, L".") == 0) { + if (Parent->FileIdentifierDesc == NULL) { + return EFI_INVALID_PARAMETER; + } + DuplicateFe (BlockIo, Volume, Parent->FileEntry, &File->FileEntry); DuplicateFid (Parent->FileIdentifierDesc, &File->FileIdentifierDesc); -- 2.12.0.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
