ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FASTFAT]

Browse Source 
Reject more broken file names on open/create.
Fixes a few kmtests:IoFilesystem tests

svn path=/trunk/; revision=73923
This commit is contained in:
Pierre Schweitzer
2017-02-26 13:32:55 +00:00
parent 12a5c1fb9a
commit 68b4b8905e
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/drivers/filesystems/fastfat/create.c
+20
View File
@@ -398,6 +398,7 @@ VfatCreateFile(
BOOLEAN PagingFileCreate;
BOOLEAN Dots;
BOOLEAN OpenTargetDir;
BOOLEAN TrailingBackslash;
UNICODE_STRING FileNameU;
UNICODE_STRING PathNameU;
ULONG Attributes;
@@ -508,6 +509,9 @@ VfatCreateFile(
PathNameU = FileObject->FileName;
c = PathNameU.Buffer + PathNameU.Length / sizeof(WCHAR);
last = c - 1;
TrailingBackslash = (*last == L'\\');
Dots = TRUE;
while (c-- > PathNameU.Buffer)
{
@@ -517,6 +521,12 @@ VfatCreateFile(
{
return STATUS_OBJECT_NAME_INVALID;
}
if (*c == L'\\' && (c - 1) > PathNameU.Buffer &&
*(c - 1) == L'\\')
{
return STATUS_OBJECT_NAME_INVALID;
}
last = c - 1;
Dots = TRUE;
}
@@ -690,6 +700,11 @@ VfatCreateFile(
RequestedDisposition == FILE_OVERWRITE_IF ||
RequestedDisposition == FILE_SUPERSEDE)
{
if (TrailingBackslash & !BooleanFlagOn(RequestedOptions, FILE_DIRECTORY_FILE))
{
return STATUS_OBJECT_NAME_INVALID;
}
Attributes = Stack->Parameters.Create.FileAttributes & ~FILE_ATTRIBUTE_NORMAL;
if (!BooleanFlagOn(RequestedOptions, FILE_DIRECTORY_FILE))
Attributes |= FILE_ATTRIBUTE_ARCHIVE;
@@ -780,6 +795,11 @@ VfatCreateFile(
VfatCloseFile (DeviceExt, FileObject);
return STATUS_NOT_A_DIRECTORY;
}
if (!vfatFCBIsDirectory(pFcb) && TrailingBackslash)
{
VfatCloseFile (DeviceExt, FileObject);
return STATUS_OBJECT_NAME_INVALID;
}
#ifndef USE_ROS_CC_AND_FS
if (!vfatFCBIsDirectory(pFcb))
{