Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[navaraf] 13586: Fix inline assembler register specification (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10153).

by navaraf＠svn.reactos.com

Fix inline assembler register specification (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10153). Modified: branches/cache_manager_rewrite/reactos/hal/halx86/include/hal.h _____ Modified: branches/cache_manager_rewrite/reactos/hal/halx86/include/hal.h --- branches/cache_manager_rewrite/reactos/hal/halx86/include/hal.h 2005-02-15 19:26:13 UTC (rev 13585) +++ branches/cache_manager_rewrite/reactos/hal/halx86/include/hal.h 2005-02-15 19:40:30 UTC (rev 13586) @@ -417,13 +417,13 @@ static inline BYTE Ki386ReadFsByte(ULONG offset) { BYTE b; - __asm__ __volatile__("movb %%fs:(%1),%0":"=g" (b):"0" (offset)); + __asm__ __volatile__("movb %%fs:(%1),%0":"=q" (b):"0" (offset)); return b; } static inline VOID Ki386WriteFsByte(ULONG offset, BYTE value) { - __asm__ __volatile__("movb %0,%%fs:(%1)"::"r" (value), "r" (offset)); + __asm__ __volatile__("movb %0,%%fs:(%1)"::"q" (value), "r" (offset)); } #elif defined(_MSC_VER)

19 years, 10 months

[gvg] 13585: Use bitwise operators for ROUND_UP/DOWN and rename them

by gvg＠svn.reactos.com

Use bitwise operators for ROUND_UP/DOWN and rename them to ROUND_UP_POW2/ROUND_DOWN_POW2 Modified: trunk/reactos/tools/mkhive/binhive.c _____ Modified: trunk/reactos/tools/mkhive/binhive.c --- trunk/reactos/tools/mkhive/binhive.c 2005-02-15 17:25:01 UTC (rev 13584) +++ trunk/reactos/tools/mkhive/binhive.c 2005-02-15 19:26:13 UTC (rev 13585) @@ -49,8 +49,8 @@ #define REG_EXTEND_HASH_TABLE_SIZE 4 #define REG_VALUE_LIST_CELL_MULTIPLE 4 -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) -#define ROUND_UP(N, S) ROUND_DOWN((N) + (S) - 1, (S)) +#define ROUND_UP_POW2(N,S) (((N) + (S) - 1) & ~((S) - 1)) +#define ROUND_DOWN_POW2(N,S) ((N) & ~((S) - 1)) #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V)) @@ -326,7 +326,7 @@ BaseKeyName = strrchr(KeyName, '\\') + 1; NameSize = strlen(BaseKeyName); - CellSize = ROUND_UP(sizeof(KEY_CELL) + NameSize - 1, 16); + CellSize = ROUND_UP_POW2(sizeof(KEY_CELL) + NameSize - 1, 16); memset (RootKeyCell, 0, CellSize); RootKeyCell->CellSize = (ULONG)-(LONG)CellSize; @@ -786,7 +786,7 @@ *Block = NULL; /* Round to 16 bytes multiple */ - CellSize = ROUND_UP(CellSize, 16); + CellSize = ROUND_UP_POW2(CellSize, 16); /* first search in free blocks */ NewBlock = NULL;

19 years, 10 months

[gvg] 13584: Fix ROUND_UP when N is a multiple of S. Proposed by unC0Rr.

by gvg＠svn.reactos.com

Fix ROUND_UP when N is a multiple of S. Proposed by unC0Rr. Modified: trunk/reactos/tools/mkhive/binhive.c _____ Modified: trunk/reactos/tools/mkhive/binhive.c --- trunk/reactos/tools/mkhive/binhive.c 2005-02-15 15:46:22 UTC (rev 13583) +++ trunk/reactos/tools/mkhive/binhive.c 2005-02-15 17:25:01 UTC (rev 13584) @@ -49,8 +49,8 @@ #define REG_EXTEND_HASH_TABLE_SIZE 4 #define REG_VALUE_LIST_CELL_MULTIPLE 4 -#define ROUND_UP(N, S) ((N) + (S) - ((N) % (S))) #define ROUND_DOWN(N, S) ((N) - ((N) % (S))) +#define ROUND_UP(N, S) ROUND_DOWN((N) + (S) - 1, (S)) #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V))

19 years, 10 months

[weiden] 13583: secured buffer access in NtCreateSection(), NtOpenSection(), NtMapViewOfSection(), NtQuerySection() and NtExtendSection()

by weiden＠svn.reactos.com

