Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-17 12:27:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR]: Addendum to PXE r66034: don't read after Path buffer validity.

Browse source 
svn path=/trunk/; revision=66036
This commit is contained in:
Hermès Bélusca-Maïto 2015-01-13 23:19:21 +00:00
parent f5ab68a2c6
commit c788f45783
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/boot/freeldr/freeldr/fs/pxe.c
View file

@ -142,7 +142,7 @@ static ARC_STATUS PxeGetFileInformation(ULONG FileId, FILEINFORMATION* Informati
if (_OpenFile == NO_FILE || FileId != _OpenFile)
return EBADF;
RtlZeroMemory(Information, sizeof(FILEINFORMATION));
RtlZeroMemory(Information, sizeof(*Information));
Information->EndingAddress.LowPart = _FileSize;
Information->CurrentAddress.LowPart = _FilePosition;
@ -153,22 +153,27 @@ static ARC_STATUS PxeOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId)
{
t_PXENV_TFTP_GET_FSIZE sizeData;
t_PXENV_TFTP_OPEN openData;
ULONG i;
SIZE_T PathLen, i;
if (_OpenFile != NO_FILE)
return EIO;
if (OpenMode != OpenReadOnly)
return EACCES;
for (i = 0; i < sizeof(_OpenFileName) - 1; i++)
/* Retrieve the path length without NULL terminator */
PathLen = (Path ? min(strlen(Path), sizeof(_OpenFileName) - 1) : 0);
/* Zero out the file name */
RtlZeroMemory(_OpenFileName, sizeof(_OpenFileName));
/* Lowercase the path and always use slashes as separators */
for (i = 0; i < PathLen; i++)
{
if (Path[i] == '\\')
_OpenFileName[i] = '/';
else
_OpenFileName[i] = tolower(Path[i]);
}
while (i < sizeof(_OpenFileName))
_OpenFileName[i++] = '\0';
RtlZeroMemory(&sizeData, sizeof(sizeData));
sizeData.ServerIPAddress = _ServerIP;
@ -183,7 +188,7 @@ static ARC_STATUS PxeOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId)
if (_FileSize < 1024 * 1024)
{
_CachedFile = FrLdrTempAlloc(_FileSize, TAG_PXE_FILE);
// Don't check for allocation failure, we support _CachedFile = NULL
// Don't check for allocation failure, we support _CachedFile == NULL
}
_CachedLength = 0;