Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS] Addendum to da81345: Fix checks when a hive is opened in shared mode.
by Hermès Bélusca-Maïto 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b2bbd1125a935fb50e97… commit 0b2bbd1125a935fb50e979812d3a34cfde500882 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 13 00:27:41 2017 +0100 [NTOS] Addendum to da81345: Fix checks when a hive is opened in shared mode. --- ntoskrnl/config/cminit.c | 14 ++++++++------ ntoskrnl/config/cmsysini.c | 7 +++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/config/cminit.c b/ntoskrnl/config/cminit.c index 46ab61e4b3..bf055fd914 100644 --- a/ntoskrnl/config/cminit.c +++ b/ntoskrnl/config/cminit.c @@ -38,15 +38,17 @@ CmpInitializeHive(OUT PCMHIVE *CmHive, /* * The following are invalid: - * An external hive that is also internal. - * A log hive that's not a primary hive too. - * A volatile hive that's linked to permanent storage. - * An in-memory initialization without hive data. - * A log hive that's not linked to a correct file type. + * - An external hive that is also internal. + * - A log hive that is not a primary hive too. + * - A volatile hive that is linked to permanent storage, + * unless this hive is a shared system hive. + * - An in-memory initialization without hive data. + * - A log hive that is not linked to a correct file type. */ if (((External) && ((Primary) || (Log))) || ((Log) && !(Primary)) || - ((HiveFlags & HIVE_VOLATILE) && ((Primary) || (External) || (Log))) || + (!(CmpShareSystemHives) && (HiveFlags & HIVE_VOLATILE) && + ((Primary) || (External) || (Log))) || ((OperationType == HINIT_MEMORY) && (!HiveData)) || ((Log) && (FileType != HFILE_TYPE_LOG))) { diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 112543fac7..a433485eb2 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -1297,9 +1297,12 @@ CmpLoadHiveThread(IN PVOID StartContext) &CmpMachineHiveList[i].Allocate, 0); if (!(NT_SUCCESS(Status)) || - (!(CmHive->FileHandles[HFILE_TYPE_LOG]) && !(CmpMiniNTBoot))) // HACK + (!(CmpShareSystemHives) && !(CmHive->FileHandles[HFILE_TYPE_LOG]))) { - /* We failed or couldn't get a log file, raise a hard error */ + /* + * We failed, or could not get a log file (unless + * the hive is shared), raise a hard error. + */ ErrorParameters = &FileName; NtRaiseHardError(STATUS_CANNOT_LOAD_REGISTRY_FILE, 1,

1 0

[reactos] 01/01: [SETUPAPI] Improve the range list implementation. - SEH-protect the range list validation and move it into a separate function. - Use a mutex to synchronize access to the range list. - Implement CM_First_Range and parts of CM_Add_Range.
by Eric Kohl 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ad5c7fd84bdcce26db5f… commit 3ad5c7fd84bdcce26db5f46a2afd4c7a972c7700 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 12 23:27:09 2017 +0100 [SETUPAPI] Improve the range list implementation. - SEH-protect the range list validation and move it into a separate function. - Use a mutex to synchronize access to the range list. - Implement CM_First_Range and parts of CM_Add_Range. --- dll/win32/setupapi/cfgmgr.c | 162 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 150 insertions(+), 12 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 898b755ec3..14f05963e2 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -69,17 +69,18 @@ typedef struct _NOTIFY_DATA #define NOTIFY_MAGIC 0x44556677 -typedef struct _INTERNAL_RANGE_ELEMENT +typedef struct _INTERNAL_RANGE { - struct _INTERNAL_RANGE_ELEMENT *Next; - ULONG ulDummy; -} INTERNAL_RANGE_ELEMENT, *PINTERNAL_RANGE_ELEMENT; + LIST_ENTRY ListEntry; + DWORDLONG ullStart; + DWORDLONG ullEnd; +} INTERNAL_RANGE, *PINTERNAL_RANGE; typedef struct _INTERNAL_RANGE_LIST { ULONG ulMagic; - PINTERNAL_RANGE_ELEMENT Current; - PINTERNAL_RANGE_ELEMENT First; + HANDLE hMutex; + LIST_ENTRY ListHead; } INTERNAL_RANGE_LIST, *PINTERNAL_RANGE_LIST; #define RANGE_LIST_MAGIC 0x33445566 @@ -338,6 +339,30 @@ done: } +BOOL +IsValidRangeList( + _In_ PINTERNAL_RANGE_LIST pRangeList) +{ + BOOL bValid = TRUE; + + if (pRangeList == NULL) + return FALSE; + + _SEH2_TRY + { + if (pRangeList->ulMagic != RANGE_LIST_MAGIC) + bValid = FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bValid = FALSE; + } + _SEH2_END; + + return bValid; +} + + /*********************************************************************** * CMP_GetBlockedDriverInfo [SETUPAPI.@] */ @@ -950,9 +975,53 @@ CM_Add_Range( _In_ RANGE_LIST rlh, _In_ ULONG ulFlags) { + PINTERNAL_RANGE_LIST pRangeList; + PINTERNAL_RANGE pRange; + CONFIGRET ret = CR_SUCCESS; + FIXME("CM_Add_Range(%I64u %I64u %p %lx)\n", ullStartValue, ullEndValue, rlh, ulFlags); - return CR_CALL_NOT_IMPLEMENTED; + + pRangeList = (PINTERNAL_RANGE_LIST)rlh; + + if (!IsValidRangeList(pRangeList)) + return CR_INVALID_RANGE_LIST; + + if (ulFlags & ~CM_ADD_RANGE_BITS) + return CR_INVALID_FLAG; + + if (ullEndValue < ullStartValue) + return CR_INVALID_RANGE; + + /* Lock the range list */ + WaitForSingleObject(pRangeList->hMutex, INFINITE); + + /* Allocate the new range */ + pRange = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNAL_RANGE)); + if (pRange == NULL) + { + ret = CR_OUT_OF_MEMORY; + goto done; + } + + pRange->ullStart = ullStartValue; + pRange->ullEnd = ullEndValue; + + /* Insert the range */ + if (IsListEmpty(&pRangeList->ListHead)) + { + InsertTailList(&pRangeList->ListHead, &pRange->ListEntry); + } + else + { + + } + +done: + /* Unlock the range list */ + ReleaseMutex(pRangeList->hMutex); + + return ret; } @@ -1266,13 +1335,23 @@ CM_Create_Range_List( if (prlh == NULL) return CR_INVALID_POINTER; + /* Allocate the range list */ pRangeList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(INTERNAL_RANGE_LIST)); if (pRangeList == NULL) return CR_OUT_OF_MEMORY; + /* Set the magic value */ pRangeList->ulMagic = RANGE_LIST_MAGIC; - // TODO: More initialization + /* Initialize the mutex for synchonized access */ + pRangeList->hMutex = CreateMutex(NULL, FALSE, NULL); + if (pRangeList->hMutex == NULL) + { + HeapFree(GetProcessHeap(), 0, pRangeList); + return CR_FAILURE; + } + + InitializeListHead(&pRangeList->ListHead); *prlh = (RANGE_LIST)pRangeList; @@ -1814,9 +1893,49 @@ CM_First_Range( _Out_ PRANGE_ELEMENT preElement, _In_ ULONG ulFlags) { + PINTERNAL_RANGE_LIST pRangeList; + PINTERNAL_RANGE pRange; + PLIST_ENTRY ListEntry; + CONFIGRET ret = CR_SUCCESS; + FIXME("CM_First_Range(%p %p %p %p %lx)\n", rlh, pullStart, pullEnd, preElement, ulFlags); - return CR_CALL_NOT_IMPLEMENTED; + + pRangeList = (PINTERNAL_RANGE_LIST)rlh; + + if (!IsValidRangeList(pRangeList)) + return CR_INVALID_RANGE_LIST; + + if (pullStart == NULL || pullEnd == NULL || preElement == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + /* Lock the range list */ + WaitForSingleObject(pRangeList->hMutex, INFINITE); + + /* Fail, if the list is empty */ + if (IsListEmpty(&pRangeList->ListHead)) + { + ret = CR_FAILURE; + goto done; + } + + /* Get the first range */ + ListEntry = pRangeList->ListHead.Flink; + pRange = CONTAINING_RECORD(ListEntry, INTERNAL_RANGE, ListEntry); + + /* Return the range data */ + *pullStart = pRange->ullStart; + *pullEnd = pRange->ullEnd; + *preElement = (RANGE_ELEMENT)pRange; + +done: + /* Unlock the range list */ + ReleaseMutex(pRangeList->hMutex); + + return ret; } @@ -1920,19 +2039,38 @@ CM_Free_Range_List( _In_ ULONG ulFlags) { PINTERNAL_RANGE_LIST pRangeList; + PINTERNAL_RANGE pRange; + PLIST_ENTRY ListEntry; - FIXME("CM_Free_Range_List(%p %lx)\n", RangeList, ulFlags); + FIXME("CM_Free_Range_List(%p %lx)\n", + RangeList, ulFlags); pRangeList = (PINTERNAL_RANGE_LIST)RangeList; - if (pRangeList == NULL || pRangeList->ulMagic != RANGE_LIST_MAGIC) + if (!IsValidRangeList(pRangeList)) return CR_INVALID_RANGE_LIST; if (ulFlags != 0) return CR_INVALID_FLAG; - // TODO: Free the list of ranges + /* Lock the range list */ + WaitForSingleObject(pRangeList->hMutex, INFINITE); + + /* Free the list of ranges */ + while (!IsListEmpty(&pRangeList->ListHead)) + { + ListEntry = RemoveHeadList(&pRangeList->ListHead); + pRange = CONTAINING_RECORD(ListEntry, INTERNAL_RANGE, ListEntry); + HeapFree(GetProcessHeap(), 0, pRange); + } + + /* Unlock the range list */ + ReleaseMutex(pRangeList->hMutex); + + /* Close the mutex */ + CloseHandle(pRangeList->hMutex); + /* Free the range list */ HeapFree(GetProcessHeap(), 0, pRangeList); return CR_SUCCESS;

1 0

[reactos] 05/05: [CDFS_NEW] Now NtWriteFile is fixed, revert 5f25582, ie remove FastIO hack from the driver CORE-14003
by Pierre Schweitzer 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=faee3753ea79c7e332c7a… commit faee3753ea79c7e332c7a1b5eb74ca2c6614e23d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Nov 12 22:36:47 2017 +0100 [CDFS_NEW] Now NtWriteFile is fixed, revert 5f25582, ie remove FastIO hack from the driver CORE-14003 --- drivers/filesystems/cdfs_new/cdinit.c | 36 ----------------------------------- 1 file changed, 36 deletions(-) diff --git a/drivers/filesystems/cdfs_new/cdinit.c b/drivers/filesystems/cdfs_new/cdinit.c index 1f086fe61d..b6bec14c45 100755 --- a/drivers/filesystems/cdfs_new/cdinit.c +++ b/drivers/filesystems/cdfs_new/cdinit.c @@ -58,29 +58,6 @@ CdShutdown ( #pragma alloc_text(INIT, CdInitializeGlobalData) #endif -#ifdef __REACTOS__ - -// -// Stub for CcWrite, this is a hack -// -BOOLEAN -NTAPI -CdFastIoWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN ULONG LockKey, - IN PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - ASSERT(FALSE); - return FALSE; -} - -#endif - // // Local support routine @@ -365,19 +342,6 @@ Return Value: CdFastIoDispatch.SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); CdFastIoDispatch.FastIoCheckIfPossible = CdFastIoCheckIfPossible; // CheckForFastIo CdFastIoDispatch.FastIoRead = FsRtlCopyRead; // Read -#ifdef __REACTOS__ - - // - // Add a stub for CdFastIoWrite. This is a hack required because - // our current implementation of NtWriteFile won't validate - // access granted to files opened. And some applications may attempt - // to write to a file. In case it is cached, the kernel will null-dereference - // the fastIO routine, trying to call it. - // FIXME: remove once NtWriteFile got fixed! - // - - CdFastIoDispatch.FastIoWrite = CdFastIoWrite; // Write -#endif CdFastIoDispatch.FastIoQueryBasicInfo = CdFastQueryBasicInfo; // QueryBasicInfo CdFastIoDispatch.FastIoQueryStandardInfo = CdFastQueryStdInfo; // QueryStandardInfo CdFastIoDispatch.FastIoLock = CdFastLock; // Lock

1 0

[reactos] 04/05: [NTOSKNRL] In NtWriteFile, remove the check that is now redundant with ObReferenceFileObjectForWrite(). CORE-14003
by Pierre Schweitzer 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d777ffab5458495c04f2… commit 1d777ffab5458495c04f250cf7ced379f306a7af Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Nov 12 22:33:58 2017 +0100 [NTOSKNRL] In NtWriteFile, remove the check that is now redundant with ObReferenceFileObjectForWrite(). CORE-14003 --- ntoskrnl/io/iomgr/iofunc.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 9ab983ac21..46fcce201d 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -3511,21 +3511,6 @@ NtWriteFile(IN HANDLE FileHandle, { _SEH2_TRY { - /* - * Check if the handle has either FILE_WRITE_DATA or - * FILE_APPEND_DATA granted. However, if this is a named pipe, - * make sure we don't ask for FILE_APPEND_DATA as it interferes - * with the FILE_CREATE_PIPE_INSTANCE access right! - */ - if (!(ObjectHandleInfo.GrantedAccess & - ((!(FileObject->Flags & FO_NAMED_PIPE) ? - FILE_APPEND_DATA : 0) | FILE_WRITE_DATA))) - { - /* We failed */ - ObDereferenceObject(FileObject); - _SEH2_YIELD(return STATUS_ACCESS_DENIED); - } - /* Probe the status block */ ProbeForWriteIoStatusBlock(IoStatusBlock);

1 0

[reactos] 03/05: [NTOSKRNL] In NtWriteFile, quit using ObReferenceObjectByHandle in favor of ObReferenceFileObjectForWrite(). This avoids RO FSDs being called for write operations. CORE-14003
by Pierre Schweitzer 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3d5a3f2bdff97f03b802… commit c3d5a3f2bdff97f03b802fe95dce9d0c9375e53e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Nov 12 22:32:16 2017 +0100 [NTOSKRNL] In NtWriteFile, quit using ObReferenceObjectByHandle in favor of ObReferenceFileObjectForWrite(). This avoids RO FSDs being called for write operations. CORE-14003 --- ntoskrnl/io/iomgr/iofunc.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 93f1fe4e5f..9ab983ac21 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -3499,19 +3499,11 @@ NtWriteFile(IN HANDLE FileHandle, CapturedByteOffset.QuadPart = 0; IOTRACE(IO_API_DEBUG, "FileHandle: %p\n", FileHandle); - /* Get File Object - * FIXME: We should call ObReferenceFileObjectForWrite() instead to - * check whether write access was actually granted. If not it will - * fail and we will return. - * That would allow avoiding ASSERT on FastIO later on if the FSD - * is read-only - */ - Status = ObReferenceObjectByHandle(FileHandle, - 0, - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - &ObjectHandleInfo); + /* Get File Object for write */ + Status = ObReferenceFileObjectForWrite(FileHandle, + PreviousMode, + &FileObject, + &ObjectHandleInfo); if (!NT_SUCCESS(Status)) return Status; /* Validate User-Mode Buffers */

1 0

[reactos] 02/05: [NTOSKRNL] Implement (with many FIXMEs) ObReferenceFileObjectForWrite() so that it can already do the job! CORE-14003
by Pierre Schweitzer 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b64f7f8fbbc64ada4dfd… commit 3b64f7f8fbbc64ada4dfdb6bdd1feff4bac10c1d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Nov 12 22:28:54 2017 +0100 [NTOSKRNL] Implement (with many FIXMEs) ObReferenceFileObjectForWrite() so that it can already do the job! CORE-14003 --- ntoskrnl/include/internal/ob.h | 9 ++++ ntoskrnl/ob/obref.c | 108 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/ntoskrnl/include/internal/ob.h b/ntoskrnl/include/internal/ob.h index a78b5ad457..374f4a2c3e 100644 --- a/ntoskrnl/include/internal/ob.h +++ b/ntoskrnl/include/internal/ob.h @@ -384,6 +384,15 @@ ObpDeleteObjectType( IN PVOID Object ); +NTSTATUS +NTAPI +ObReferenceFileObjectForWrite( + IN HANDLE Handle, + IN KPROCESSOR_MODE AccessMode, + OUT PFILE_OBJECT *FileObject, + OUT POBJECT_HANDLE_INFORMATION HandleInformation +); + // // DOS Devices Functions // diff --git a/ntoskrnl/ob/obref.c b/ntoskrnl/ob/obref.c index 00e2188069..2f4da20149 100644 --- a/ntoskrnl/ob/obref.c +++ b/ntoskrnl/ob/obref.c @@ -15,6 +15,8 @@ #define NDEBUG #include <debug.h> +extern ULONG ObpAccessProtectCloseBit; + /* PRIVATE FUNCTIONS *********************************************************/ BOOLEAN @@ -195,6 +197,112 @@ ObFastReplaceObject(IN PEX_FAST_REF FastRef, return OldObject; } +NTSTATUS +NTAPI +ObReferenceFileObjectForWrite(IN HANDLE Handle, + IN KPROCESSOR_MODE AccessMode, + OUT PFILE_OBJECT *FileObject, + OUT POBJECT_HANDLE_INFORMATION HandleInformation) +{ + NTSTATUS Status; + PHANDLE_TABLE HandleTable; + POBJECT_HEADER ObjectHeader; + PHANDLE_TABLE_ENTRY HandleEntry; + ACCESS_MASK GrantedAccess, DesiredAccess; + + /* Assume failure */ + *FileObject = NULL; + + /* Check if this is a special handle */ + if (HandleToLong(Handle) < 0) + { + /* Make sure we have a valid kernel handle */ + if (AccessMode != KernelMode || Handle == NtCurrentProcess() || Handle == NtCurrentThread()) + { + return STATUS_INVALID_HANDLE; + } + + /* Use the kernel handle table and get the actual handle value */ + Handle = ObKernelHandleToHandle(Handle); + HandleTable = ObpKernelHandleTable; + } + else + { + /* Otherwise use this process's handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + ASSERT(HandleTable != NULL); + KeEnterCriticalRegion(); + + /* Get the handle entry */ + HandleEntry = ExMapHandleToPointer(HandleTable, Handle); + if (HandleEntry) + { + /* Get the object header and validate the type*/ + ObjectHeader = ObpGetHandleObject(HandleEntry); + + /* Get the desired access from the file object */ + if (!NT_SUCCESS(IoComputeDesiredAccessFileObject((PFILE_OBJECT)&ObjectHeader->Body, + &DesiredAccess))) + { + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + else + { + /* Extract the granted access from the handle entry */ + if (BooleanFlagOn(NtGlobalFlag, FLG_KERNEL_STACK_TRACE_DB)) + { + /* FIXME: Translate granted access */ + GrantedAccess = HandleEntry->GrantedAccess; + } + else + { + GrantedAccess = HandleEntry->GrantedAccess & ~ObpAccessProtectCloseBit; + } + + /* FIXME: Get handle information for audit */ + + HandleInformation->GrantedAccess = GrantedAccess; + + /* FIXME: Get handle attributes */ + HandleInformation->HandleAttributes = 0; + + /* Do granted and desired access match? */ + if (GrantedAccess & DesiredAccess) + { + /* FIXME: Audit access if required */ + + /* Reference the object directly since we have its header */ + InterlockedIncrement(&ObjectHeader->PointerCount); + + /* Unlock the handle */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + KeLeaveCriticalRegion(); + + *FileObject = (PFILE_OBJECT)&ObjectHeader->Body; + + /* Return success */ + ASSERT(*FileObject != NULL); + return STATUS_SUCCESS; + } + + /* No match, deny write access */ + Status = STATUS_ACCESS_DENIED; + + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + } + } + else + { + Status = STATUS_INVALID_HANDLE; + } + + /* Return failure status */ + KeLeaveCriticalRegion(); + return Status; +} + /* PUBLIC FUNCTIONS *********************************************************/ LONG_PTR

1 0

[reactos] 01/05: [NTOSKRNL] Implement IoComputeDesiredAccessFileObject() based on checks performed in NtFlushBuffersFile() CORE-14003
by Pierre Schweitzer 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eefe702949da68e49c43… commit 7eefe702949da68e49c4365d466c5373099c3b1f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Nov 12 22:26:18 2017 +0100 [NTOSKRNL] Implement IoComputeDesiredAccessFileObject() based on checks performed in NtFlushBuffersFile() CORE-14003 --- ntoskrnl/include/internal/io.h | 7 +++++++ ntoskrnl/io/iomgr/util.c | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 54a46906db..2a4c62f42d 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1230,6 +1230,13 @@ IopDoNameTransmogrify( IN PREPARSE_DATA_BUFFER DataBuffer ); +NTSTATUS +NTAPI +IoComputeDesiredAccessFileObject( + IN PFILE_OBJECT FileObject, + IN PACCESS_MASK DesiredAccess +); + // // I/O Timer Routines // diff --git a/ntoskrnl/io/iomgr/util.c b/ntoskrnl/io/iomgr/util.c index 14bfafda7c..7329dbf8f1 100644 --- a/ntoskrnl/io/iomgr/util.c +++ b/ntoskrnl/io/iomgr/util.c @@ -19,6 +19,33 @@ NTAPI RtlpGetStackLimits(PULONG_PTR StackBase, PULONG_PTR StackLimit); +/* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +IoComputeDesiredAccessFileObject(IN PFILE_OBJECT FileObject, + IN PACCESS_MASK DesiredAccess) +{ + /* Assume failure */ + *DesiredAccess = 0; + + /* First check we really have a FileObject */ + if (OBJECT_TO_OBJECT_HEADER(FileObject)->Type != IoFileObjectType) + { + return STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Then compute desired access: + * Check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was + * granted. However, if this is a named pipe, make sure we don't ask for + * FILE_APPEND_DATA as it interferes with the FILE_CREATE_PIPE_INSTANCE + * access right! + */ + *DesiredAccess = ((!(FileObject->Flags & FO_NAMED_PIPE) ? FILE_APPEND_DATA : 0) | FILE_WRITE_DATA); + + return STATUS_SUCCESS; +} + /* FUNCTIONS *****************************************************************/ /*

1 0

[reactos] 01/01: [NTOS] Do not perform hive write operations when we are not supposed to.
by Hermès Bélusca-Maïto 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da8134527b69a2a1bc019… commit da8134527b69a2a1bc0193352dcb73b70762f613 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 12 22:02:45 2017 +0100 [NTOS] Do not perform hive write operations when we are not supposed to. - When we are in LiveCD mode (more generally, when hives are shared), load the system hives as volatile. - Ignore hive write operations when everything operates in read-only mode and just return success instead. - Just return success on hive file I/O if no file is associated with a given hive. This happens when e.g. a CM hive has a primary but no log. --- ntoskrnl/config/cmsysini.c | 8 ++++++-- ntoskrnl/config/cmwraprs.c | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 6b079ce0d4..112543fac7 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -900,7 +900,7 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* We imported, no need to create a new hive */ Allocate = FALSE; - /* Manually set the hive as volatile, if in Live CD mode */ + /* Manually set the hive as volatile, if in LiveCD mode */ if (CmpShareSystemHives) SystemHive->Hive.HiveFlags = HIVE_VOLATILE; } else @@ -1433,9 +1433,13 @@ CmpInitializeHiveList(IN USHORT Flag) /* Loop every hive we care about */ for (i = 0; i < CM_NUMBER_OF_MACHINE_HIVES; i++) { - /* Make sure the list is setup */ + /* Make sure the list is set up */ ASSERT(CmpMachineHiveList[i].Name != NULL); + /* Load the hive as volatile, if in LiveCD mode */ + if (CmpShareSystemHives) + CmpMachineHiveList[i].HHiveFlags |= HIVE_VOLATILE; + /* Create a thread to handle this hive */ Status = PsCreateSystemThread(&Thread, THREAD_ALL_ACCESS, diff --git a/ntoskrnl/config/cmwraprs.c b/ntoskrnl/config/cmwraprs.c index 031dc77c00..0f5e47da92 100644 --- a/ntoskrnl/config/cmwraprs.c +++ b/ntoskrnl/config/cmwraprs.c @@ -82,6 +82,10 @@ CmpFileRead(IN PHHIVE RegistryHive, IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; + /* Just return success if no file is associated with this hive */ + if (HiveHandle == NULL) + return TRUE; + _FileOffset.QuadPart = *FileOffset; Status = ZwReadFile(HiveHandle, NULL, NULL, NULL, &IoStatusBlock, Buffer, (ULONG)BufferLength, &_FileOffset, NULL); @@ -102,6 +106,14 @@ CmpFileWrite(IN PHHIVE RegistryHive, IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; + /* Just return success if no file is associated with this hive */ + if (HiveHandle == NULL) + return TRUE; + + /* Don't do anything if we're not supposed to */ + if (CmpNoWrite) + return TRUE; + _FileOffset.QuadPart = *FileOffset; Status = ZwWriteFile(HiveHandle, NULL, NULL, NULL, &IoStatusBlock, Buffer, (ULONG)BufferLength, &_FileOffset, NULL); @@ -122,6 +134,10 @@ CmpFileSetSize(IN PHHIVE RegistryHive, IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; + /* Just return success if no file is associated with this hive */ + if (HiveHandle == NULL) + return TRUE; + EndOfFileInfo.EndOfFile.QuadPart = FileSize; Status = ZwSetInformationFile(HiveHandle, &IoStatusBlock, @@ -153,6 +169,14 @@ CmpFileFlush(IN PHHIVE RegistryHive, IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; + /* Just return success if no file is associated with this hive */ + if (HiveHandle == NULL) + return TRUE; + + /* Don't do anything if we're not supposed to */ + if (CmpNoWrite) + return TRUE; + Status = ZwFlushBuffersFile(HiveHandle, &IoStatusBlock); return NT_SUCCESS(Status) ? TRUE : FALSE; }

1 0

[reactos] 01/01: [CDFS_NEW] Following 1bef487, add a hack and stub FastIO write routine to avoid bugchecks on write attempts. This allows booting the ReactOS LiveCD as HDD image in Qemu without issues :-)
by Pierre Schweitzer 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f255827d3282b2dea1bc… commit 5f255827d3282b2dea1bc6d5ba77607550742ced Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Nov 12 21:16:31 2017 +0100 [CDFS_NEW] Following 1bef487, add a hack and stub FastIO write routine to avoid bugchecks on write attempts. This allows booting the ReactOS LiveCD as HDD image in Qemu without issues :-) --- drivers/filesystems/cdfs_new/cdinit.c | 36 +++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/drivers/filesystems/cdfs_new/cdinit.c b/drivers/filesystems/cdfs_new/cdinit.c index b6bec14c45..1f086fe61d 100755 --- a/drivers/filesystems/cdfs_new/cdinit.c +++ b/drivers/filesystems/cdfs_new/cdinit.c @@ -58,6 +58,29 @@ CdShutdown ( #pragma alloc_text(INIT, CdInitializeGlobalData) #endif +#ifdef __REACTOS__ + +// +// Stub for CcWrite, this is a hack +// +BOOLEAN +NTAPI +CdFastIoWrite ( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + ASSERT(FALSE); + return FALSE; +} + +#endif + // // Local support routine @@ -342,6 +365,19 @@ Return Value: CdFastIoDispatch.SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); CdFastIoDispatch.FastIoCheckIfPossible = CdFastIoCheckIfPossible; // CheckForFastIo CdFastIoDispatch.FastIoRead = FsRtlCopyRead; // Read +#ifdef __REACTOS__ + + // + // Add a stub for CdFastIoWrite. This is a hack required because + // our current implementation of NtWriteFile won't validate + // access granted to files opened. And some applications may attempt + // to write to a file. In case it is cached, the kernel will null-dereference + // the fastIO routine, trying to call it. + // FIXME: remove once NtWriteFile got fixed! + // + + CdFastIoDispatch.FastIoWrite = CdFastIoWrite; // Write +#endif CdFastIoDispatch.FastIoQueryBasicInfo = CdFastQueryBasicInfo; // QueryBasicInfo CdFastIoDispatch.FastIoQueryStandardInfo = CdFastQueryStdInfo; // QueryStandardInfo CdFastIoDispatch.FastIoLock = CdFastLock; // Lock

1 0

[reactos] 01/01: [NTOSKRNL] Add a FIXME in NtWriteFile() that explains how broken is our current implementation regarding read-only FSDs
by Pierre Schweitzer 12 Nov '17

12 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1bef48796e4df655c71dd… commit 1bef48796e4df655c71ddd92a00417dbe9e530ca Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Nov 12 21:11:22 2017 +0100 [NTOSKRNL] Add a FIXME in NtWriteFile() that explains how broken is our current implementation regarding read-only FSDs --- ntoskrnl/io/iomgr/iofunc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 5aa67ee3e1..93f1fe4e5f 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -3499,7 +3499,13 @@ NtWriteFile(IN HANDLE FileHandle, CapturedByteOffset.QuadPart = 0; IOTRACE(IO_API_DEBUG, "FileHandle: %p\n", FileHandle); - /* Get File Object */ + /* Get File Object + * FIXME: We should call ObReferenceFileObjectForWrite() instead to + * check whether write access was actually granted. If not it will + * fail and we will return. + * That would allow avoiding ASSERT on FastIO later on if the FSD + * is read-only + */ Status = ObReferenceObjectByHandle(FileHandle, 0, IoFileObjectType,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs