Handle operations in files and directories from UDF/ECMA-167 file systems.\r
\r
Copyright (C) 2014-2017 Paulo Alcantara <pcacjr@zytor.com>\r
+ Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials are licensed and made available\r
under the terms and conditions of the BSD License which accompanies this\r
FileName = TempFileName + 1;\r
}\r
\r
- StrCpyS (NewPrivFileData->FileName, UDF_PATH_LENGTH, FileName);\r
+ StrCpyS (NewPrivFileData->FileName, UDF_FILENAME_LENGTH, FileName);\r
\r
Status = GetFileSize (\r
PrivFsData->BlockIo,\r
FreePool ((VOID *)NewFileEntryData);\r
NewFileEntryData = FoundFile.FileEntry;\r
\r
- Status = GetFileNameFromFid (NewFileIdentifierDesc, FileName);\r
+ Status = GetFileNameFromFid (NewFileIdentifierDesc, ARRAY_SIZE (FileName), FileName);\r
if (EFI_ERROR (Status)) {\r
FreePool ((VOID *)FoundFile.FileIdentifierDesc);\r
goto Error_Get_FileName;\r
FoundFile.FileIdentifierDesc = NewFileIdentifierDesc;\r
FoundFile.FileEntry = NewFileEntryData;\r
\r
- Status = GetFileNameFromFid (FoundFile.FileIdentifierDesc, FileName);\r
+ Status = GetFileNameFromFid (FoundFile.FileIdentifierDesc, ARRAY_SIZE (FileName), FileName);\r
if (EFI_ERROR (Status)) {\r
goto Error_Get_FileName;\r
}\r
/**\r
Get information about a file.\r
\r
+ @attention This is boundary function that may receive untrusted input.\r
+ @attention The input is from FileSystem.\r
+\r
+ The File Set Descriptor is external input, so this routine will do basic\r
+ validation for File Set Descriptor and report status.\r
+\r
@param This Protocol instance pointer.\r
@param InformationType Type of information to return in Buffer.\r
@param BufferSize On input size of buffer, on output amount of data in\r
*String = *(UINT8 *)(OstaCompressed + Index) << 8;\r
Index++;\r
} else {\r
+ if (Index > ARRAY_SIZE (VolumeLabel)) {\r
+ return EFI_VOLUME_CORRUPTED;\r
+ }\r
+\r
*String = 0;\r
}\r
\r
String++;\r
}\r
\r
- *String = L'\0';\r
+ Index = ((UINTN)String - (UINTN)VolumeLabel) / sizeof (CHAR16);\r
+ if (Index > ARRAY_SIZE (VolumeLabel) - 1) {\r
+ Index = ARRAY_SIZE (VolumeLabel) - 1;\r
+ }\r
+ VolumeLabel[Index] = L'\0';\r
\r
FileSystemInfoLength = StrSize (VolumeLabel) +\r
sizeof (EFI_FILE_SYSTEM_INFO);\r
}\r
\r
FileSystemInfo = (EFI_FILE_SYSTEM_INFO *)Buffer;\r
- StrCpyS (FileSystemInfo->VolumeLabel, ARRAY_SIZE (VolumeLabel),\r
- VolumeLabel);\r
+ StrCpyS (\r
+ FileSystemInfo->VolumeLabel,\r
+ (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)) / sizeof (CHAR16),\r
+ VolumeLabel\r
+ );\r
Status = GetVolumeSize (\r
PrivFsData->BlockIo,\r
PrivFsData->DiskIo,\r