secured buffer access in NtCreateSection(), NtOpenSection(), NtMapViewOfSection(), NtQuerySection() and NtExtendSection() Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-02-15 14:37:53 UTC (rev 13582) +++ trunk/reactos/include/ntos/zw.h 2005-02-15 15:46:22 UTC (rev 13583) @@ -5420,10 +5420,10 @@ STDCALL NtQuerySection( IN HANDLE SectionHandle, - IN CINT SectionInformationClass, + IN SECTION_INFORMATION_CLASS SectionInformationClass, OUT PVOID SectionInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN ULONG SectionInformationLength, + OUT PULONG ResultLength OPTIONAL ); /* @@ -6451,10 +6451,10 @@ STDCALL ZwQuerySection( IN HANDLE SectionHandle, - IN CINT SectionInformationClass, + IN SECTION_INFORMATION_CLASS SectionInformationClass, OUT PVOID SectionInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN ULONG SectionInformationLength, + OUT PULONG ResultLength OPTIONAL ); typedef struct _SECTION_IMAGE_INFORMATION _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-02-15 14:37:53 UTC (rev 13582) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-02-15 15:46:22 UTC (rev 13583) @@ -50,6 +50,12 @@ #define SWAPENTRY_FROM_SSE(E) ((E) >> 1) #define MAKE_SWAP_SSE(S) (((S) << 1) | 0x1) +static const INFORMATION_CLASS_INFO ExSectionInfoClass[] = +{ + ICI_SQ_SAME( sizeof(SECTION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SectionBasicInformation */ + ICI_SQ_SAME( sizeof(SECTION_IMAGE_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SectionImageInformation */ +}; + /* FUNCTIONS *****************************************************************/ /* Note: Mmsp prefix denotes "Memory Manager Section Private". */ @@ -3309,9 +3315,36 @@ IN ULONG AllocationAttributes, IN HANDLE FileHandle OPTIONAL) { + LARGE_INTEGER SafeMaximumSize; PSECTION_OBJECT SectionObject; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + PreviousMode = ExGetPreviousMode(); + + if(MaximumSize != NULL && PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForRead(MaximumSize, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* make a copy on the stack */ + SafeMaximumSize = *MaximumSize; + MaximumSize = &SafeMaximumSize; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + /* * Check the protection */ @@ -3367,18 +3400,53 @@ ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes) { - NTSTATUS Status; + HANDLE hSection; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(SectionHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } - *SectionHandle = 0; - Status = ObOpenObjectByName(ObjectAttributes, MmSectionObjectType, NULL, - UserMode, + PreviousMode, DesiredAccess, NULL, - SectionHandle); + &hSection); + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *SectionHandle = hSection; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + return(Status); } @@ -3487,26 +3555,77 @@ * @implemented */ NTSTATUS STDCALL -NtMapViewOfSection(HANDLE SectionHandle, - HANDLE ProcessHandle, - PVOID* BaseAddress, - ULONG ZeroBits, - ULONG CommitSize, - PLARGE_INTEGER SectionOffset, - PULONG ViewSize, - SECTION_INHERIT InheritDisposition, - ULONG AllocationType, - ULONG Protect) +NtMapViewOfSection(IN HANDLE SectionHandle, + IN HANDLE ProcessHandle, + IN OUT PVOID* BaseAddress OPTIONAL, + IN ULONG ZeroBits OPTIONAL, + IN ULONG CommitSize, + IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PULONG ViewSize, + IN SECTION_INHERIT InheritDisposition, + IN ULONG AllocationType OPTIONAL, + IN ULONG Protect) { + PVOID SafeBaseAddress; + LARGE_INTEGER SafeSectionOffset; + ULONG SafeViewSize; PSECTION_OBJECT Section; PEPROCESS Process; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; PMADDRESS_SPACE AddressSpace; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + SafeBaseAddress = NULL; + SafeSectionOffset.QuadPart = 0; + SafeViewSize = 0; + + _SEH_TRY + { + if(BaseAddress != NULL) + { + ProbeForWrite(BaseAddress, + sizeof(PVOID), + sizeof(ULONG)); + SafeBaseAddress = *BaseAddress; + } + if(SectionOffset != NULL) + { + ProbeForWrite(SectionOffset, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + SafeSectionOffset = *SectionOffset; + } + ProbeForWrite(ViewSize, + sizeof(ULONG), + sizeof(ULONG)); + SafeViewSize = *ViewSize; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + SafeBaseAddress = (BaseAddress != NULL ? *BaseAddress : NULL); + SafeSectionOffset.QuadPart = (SectionOffset != NULL ? SectionOffset->QuadPart : 0); + SafeViewSize = (ViewSize != NULL ? *ViewSize : 0); + } Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_VM_OPERATION, PsProcessType, - UserMode, + PreviousMode, (PVOID*)(PVOID)&Process, NULL); if (!NT_SUCCESS(Status)) @@ -3519,7 +3638,7 @@ Status = ObReferenceObjectByHandle(SectionHandle, SECTION_MAP_READ, MmSectionObjectType, - UserMode, + PreviousMode, (PVOID*)(PVOID)&Section, NULL); if (!(NT_SUCCESS(Status))) @@ -3531,17 +3650,42 @@ Status = MmMapViewOfSection(Section, Process, - BaseAddress, + (BaseAddress != NULL ? &SafeBaseAddress : NULL), ZeroBits, CommitSize, - SectionOffset, - ViewSize, + (SectionOffset != NULL ? &SafeSectionOffset : NULL), + (ViewSize != NULL ? &SafeViewSize : NULL), InheritDisposition, AllocationType, Protect); ObDereferenceObject(Section); ObDereferenceObject(Process); + + if(NT_SUCCESS(Status)) + { + /* copy parameters back to the caller */ + _SEH_TRY + { + if(BaseAddress != NULL) + { + *BaseAddress = SafeBaseAddress; + } + if(SectionOffset != NULL) + { + *SectionOffset = SafeSectionOffset; + } + if(ViewSize != NULL) + { + *ViewSize = SafeViewSize; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } return(Status); } @@ -3809,16 +3953,19 @@ PVOID BaseAddress) { PEPROCESS Process; + KPROCESSOR_MODE PreviousMode; NTSTATUS Status; DPRINT("NtUnmapViewOfSection(ProcessHandle %x, BaseAddress %x)\n", ProcessHandle, BaseAddress); + PreviousMode = ExGetPreviousMode(); + DPRINT("Referencing process\n"); Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_VM_OPERATION, PsProcessType, - UserMode, + PreviousMode, (PVOID*)(PVOID)&Process, NULL); if (!NT_SUCCESS(Status)) @@ -3857,98 +4004,120 @@ * * @return Status. * - * @todo Guard by SEH. * @implemented */ NTSTATUS STDCALL NtQuerySection(IN HANDLE SectionHandle, - IN CINT SectionInformationClass, + IN SECTION_INFORMATION_CLASS SectionInformationClass, OUT PVOID SectionInformation, - IN ULONG Length, - OUT PULONG ResultLength) + IN ULONG SectionInformationLength, + OUT PULONG ResultLength OPTIONAL) { PSECTION_OBJECT Section; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + DefaultQueryInfoBufferCheck(SectionInformationClass, + ExSectionInfoClass, + SectionInformation, + SectionInformationLength, + ResultLength, + PreviousMode, + &Status); + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtQuerySection() failed, Status: 0x%x\n", Status); + return Status; + } + Status = ObReferenceObjectByHandle(SectionHandle, SECTION_QUERY, MmSectionObjectType, - UserMode, + PreviousMode, (PVOID*)(PVOID)&Section, NULL); - if (!(NT_SUCCESS(Status))) + if (NT_SUCCESS(Status)) { - return(Status); - } - - switch (SectionInformationClass) - { - case SectionBasicInformation: + switch (SectionInformationClass) + { + case SectionBasicInformation: { - PSECTION_BASIC_INFORMATION Sbi; + PSECTION_BASIC_INFORMATION Sbi = (PSECTION_BASIC_INFORMATION)SectionInformation; - if (Length != sizeof(SECTION_BASIC_INFORMATION)) + _SEH_TRY { - ObDereferenceObject(Section); - return(STATUS_INFO_LENGTH_MISMATCH); - } + Sbi->Attributes = Section->AllocationAttributes; + if (Section->AllocationAttributes & SEC_IMAGE) + { + Sbi->BaseAddress = 0; + Sbi->Size.QuadPart = 0; + } + else + { + Sbi->BaseAddress = (PVOID)Section->Segment->VirtualAddress; + Sbi->Size.QuadPart = Section->Segment->Length; + } - Sbi = (PSECTION_BASIC_INFORMATION)SectionInformation; - - Sbi->Attributes = Section->AllocationAttributes; - if (Section->AllocationAttributes & SEC_IMAGE) - { - Sbi->BaseAddress = 0; - Sbi->Size.QuadPart = 0; + if (ResultLength != NULL) + { + *ResultLength = sizeof(SECTION_BASIC_INFORMATION); + } + Status = STATUS_SUCCESS; } - else + _SEH_HANDLE { - Sbi->BaseAddress = (PVOID)Section->Segment->VirtualAddress; - Sbi->Size.QuadPart = Section->Segment->Length; + Status = _SEH_GetExceptionCode(); } - - *ResultLength = sizeof(SECTION_BASIC_INFORMATION); - Status = STATUS_SUCCESS; + _SEH_END; + break; } - case SectionImageInformation: + case SectionImageInformation: { - PSECTION_IMAGE_INFORMATION Sii; + PSECTION_IMAGE_INFORMATION Sii = (PSECTION_IMAGE_INFORMATION)SectionInformation; - if (Length != sizeof(SECTION_IMAGE_INFORMATION)) + _SEH_TRY { - ObDereferenceObject(Section); - return(STATUS_INFO_LENGTH_MISMATCH); + memset(Sii, 0, sizeof(SECTION_IMAGE_INFORMATION)); + if (Section->AllocationAttributes & SEC_IMAGE) + { + PMM_IMAGE_SECTION_OBJECT ImageSectionObject; + ImageSectionObject = Section->ImageSection; + + Sii->EntryPoint = ImageSectionObject->EntryPoint; + Sii->StackReserve = ImageSectionObject->StackReserve; + Sii->StackCommit = ImageSectionObject->StackCommit; + Sii->Subsystem = ImageSectionObject->Subsystem; + Sii->MinorSubsystemVersion = ImageSectionObject->MinorSubsystemVersion; + Sii->MajorSubsystemVersion = ImageSectionObject->MajorSubsystemVersion; + Sii->Characteristics = ImageSectionObject->ImageCharacteristics; + Sii->ImageNumber = ImageSectionObject->Machine; + Sii->Executable = ImageSectionObject->Executable; + } + + if (ResultLength != NULL) + { + *ResultLength = sizeof(SECTION_IMAGE_INFORMATION); + } + Status = STATUS_SUCCESS; } - - Sii = (PSECTION_IMAGE_INFORMATION)SectionInformation; - memset(Sii, 0, sizeof(SECTION_IMAGE_INFORMATION)); - if (Section->AllocationAttributes & SEC_IMAGE) + _SEH_HANDLE { - PMM_IMAGE_SECTION_OBJECT ImageSectionObject; - ImageSectionObject = Section->ImageSection; - - Sii->EntryPoint = ImageSectionObject->EntryPoint; - Sii->StackReserve = ImageSectionObject->StackReserve; - Sii->StackCommit = ImageSectionObject->StackCommit; - Sii->Subsystem = ImageSectionObject->Subsystem; - Sii->MinorSubsystemVersion = ImageSectionObject->MinorSubsystemVersion; - Sii->MajorSubsystemVersion = ImageSectionObject->MajorSubsystemVersion; - Sii->Characteristics = ImageSectionObject->ImageCharacteristics; - Sii->ImageNumber = ImageSectionObject->Machine; - Sii->Executable = ImageSectionObject->Executable; + Status = _SEH_GetExceptionCode(); } - *ResultLength = sizeof(SECTION_IMAGE_INFORMATION); - Status = STATUS_SUCCESS; + _SEH_END; + break; } + } - default: - *ResultLength = 0; - Status = STATUS_INVALID_INFO_CLASS; + ObDereferenceObject(Section); } - ObDereferenceObject(Section); + return(Status); } @@ -3964,7 +4133,6 @@ * * @return Status. * - * @todo Guard by SEH. * @todo Move the actual code to internal function MmExtendSection. * @unimplemented */ @@ -3972,13 +4140,40 @@ NtExtendSection(IN HANDLE SectionHandle, IN PLARGE_INTEGER NewMaximumSize) { + LARGE_INTEGER SafeNewMaximumSize; PSECTION_OBJECT Section; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForRead(NewMaximumSize, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* make a copy on the stack */ + SafeNewMaximumSize = *NewMaximumSize; + NewMaximumSize = &SafeNewMaximumSize; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } Status = ObReferenceObjectByHandle(SectionHandle, SECTION_EXTEND_SIZE, MmSectionObjectType, - UserMode, + PreviousMode, (PVOID*)&Section, NULL); if (!NT_SUCCESS(Status))

19 years, 10 months

[weiden] 13582: don't leak the captured file name in NtCreatePagingFile() when probing the other parameters failed

by weiden＠svn.reactos.com

don't leak the captured file name in NtCreatePagingFile() when probing the other parameters failed Modified: trunk/reactos/ntoskrnl/mm/pagefile.c _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2005-02-15 13:40:10 UTC (rev 13581) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2005-02-15 14:37:53 UTC (rev 13582) @@ -775,6 +775,7 @@ } PreviousMode = ExGetPreviousMode(); + Status = RtlCaptureUnicodeString(&CapturedFileName, PreviousMode, PagedPool, @@ -805,6 +806,9 @@ if (!NT_SUCCESS(Status)) { + RtlReleaseCapturedUnicodeString(&CapturedFileName, + PreviousMode, + FALSE); return Status; } } @@ -834,6 +838,7 @@ CreateFileTypeNone, NULL, SL_OPEN_PAGING_FILE | IO_NO_PARAMETER_CHECKING); + RtlReleaseCapturedUnicodeString(&CapturedFileName, PreviousMode, FALSE);

19 years, 10 months

[weiden] 13581: distinguish kmode and umode alertability

by weiden＠svn.reactos.com

distinguish kmode and umode alertability Modified: trunk/reactos/include/ddk/types.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ke/alert.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ddk/types.h --- trunk/reactos/include/ddk/types.h 2005-02-15 11:46:31 UTC (rev 13580) +++ trunk/reactos/include/ddk/types.h 2005-02-15 13:40:10 UTC (rev 13581) @@ -8,7 +8,7 @@ /* * Various other types (all quite pointless) */ -typedef CCHAR KPROCESSOR_MODE; +typedef UCHAR KPROCESSOR_MODE; typedef UCHAR KIRQL; typedef KIRQL* PKIRQL; typedef ULONG IO_ALLOCATION_ACTION; _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-02-15 11:46:31 UTC (rev 13580) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-02-15 13:40:10 UTC (rev 13581) @@ -73,7 +73,7 @@ /* Thread state (one of THREAD_STATE_xxx constants below) */ UCHAR State; /* 2D */ - UCHAR Alerted[2]; /* 2E */ + BOOLEAN Alerted[2]; /* 2E */ UCHAR Iopl; /* 30 */ UCHAR NpxState; /* 31 */ CHAR Saturation; /* 32 */ _____ Modified: trunk/reactos/ntoskrnl/ke/alert.c --- trunk/reactos/ntoskrnl/ke/alert.c 2005-02-15 11:46:31 UTC (rev 13580) +++ trunk/reactos/ntoskrnl/ke/alert.c 2005-02-15 13:40:10 UTC (rev 13581) @@ -37,14 +37,11 @@ OldIrql = KeAcquireDispatcherDatabaseLock(); KiAcquireSpinLock(&Thread->ApcQueueLock); - /* NOTE: Albert Almeida claims Alerted[1] is never used. Two kind of - * alerts _do_ seem useless. -Gunnar - */ - OldState = Thread->Alerted[0]; + OldState = Thread->Alerted[AlertMode]; /* If the Thread is Alerted, Clear it */ if (OldState) { - Thread->Alerted[0] = FALSE; + Thread->Alerted[AlertMode] = FALSE; } else if ((AlertMode == UserMode) && (!IsListEmpty(&Thread->ApcState.ApcListHead[UserMode]))) { /* If the mode is User and the Queue isn't empty, set Pending */ Thread->ApcState.UserApcPending = TRUE; @@ -65,20 +62,19 @@ oldIrql = KeAcquireDispatcherDatabaseLock(); - /* Return if thread is already alerted. - * NOTE: Albert Almeida claims Alerted[1] is never used. Two kind of - * alerts _do_ seem useless. -Gunnar - */ - if (Thread->Alerted[0] == FALSE) + /* Return if thread is already alerted. */ + if (Thread->Alerted[AlertMode] == FALSE) { - Thread->Alerted[0] = TRUE; - if (Thread->State == THREAD_STATE_BLOCKED && - Thread->WaitMode == AlertMode && + (AlertMode == KernelMode || Thread->WaitMode == AlertMode) && Thread->Alertable) { KiAbortWaitThread(Thread, STATUS_ALERTED); } + else + { + Thread->Alerted[AlertMode] = TRUE; + } } KeReleaseDispatcherDatabaseLock(oldIrql); @@ -124,11 +120,12 @@ return(Status); } - /* FIXME: should we always use UserMode here, even if the ntoskrnl exported - * ZwAlertThread was called? - * -Gunnar - */ - KeAlertThread((PKTHREAD)Thread, PreviousMode); + /* do an alert depending on the processor mode. If some kmode code wants to + enforce a umode alert it should call KeAlertThread() directly. If kmode + code wants to do a kmode alert it's sufficient to call it with Zw or just + use KeAlertThread() directly */ + + KeAlertThread(&Thread->Tcb, PreviousMode); ObDereferenceObject(Thread); return(STATUS_SUCCESS); @@ -142,11 +139,12 @@ STDCALL NtTestAlert(VOID) { + KPROCESSOR_MODE PreviousMode; + + PreviousMode = ExGetPreviousMode(); + /* Check and Alert Thread if needed */ - if (KeTestAlertThread(KeGetPreviousMode())) { - return STATUS_ALERTED; - } else { - return STATUS_SUCCESS; - } + + return KeTestAlertThread(PreviousMode) ? STATUS_ALERTED : STATUS_SUCCESS; } _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-02-15 11:46:31 UTC (rev 13580) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-02-15 13:40:10 UTC (rev 13581) @@ -134,7 +134,7 @@ typedef UCHAR KIRQL, *PKIRQL; typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; typedef ULONG KAFFINITY, *PKAFFINITY; -typedef CCHAR KPROCESSOR_MODE; +typedef UCHAR KPROCESSOR_MODE; typedef enum _MODE { KernelMode,

19 years, 10 months

[weiden] 13580: NtQueueApcThread always inserts a umode apc

by weiden＠svn.reactos.com

NtQueueApcThread always inserts a umode apc Modified: trunk/reactos/ntoskrnl/ke/apc.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-02-14 22:50:15 UTC (rev 13579) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-02-15 11:46:31 UTC (rev 13580) @@ -548,14 +548,14 @@ return(STATUS_NO_MEMORY); } - /* Initialize and Queue */ + /* Initialize and Queue a user mode apc (always!) */ KeInitializeApc(Apc, &Thread->Tcb, OriginalApcEnvironment, KiFreeApcRoutine, NULL, ApcRoutine, - PreviousMode, + UserMode, NormalContext); if (!KeInsertQueueApc(Apc, SystemArgument1, SystemArgument2, IO_NO_INCREMENT)) { Status = STATUS_UNSUCCESSFUL;

19 years, 10 months

[weiden] 13579: secured access to buffers in NtWaitForSingleObject(), NtWaitForMultipleObjects() and NtSignalAndWaitForSingleObject()

by weiden＠svn.reactos.com

secured access to buffers in NtWaitForSingleObject(), NtWaitForMultipleObjects() and NtSignalAndWaitForSingleObject() Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-02-14 21:41:49 UTC (rev 13578) +++ trunk/reactos/include/ntos/zw.h 2005-02-14 22:50:15 UTC (rev 13579) @@ -4423,28 +4423,28 @@ /* * FUNCTION: Signals an object and wait for an other one. * ARGUMENTS: - * SignalObject = Handle to the object that should be signaled - * WaitObject = Handle to the object that should be waited for + * ObjectHandleToSignal = Handle to the object that should be signaled + * WaitableObjectHandle = Handle to the object that should be waited for * Alertable = True if the wait is alertable - * Time = The time to wait + * TimeOut = The time to wait * RETURNS: Status */ NTSTATUS STDCALL NtSignalAndWaitForSingleObject( - IN HANDLE SignalObject, - IN HANDLE WaitObject, + IN HANDLE ObjectHandleToSignal, + IN HANDLE WaitableObjectHandle, IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + IN PLARGE_INTEGER TimeOut OPTIONAL ); NTSTATUS STDCALL NtSignalAndWaitForSingleObject( - IN HANDLE SignalObject, - IN HANDLE WaitObject, + IN HANDLE ObjectHandleToSignal, + IN HANDLE WaitableObjectHandle, IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + IN PLARGE_INTEGER TimeOut OPTIONAL ); /* @@ -4651,9 +4651,9 @@ /* * FUNCTION: Waits for an object to become signalled. * ARGUMENTS: - * Object = The object handle + * ObjectHandle = The object handle * Alertable = If true the wait is alertable. - * Time = The maximum wait time. + * TimeOut = The maximum wait time. * REMARKS: * This function maps to the win32 WaitForSingleObjectEx. * RETURNS: Status @@ -4661,17 +4661,17 @@ NTSTATUS STDCALL NtWaitForSingleObject ( - IN HANDLE Object, + IN HANDLE ObjectHandle, IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + IN PLARGE_INTEGER TimeOut OPTIONAL ); NTSTATUS STDCALL ZwWaitForSingleObject ( - IN HANDLE Object, + IN HANDLE ObjectHandle, IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + IN PLARGE_INTEGER TimeOut OPTIONAL ); /* --- EVENT PAIR OBJECT --- */ @@ -5583,11 +5583,11 @@ /* * FUNCTION: Waits for multiple objects to become signalled. * ARGUMENTS: - * Count = The number of objects - * Object = The array of object handles + * ObjectCount = The number of objects + * ObjectsArray = The array of object handles * WaitType = Can be one of the values UserMode or KernelMode * Alertable = If true the wait is alertable. - * Time = The maximum wait time. + * TimeOut = The maximum wait time. * REMARKS: * This function maps to the win32 WaitForMultipleObjectEx. * RETURNS: Status @@ -5595,11 +5595,11 @@ NTSTATUS STDCALL NtWaitForMultipleObjects ( - IN ULONG Count, - IN HANDLE Object[], + IN ULONG ObjectCount, + IN PHANDLE ObjectsArray, IN WAIT_TYPE WaitType, IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + IN PLARGE_INTEGER TimeOut OPTIONAL ); @@ -6357,11 +6357,11 @@ /* * FUNCTION: Waits for multiple objects to become signalled. * ARGUMENTS: - * Count = The number of objects - * Object = The array of object handles + * ObjectCount = The number of objects + * ObjectsArray = The array of object handles * WaitType = Can be one of the values UserMode or KernelMode * Alertable = If true the wait is alertable. - * Time = The maximum wait time. + * TimeOut = The maximum wait time. * REMARKS: * This function maps to the win32 WaitForMultipleObjectEx. * RETURNS: Status @@ -6369,11 +6369,11 @@ NTSTATUS STDCALL ZwWaitForMultipleObjects ( - IN ULONG Count, - IN HANDLE Object[], + IN ULONG ObjectCount, + IN PHANDLE ObjectsArray, IN WAIT_TYPE WaitType, IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time + IN PLARGE_INTEGER TimeOut OPTIONAL ); /* _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-02-14 21:41:49 UTC (rev 13578) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-02-14 22:50:15 UTC (rev 13579) @@ -785,45 +785,71 @@ } NTSTATUS STDCALL -NtWaitForMultipleObjects(IN ULONG Count, - IN HANDLE Object [], +NtWaitForMultipleObjects(IN ULONG ObjectCount, + IN PHANDLE ObjectsArray, IN WAIT_TYPE WaitType, IN BOOLEAN Alertable, - IN PLARGE_INTEGER UnsafeTime) + IN PLARGE_INTEGER TimeOut OPTIONAL) { KWAIT_BLOCK WaitBlockArray[MAXIMUM_WAIT_OBJECTS]; + HANDLE SafeObjectsArray[MAXIMUM_WAIT_OBJECTS]; PVOID ObjectPtrArray[MAXIMUM_WAIT_OBJECTS]; - NTSTATUS Status; ULONG i, j; - KPROCESSOR_MODE WaitMode; - LARGE_INTEGER Time; + KPROCESSOR_MODE PreviousMode; + LARGE_INTEGER SafeTimeOut; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtWaitForMultipleObjects(Count %lu Object[] %x, Alertable %d, " - "Time %x)\n", Count,Object,Alertable,Time); + DPRINT("NtWaitForMultipleObjects(ObjectCount %lu ObjectsArray[] %x, Alertable %d, " + "TimeOut %x)\n", ObjectCount,ObjectsArray,Alertable,TimeOut); - if (Count > MAXIMUM_WAIT_OBJECTS) + PreviousMode = ExGetPreviousMode(); + + if (ObjectCount > MAXIMUM_WAIT_OBJECTS) return STATUS_UNSUCCESSFUL; - if (0 == Count) + if (0 == ObjectCount) return STATUS_INVALID_PARAMETER; - if (UnsafeTime) + if(PreviousMode != KernelMode) + { + _SEH_TRY { - Status = MmCopyFromCaller(&Time, UnsafeTime, sizeof(LARGE_INTEGER)); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + ProbeForRead(ObjectsArray, + ObjectCount * sizeof(ObjectsArray[0]), + sizeof(ULONG)); + /* make a copy so we don't have to guard with SEH later and keep track of + what objects we referenced in case dereferencing pointers suddenly fails */ + RtlCopyMemory(SafeObjectsArray, ObjectsArray, ObjectCount * sizeof(ObjectsArray[0])); + ObjectsArray = SafeObjectsArray; + + if(TimeOut != NULL) + { + ProbeForRead(TimeOut, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* make a local copy of the timeout on the stack */ + SafeTimeOut = *TimeOut; + TimeOut = &SafeTimeOut; + } } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } - WaitMode = ExGetPreviousMode(); - /* reference all objects */ - for (i = 0; i < Count; i++) + for (i = 0; i < ObjectCount; i++) { - Status = ObReferenceObjectByHandle(Object[i], + Status = ObReferenceObjectByHandle(ObjectsArray[i], SYNCHRONIZE, NULL, - WaitMode, + PreviousMode, &ObjectPtrArray[i], NULL); if (!NT_SUCCESS(Status) || !KiIsObjectWaitable(ObjectPtrArray[i])) @@ -845,17 +871,17 @@ } } - Status = KeWaitForMultipleObjects(Count, + Status = KeWaitForMultipleObjects(ObjectCount, ObjectPtrArray, WaitType, UserRequest, - WaitMode, + PreviousMode, Alertable, - UnsafeTime ? &Time : NULL, + TimeOut, WaitBlockArray); /* dereference all objects */ - for (i = 0; i < Count; i++) + for (i = 0; i < ObjectCount; i++) { ObDereferenceObject(ObjectPtrArray[i]); } @@ -868,33 +894,47 @@ * @implemented */ NTSTATUS STDCALL -NtWaitForSingleObject(IN HANDLE Object, +NtWaitForSingleObject(IN HANDLE ObjectHandle, IN BOOLEAN Alertable, - IN PLARGE_INTEGER UnsafeTime) + IN PLARGE_INTEGER TimeOut OPTIONAL) { PVOID ObjectPtr; - NTSTATUS Status; - KPROCESSOR_MODE WaitMode; - LARGE_INTEGER Time; + KPROCESSOR_MODE PreviousMode; + LARGE_INTEGER SafeTimeOut; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtWaitForSingleObject(Object %x, Alertable %d, Time %x)\n", - Object,Alertable,Time); + DPRINT("NtWaitForSingleObject(ObjectHandle %x, Alertable %d, TimeOut %x)\n", + ObjectHandle,Alertable,TimeOut); - if (UnsafeTime) + PreviousMode = ExGetPreviousMode(); + + if(TimeOut != NULL && PreviousMode != KernelMode) + { + _SEH_TRY { - Status = MmCopyFromCaller(&Time, UnsafeTime, sizeof(LARGE_INTEGER)); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + ProbeForRead(TimeOut, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* make a copy on the stack */ + SafeTimeOut = *TimeOut; + TimeOut = &SafeTimeOut; } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } - WaitMode = ExGetPreviousMode(); - - Status = ObReferenceObjectByHandle(Object, + Status = ObReferenceObjectByHandle(ObjectHandle, SYNCHRONIZE, NULL, - WaitMode, + PreviousMode, &ObjectPtr, NULL); if (!NT_SUCCESS(Status)) @@ -911,9 +951,9 @@ { Status = KeWaitForSingleObject(ObjectPtr, UserRequest, - WaitMode, + PreviousMode, Alertable, - UnsafeTime ? &Time : NULL); + TimeOut); } ObDereferenceObject(ObjectPtr); @@ -923,22 +963,47 @@ NTSTATUS STDCALL -NtSignalAndWaitForSingleObject(IN HANDLE SignalObject, - IN HANDLE WaitObject, +NtSignalAndWaitForSingleObject(IN HANDLE ObjectHandleToSignal, + IN HANDLE WaitableObjectHandle, IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time) + IN PLARGE_INTEGER TimeOut OPTIONAL) { - KPROCESSOR_MODE WaitMode; + KPROCESSOR_MODE PreviousMode; DISPATCHER_HEADER* hdr; PVOID SignalObj; PVOID WaitObj; - NTSTATUS Status; + LARGE_INTEGER SafeTimeOut; + NTSTATUS Status = STATUS_SUCCESS; - WaitMode = ExGetPreviousMode(); - Status = ObReferenceObjectByHandle(SignalObject, + PreviousMode = ExGetPreviousMode(); + + if(TimeOut != NULL && PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForRead(TimeOut, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* make a copy on the stack */ + SafeTimeOut = *TimeOut; + TimeOut = &SafeTimeOut; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + Status = ObReferenceObjectByHandle(ObjectHandleToSignal, 0, NULL, - WaitMode, + PreviousMode, &SignalObj, NULL); if (!NT_SUCCESS(Status)) @@ -946,10 +1011,10 @@ return Status; } - Status = ObReferenceObjectByHandle(WaitObject, + Status = ObReferenceObjectByHandle(WaitableObjectHandle, SYNCHRONIZE, NULL, - WaitMode, + PreviousMode, &WaitObj, NULL); if (!NT_SUCCESS(Status)) @@ -988,9 +1053,9 @@ Status = KeWaitForSingleObject(WaitObj, UserRequest, - WaitMode, + PreviousMode, Alertable, - Time); + TimeOut); ObDereferenceObject(SignalObj); ObDereferenceObject(WaitObj); _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-02-14 21:41:49 UTC (rev 13578) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-02-14 22:50:15 UTC (rev 13579) @@ -9131,17 +9131,17 @@ NTSTATUS DDKAPI NtWaitForSingleObject( - IN HANDLE Object, + IN HANDLE ObjectHandle, IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time); + IN PLARGE_INTEGER TimeOut OPTIONAL); NTOSAPI NTSTATUS DDKAPI ZwWaitForSingleObject( - IN HANDLE Object, + IN HANDLE ObjectHandle, IN BOOLEAN Alertable, - IN PLARGE_INTEGER Time); + IN PLARGE_INTEGER TimeOut OPTIONAL); NTOSAPI NTSTATUS

19 years, 10 months

[weiden] 13578: fixed the NtRaiseHardError() prototype

by weiden＠svn.reactos.com

fixed the NtRaiseHardError() prototype Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/ntoskrnl/ke/error.c _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-02-14 21:07:25 UTC (rev 13577) +++ trunk/reactos/include/ntos/zw.h 2005-02-14 21:41:49 UTC (rev 13578) @@ -5457,11 +5457,11 @@ * FUNCTION: Raises a hard error (stops the system) * ARGUMENTS: * Status = Status code of the hard error - * Unknown2 = ?? - * Unknown3 = ?? - * Unknown4 = ?? - * Unknown5 = ?? - * Unknown6 = ?? + * NumberOfParameters = Number of (optional) parameters in Parameters + * UnicodeStringParameterMask = (optional) string parameter, one per error code + * Parameters = An Array of pointers for use in the error message string + * ResponseOption = Specifies the type of the message box + * Response = Specifies the user's response * RETURNS: Status * */ @@ -5469,12 +5469,12 @@ NTSTATUS STDCALL NtRaiseHardError( - IN NTSTATUS Status, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5, - ULONG Unknown6 + IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, + IN PVOID *Parameters, + IN HARDERROR_RESPONSE_OPTION ResponseOption, + OUT PHARDERROR_RESPONSE Response ); /* @@ -6186,23 +6186,24 @@ * FUNCTION: Raises a hard error (stops the system) * ARGUMENTS: * Status = Status code of the hard error - * Unknown2 = ?? - * Unknown3 = ?? - * Unknown4 = ?? - * Unknown5 = ?? - * Unknown6 = ?? + * NumberOfParameters = Number of (optional) parameters in Parameters + * UnicodeStringParameterMask = (optional) string parameter, one per error code + * Parameters = An Array of pointers for use in the error message string + * ResponseOption = Specifies the type of the message box + * Response = Specifies the user's response * RETURNS: Status * */ + NTSTATUS STDCALL ZwRaiseHardError( - IN NTSTATUS Status, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5, - ULONG Unknown6 + IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, + IN PVOID *Parameters, + IN HARDERROR_RESPONSE_OPTION ResponseOption, + OUT PHARDERROR_RESPONSE Response ); /* _____ Modified: trunk/reactos/ntoskrnl/ke/error.c --- trunk/reactos/ntoskrnl/ke/error.c 2005-02-14 21:07:25 UTC (rev 13577) +++ trunk/reactos/ntoskrnl/ke/error.c 2005-02-14 21:41:49 UTC (rev 13578) @@ -44,14 +44,14 @@ } NTSTATUS STDCALL -NtRaiseHardError(IN NTSTATUS Status, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5, - ULONG Unknown6) +NtRaiseHardError(IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, + IN PVOID *Parameters, + IN HARDERROR_RESPONSE_OPTION ResponseOption, + OUT PHARDERROR_RESPONSE Response) { - DPRINT1("Hard error %x\n", Status); + DPRINT1("Hard error %x\n", ErrorStatus); return(STATUS_SUCCESS); }

19 years, 10 months

[tamlin] 13577: Fix broken DEVICE_NO_FLUSH handling for ATAPI devices, with augmentation to check the SupportedFeatures83 of the device. Thanks to tinus_ for finding and fixing.

by tamlin＠svn.reactos.com

Fix broken DEVICE_NO_FLUSH handling for ATAPI devices, with augmentation to check the SupportedFeatures83 of the device. Thanks to tinus_ for finding and fixing. Modified: trunk/reactos/drivers/storage/atapi/atapi.c _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2005-02-14 21:00:05 UTC (rev 13576) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-02-14 21:07:25 UTC (rev 13577) @@ -2231,7 +2231,7 @@ DPRINT("SCSIOP_SYNCRONIZE_CACHE: TargetId: %lu\n", Srb->TargetId); - if (!(DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_NO_FLUSH)) + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_NO_FLUSH) { /* * NOTE: Don't flush the cache for CD/DVD drives. Although @@ -2240,9 +2240,16 @@ * it doesn't make sense to flush cache on devices we don't * write to. */ - return STATUS_SUCCESS; + return SRB_STATUS_INVALID_REQUEST; } + if (!(DeviceExtension->DeviceParams[Srb->TargetId].SupportedFeatures83 & 0x1000)) + { + /* The device states it doesn't support the command */ + DPRINT("The drive doesn't support FLUSH_CACHE\n"); + return SRB_STATUS_INVALID_REQUEST; + } + /* Wait for BUSY to clear */ for (Retries = 0; Retries < IDE_MAX_BUSY_RETRIES; Retries++) {

19 years, 10 months

← Newer
1
...
18
19
20
21
22
23
24
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005