[ros-diffs] [pschweitzer] 67918: [NTFS] - Don't attempt to moon walk path name for reserved MFT entries. - Don't attempt to dereference file name if it doesn't exist

[pschweitzer]

Author: pschweitzer
Date: Tue May 26 07:10:45 2015
New Revision: 67918

URL: http://svn.reactos.org/svn/reactos?rev=67918&view=rev
Log:
[NTFS]
- Don't attempt to moon walk path name for reserved MFT entries.
- Don't attempt to dereference file name if it doesn't exist

Modified:
    trunk/reactos/drivers/filesystems/ntfs/create.c

Modified: trunk/reactos/drivers/filesystems/ntfs/create.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/create.c?rev=67918&r1=67917&r2=67918&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/ntfs/create.c     [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ntfs/create.c     [iso-8859-1] Tue May 26 
07:10:45 2015
@@ -98,8 +98,6 @@
 
     DPRINT1("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath);
 
-    Id = Id & NTFS_MFT_MASK;
-
     RtlZeroMemory(FullPath, sizeof(FullPath));
     MftRecord = ExAllocatePoolWithTag(NonPagedPool,
                                       DeviceExt->NtfsInfo.BytesPerFileRecord,
@@ -123,6 +121,13 @@
         }
 
         FileName = GetBestFileNameFromRecord(MftRecord);
+        if (FileName == NULL)
+        {
+            DPRINT1("$FILE_NAME attribute not found for %I64x\n", Id);
+            Status = STATUS_OBJECT_PATH_NOT_FOUND;
+            break;
+        }
+
         WritePosition -= FileName->NameLength;
         ASSERT(WritePosition < MAX_PATH);
         RtlCopyMemory(FullPath + WritePosition, FileName->Name, 
FileName->NameLength * sizeof(WCHAR));
@@ -276,10 +281,19 @@
 
     if ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID)
     {
+        ULONGLONG MFTId;
+
         if (FileObject->FileName.Length != sizeof(ULONGLONG))
             return STATUS_INVALID_PARAMETER;
 
-        Status = NtfsMoonWalkID(DeviceExt, 
(*(PULONGLONG)FileObject->FileName.Buffer), &FullPath);
+        MFTId = (*(PULONGLONG)FileObject->FileName.Buffer) & NTFS_MFT_MASK;
+        if (MFTId < 0xf)
+        {
+            UNIMPLEMENTED;
+            return STATUS_NOT_IMPLEMENTED;
+        }
+
+        Status = NtfsMoonWalkID(DeviceExt, MFTId, &FullPath);
         if (!NT_SUCCESS(Status))
         {
             return Status;