Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[ion] 55607: [CSRSRV]: Update CsrAddStaticServerthread and CsrDestroyThread based on code from CSRSRV2. Main change is that ProtectHandle/UnProtectHandle is now called.
by ion＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: ion Date: Wed Feb 15 15:05:35 2012 New Revision: 55607 URL: http://svn.reactos.org/svn/reactos?rev=55607&view=rev Log: [CSRSRV]: Update CsrAddStaticServerthread and CsrDestroyThread based on code from CSRSRV2. Main change is that ProtectHandle/UnProtectHandle is now called. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Wed Feb 15 15:05:35 2012 @@ -6,7 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu */ - + /* INCLUDES *******************************************************************/ #include <srv.h> @@ -32,6 +32,84 @@ /* FUNCTIONS ******************************************************************/ +/*++ + * @name ProtectHandle + * @implemented NT5.2 + * + * The ProtectHandle routine protects an object handle against closure. + * + * @return TRUE or FALSE. + * + * @remarks None. + * + *--*/ +BOOLEAN +NTAPI +ProtectHandle(IN HANDLE ObjectHandle) +{ + NTSTATUS Status; + OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo; + + /* Query current state */ + Status = NtQueryObject(ObjectHandle, + ObjectHandleFlagInformation, + &HandleInfo, + sizeof(HandleInfo), + NULL); + if (NT_SUCCESS(Status)) + { + /* Enable protect from close */ + HandleInfo.ProtectFromClose = TRUE; + Status = NtSetInformationObject(ObjectHandle, + ObjectHandleFlagInformation, + &HandleInfo, + sizeof(HandleInfo)); + if (NT_SUCCESS(Status)) return TRUE; + } + + /* We failed to or set the state */ + return FALSE; +} + +/*++ + * @name UnProtectHandle + * @implemented NT5.2 + * + * The UnProtectHandle routine unprotects an object handle against closure. + * + * @return TRUE or FALSE. + * + * @remarks None. + * + *--*/ +BOOLEAN +NTAPI +UnProtectHandle(IN HANDLE ObjectHandle) +{ + NTSTATUS Status; + OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo; + + /* Query current state */ + Status = NtQueryObject(ObjectHandle, + ObjectHandleFlagInformation, + &HandleInfo, + sizeof(HandleInfo), + NULL); + if (NT_SUCCESS(Status)) + { + /* Disable protect from close */ + HandleInfo.ProtectFromClose = FALSE; + Status = NtSetInformationObject(ObjectHandle, + ObjectHandleFlagInformation, + &HandleInfo, + sizeof(HandleInfo)); + if (NT_SUCCESS(Status)) return TRUE; + } + + /* We failed to or set the state */ + return FALSE; +} + PCSR_THREAD NTAPI CsrAllocateThread(IN PCSRSS_PROCESS_DATA CsrProcess) @@ -64,7 +142,7 @@ /* Hash the Thread */ i = CsrHashThread(ClientId->UniqueThread); - + /* Set the list pointers */ ListHead = &CsrThreadHashTable[i]; NextEntry = ListHead->Flink; @@ -192,6 +270,8 @@ NTAPI CsrThreadRefcountZero(IN PCSR_THREAD CsrThread) { + NTSTATUS Status; + /* Remove this thread */ CsrRemoveThread(CsrThread); @@ -199,8 +279,13 @@ //CsrReleaseProcessLock(); /* Close the NT Thread Handle */ - if (CsrThread->ThreadHandle) NtClose(CsrThread->ThreadHandle); - + if (CsrThread->ThreadHandle) + { + UnProtectHandle(CsrThread->ThreadHandle); + Status = NtClose(CsrThread->ThreadHandle); + ASSERT(NT_SUCCESS(Status)); + } + /* De-allocate the CSR Thread Object */ CsrDeallocateThread(CsrThread); @@ -270,6 +355,30 @@ return STATUS_SUCCESS; } +/*++ + * @name CsrAddStaticServerThread + * @implemented NT4 + * + * The CsrAddStaticServerThread routine adds a new CSR Thread to the + * CSR Server Process (CsrRootProcess). + * + * @param hThread + * Handle to an existing NT Thread to which to associate this + * CSR Thread. + * + * @param ClientId + * Pointer to the Client ID structure of the NT Thread to associate + * with this CSR Thread. + * + * @param ThreadFlags + * Initial CSR Thread Flags to associate to this CSR Thread. Usually + * CsrThreadIsServerThread. + * + * @return Pointer to the newly allocated CSR Thread. + * + * @remarks None. + * + *--*/ PCSR_THREAD NTAPI CsrAddStaticServerThread(IN HANDLE hThread, @@ -282,11 +391,12 @@ CsrAcquireProcessLock(); /* Allocate the Server Thread */ - if ((CsrThread = CsrAllocateThread(CsrRootProcess))) + CsrThread = CsrAllocateThread(CsrRootProcess); + if (CsrThread) { /* Setup the Object */ -// DPRINT1("New CSR thread created: %lx PID/TID: %lx/%lx\n", CsrThread, ClientId->UniqueProcess, ClientId->UniqueThread); CsrThread->ThreadHandle = hThread; + ProtectHandle(hThread); CsrThread->ClientId = *ClientId; CsrThread->Flags = ThreadFlags; @@ -295,6 +405,10 @@ /* Increment the thread count */ CsrRootProcess->ThreadCount++; + } + else + { + DPRINT1("CsrAddStaticServerThread: alloc failed for thread 0x%x\n", hThread); } /* Release the Process Lock and return */

1 0

[ion] 55606: [CSRSRV2]: Formatting and a few bug fixes.
by ion＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: ion Date: Wed Feb 15 15:03:42 2012 New Revision: 55606 URL: http://svn.reactos.org/svn/reactos?rev=55606&view=rev Log: [CSRSRV2]: Formatting and a few bug fixes. Modified: trunk/reactos/subsystems/csr/csrsrv/init.c trunk/reactos/subsystems/csr/main.c Modified: trunk/reactos/subsystems/csr/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/init… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/init.c [iso-8859-1] Wed Feb 15 15:03:42 2012 @@ -66,7 +66,7 @@ /* Save our Session ID, and create a Directory for it */ SessionId = NtCurrentPeb()->SessionId; Status = CsrCreateSessionObjectDirectory(SessionId); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("CSRSS: CsrCreateSessionObjectDirectory failed (%lx)\n", Status); @@ -82,9 +82,9 @@ /* Split Name and Value */ ParameterName = Arguments[i]; ParameterValue = NULL; - ParameterValue = strchr(ParameterName, L'='); - if (ParameterValue) *ParameterValue++ = '\0'; - DPRINT("Name=%S, Value=%S\n", ParameterName, ParameterValue); + ParameterValue = strchr(ParameterName, '='); + if (ParameterValue) *ParameterValue++ = ANSI_NULL; + DPRINT1("Name=%s, Value=%s\n", ParameterName, ParameterValue); /* Check for Object Directory */ if (!_stricmp(ParameterName, "ObjectDirectory")) @@ -107,8 +107,7 @@ /* Create it */ InitializeObjectAttributes(&ObjectAttributes, &CsrDirectoryName, - OBJ_OPENIF | OBJ_CASE_INSENSITIVE | - (SessionId) ? 0 : OBJ_PERMANENT, + OBJ_OPENIF | OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, NULL); Status = NtCreateDirectoryObject(&CsrObjectDirectory, Modified: trunk/reactos/subsystems/csr/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/main.c?rev=… ============================================================================== --- trunk/reactos/subsystems/csr/main.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/main.c [iso-8859-1] Wed Feb 15 15:03:42 2012 @@ -51,7 +51,6 @@ UNREFERENCED_PARAMETER(envp); UNREFERENCED_PARAMETER(DebugFlag); - /* Set the Priority */ NtSetInformationProcess(NtCurrentProcess(), ProcessBasePriority, @@ -81,7 +80,7 @@ { /* Kill us */ DPRINT1("CSRSS: CsrServerInitialization failed:% lx\n", Status); - NtTerminateProcess (NtCurrentProcess(), Status); + NtTerminateProcess(NtCurrentProcess(), Status); } /* Disable errors */ @@ -91,7 +90,7 @@ if (!NtCurrentPeb()->SessionId) RtlSetProcessIsCritical(TRUE, NULL, FALSE); /* Kill this thread. CSRSRV keeps us going */ - NtTerminateThread (NtCurrentThread(), Status); + NtTerminateThread(NtCurrentThread(), Status); return 0; }

1 0

[rharabien] 55605: [NTOSKRNL] - Null-terminate command before copying it to LastCommand buffer.
by rharabien＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: rharabien Date: Wed Feb 15 13:24:39 2012 New Revision: 55605 URL: http://svn.reactos.org/svn/reactos?rev=55605&view=rev Log: [NTOSKRNL] - Null-terminate command before copying it to LastCommand buffer. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Wed Feb 15 13:24:39 2012 @@ -3161,8 +3161,8 @@ if (Buffer != Orig) { KdbRepeatLastCommand = TRUE; + *Buffer = '\0'; RtlStringCbCopyA(LastCommand, sizeof(LastCommand), Orig); - *Buffer = '\0'; } else if (KdbRepeatLastCommand) RtlStringCbCopyA(Buffer, Size, LastCommand);

1 0

[rharabien] 55604: [SHELL32] - Partially revert r54068. "My Video" is not a typo but name of registry value, which match Win2k3. See issue #6568 for more details.
by rharabien＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: rharabien Date: Wed Feb 15 12:43:00 2012 New Revision: 55604 URL: http://svn.reactos.org/svn/reactos?rev=55604&view=rev Log: [SHELL32] - Partially revert r54068. "My Video" is not a typo but name of registry value, which match Win2k3. See issue #6568 for more details. Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] Wed Feb 15 12:43:00 2012 @@ -546,7 +546,7 @@ static const WCHAR Local_AppDataW[] = {'L','o','c','a','l',' ','A','p','p','D','a','t','a','\0'}; static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'}; static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'}; -static const WCHAR My_VideoW[] = {'M','y',' ','V','i','d','e','o','s','\0'}; +static const WCHAR My_VideoW[] = {'M','y',' ','V','i','d','e','o','\0'}; static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'}; static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'}; static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'};

1 0

[ion] 55603: [NTOSKRNL]: Implement NtSetInformationObject(ObjectSessionInformation). [NTOSKRNL]: Implement NtQueryInformationProcess(ProcessLUIDDeviceMapsEnabled).
by ion＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: ion Date: Wed Feb 15 06:48:39 2012 New Revision: 55603 URL: http://svn.reactos.org/svn/reactos?rev=55603&view=rev Log: [NTOSKRNL]: Implement NtSetInformationObject(ObjectSessionInformation). [NTOSKRNL]: Implement NtQueryInformationProcess(ProcessLUIDDeviceMapsEnabled). Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Wed Feb 15 06:48:39 2012 @@ -137,6 +137,13 @@ IN SIZE_T Amount ); +NTKERNELAPI +ULONG +NTAPI +PsGetCurrentProcessSessionId( + VOID +); + // // Process Impersonation Functions // Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Wed Feb 15 06:48:39 2012 @@ -1605,7 +1605,7 @@ _SEH2_END; /* Dereference the object if we had referenced it */ - if (Object) ObDereferenceObject (Object); + if (Object) ObDereferenceObject(Object); /* Return status */ return Status; @@ -1645,91 +1645,128 @@ OBP_SET_HANDLE_ATTRIBUTES_CONTEXT Context; PVOID ObjectTable; KAPC_STATE ApcState; + POBJECT_DIRECTORY Directory; + KPROCESSOR_MODE PreviousMode; BOOLEAN AttachedToProcess = FALSE; PAGED_CODE(); /* Validate the information class */ - if (ObjectInformationClass != ObjectHandleFlagInformation) - { - /* Invalid class */ - return STATUS_INVALID_INFO_CLASS; - } - - /* Validate the length */ - if (Length != sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) - { - /* Invalid length */ - return STATUS_INFO_LENGTH_MISMATCH; - } - - /* Save the previous mode */ - Context.PreviousMode = ExGetPreviousMode(); - - /* Check if we were called from user mode */ - if (Context.PreviousMode != KernelMode) - { - /* Enter SEH */ - _SEH2_TRY - { - /* Probe and capture the attribute buffer */ - ProbeForRead(ObjectInformation, - sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), - sizeof(BOOLEAN)); - Context.Information = *(POBJECT_HANDLE_ATTRIBUTE_INFORMATION) - ObjectInformation; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - else - { - /* Just copy the buffer directly */ - Context.Information = *(POBJECT_HANDLE_ATTRIBUTE_INFORMATION) - ObjectInformation; - } - - /* Check if this is a kernel handle */ - if (ObIsKernelHandle(ObjectHandle, Context.PreviousMode)) - { - /* Get the actual handle */ - ObjectHandle = ObKernelHandleToHandle(ObjectHandle); - ObjectTable = ObpKernelHandleTable; - - /* Check if we're not in the system process */ - if (PsGetCurrentProcess() != PsInitialSystemProcess) - { - /* Attach to it */ - KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); - AttachedToProcess = TRUE; - } - } - else - { - /* Use the current table */ - ObjectTable = PsGetCurrentProcess()->ObjectTable; - } - - /* Change the handle attributes */ - if (!ExChangeHandle(ObjectTable, - ObjectHandle, - ObpSetHandleAttributes, - (ULONG_PTR)&Context)) - { - /* Some failure */ - Status = STATUS_ACCESS_DENIED; - } - else - { - /* We are done */ - Status = STATUS_SUCCESS; - } - - /* De-attach if we were attached, and return status */ - if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + switch (ObjectInformationClass) + { + case ObjectHandleFlagInformation: + + /* Validate the length */ + if (Length != sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) + { + /* Invalid length */ + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Save the previous mode */ + Context.PreviousMode = ExGetPreviousMode(); + + /* Check if we were called from user mode */ + if (Context.PreviousMode != KernelMode) + { + /* Enter SEH */ + _SEH2_TRY + { + /* Probe and capture the attribute buffer */ + ProbeForRead(ObjectInformation, + sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), + sizeof(BOOLEAN)); + Context.Information = *(POBJECT_HANDLE_ATTRIBUTE_INFORMATION) + ObjectInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + /* Just copy the buffer directly */ + Context.Information = *(POBJECT_HANDLE_ATTRIBUTE_INFORMATION) + ObjectInformation; + } + + /* Check if this is a kernel handle */ + if (ObIsKernelHandle(ObjectHandle, Context.PreviousMode)) + { + /* Get the actual handle */ + ObjectHandle = ObKernelHandleToHandle(ObjectHandle); + ObjectTable = ObpKernelHandleTable; + + /* Check if we're not in the system process */ + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + /* Attach to it */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + /* Use the current table */ + ObjectTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Change the handle attributes */ + if (!ExChangeHandle(ObjectTable, + ObjectHandle, + ObpSetHandleAttributes, + (ULONG_PTR)&Context)) + { + /* Some failure */ + Status = STATUS_ACCESS_DENIED; + } + else + { + /* We are done */ + Status = STATUS_SUCCESS; + } + + /* De-attach if we were attached, and return status */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + break; + + case ObjectSessionInformation: + + /* Only a system process can do this */ + PreviousMode = ExGetPreviousMode(); + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + { + /* Fail */ + DPRINT1("Privilege not held\n"); + Status = STATUS_PRIVILEGE_NOT_HELD; + } + else + { + /* Get the object directory */ + Status = ObReferenceObjectByHandle(ObjectHandle, + 0, + ObDirectoryType, + PreviousMode, + (PVOID*)&Directory, + NULL); + if (NT_SUCCESS(Status)) + { + /* FIXME: Missng locks */ + /* Set its session ID */ + Directory->SessionId = PsGetCurrentProcessSessionId(); + ObDereferenceObject(Directory); + } + } + break; + + default: + /* Unsupported class */ + Status = STATUS_INVALID_INFO_CLASS; + break; + } + return Status; } Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Feb 15 06:48:39 2012 @@ -835,8 +835,29 @@ break; case ProcessLUIDDeviceMapsEnabled: - DPRINT1("LUID Device Maps Not implemented: %lx\n", ProcessInformationClass); - Status = STATUS_NOT_IMPLEMENTED; + /* Set the return length */ + Length = sizeof(ULONG); + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Indicate success */ + Status = STATUS_SUCCESS; + + /* Protect write in SEH */ + _SEH2_TRY + { + /* Return the count of handles */ + *(PULONG)ProcessInformation = FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; break; case ProcessExecuteFlags:

1 0

[janderwald] 55602: [USBSTOR] - Fix build
by janderwald＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: janderwald Date: Wed Feb 15 03:55:11 2012 New Revision: 55602 URL: http://svn.reactos.org/svn/reactos?rev=55602&view=rev Log: [USBSTOR] - Fix build Modified: trunk/reactos/drivers/usb/usbstor/error.c Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Wed Feb 15 03:55:11 2012 @@ -213,7 +213,6 @@ PVOID Context) { NTSTATUS Status; - USHORT Value; PIO_STACK_LOCATION IoStack; PERRORHANDLER_WORKITEM_DATA WorkItemData = (PERRORHANDLER_WORKITEM_DATA)Context;

1 0

[janderwald] 55601: [USBSTOR] - Rewrite error handling - Check if CSW is valid - Check if the error handling was already started - Reset device if required - Error handling was completely broken an...
by janderwald＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: janderwald Date: Wed Feb 15 03:52:37 2012 New Revision: 55601 URL: http://svn.reactos.org/svn/reactos?rev=55601&view=rev Log: [USBSTOR] - Rewrite error handling - Check if CSW is valid - Check if the error handling was already started - Reset device if required - Error handling was completely broken and did not follow the reset procedure as defined in USB Mass Storage Specification Bulk Only Section 5.3.4 - Mass storage device now longer hang when receiving the read capacity request and ReactOS assigns a symbolic link - Mass storage devices not yet fully working Modified: trunk/reactos/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/misc.c trunk/reactos/drivers/usb/usbstor/scsi.c trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Wed Feb 15 03:52:37 2012 @@ -110,104 +110,157 @@ PDEVICE_OBJECT DeviceObject, PIRP_CONTEXT Context) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION Stack; - USBD_PIPE_HANDLE PipeHandle; + //USBD_PIPE_HANDLE PipeHandle; PSCSI_REQUEST_BLOCK Request; PCDB pCDB; - DPRINT1("Entered Handle Transfer Error\n"); - // - // Determine pipehandle - // - if (Context->cbw->CommandBlock[0] == SCSIOP_WRITE) - { - // - // write request used bulk out pipe - // - PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkOutPipeIndex].PipeHandle; + + // + // first perform a mass storage reset step 1 in 5.3.4 USB Mass Storage Bulk Only Specification + // + Status = USBSTOR_ResetDevice(Context->FDODeviceExtension->LowerDeviceObject, Context->FDODeviceExtension); + if (NT_SUCCESS(Status)) + { + // + // step 2 reset bulk in pipe section 5.3.4 + // + Status = USBSTOR_ResetPipeWithHandle(Context->FDODeviceExtension->LowerDeviceObject, Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle); + if (NT_SUCCESS(Status)) + { + // + // finally reset bulk out pipe + // + Status = USBSTOR_ResetPipeWithHandle(Context->FDODeviceExtension->LowerDeviceObject, Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkOutPipeIndex].PipeHandle); + } + } + + if (Context->Irp) + { + // + // get next stack location + // + Stack = IoGetCurrentIrpStackLocation(Context->Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1; + ASSERT(Request); + + // + // obtain request type + // + pCDB = (PCDB)Request->Cdb; + ASSERT(pCDB); + + // + // Cleanup the IRP context + if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) + { + FreeItem(Context->TransferData); + } + + if (Status != STATUS_SUCCESS) + { + // + // Complete the master IRP + // + Context->Irp->IoStatus.Status = Status; + Context->Irp->IoStatus.Information = 0; + USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); + IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); + + // + // Start the next request + // + USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); + } } else { - // - // default bulk in pipe - // - PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; - } - - switch (Context->Urb.UrbHeader.Status) - { - case USBD_STATUS_STALL_PID: - { - // - // First attempt to reset the pipe - // - DPRINT1("Resetting Pipe\n"); - Status = USBSTOR_ResetPipeWithHandle(Context->FDODeviceExtension->LowerDeviceObject, PipeHandle); - if (NT_SUCCESS(Status)) - { - Status = STATUS_SUCCESS; - break; - } - - DPRINT1("Failed to reset pipe %x\n", Status); - - // - // FIXME: Reset of pipe failed, attempt to reset port - // - - Status = STATUS_UNSUCCESSFUL; - break; - } - // - // FIXME: Handle more errors - // - default: - { - DPRINT1("Error not handled\n"); - Status = STATUS_UNSUCCESSFUL; - } - } - - Stack = IoGetCurrentIrpStackLocation(Context->Irp); - Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1; - pCDB = (PCDB)Request->Cdb; - if (Status != STATUS_SUCCESS) - { - /* Complete the master IRP */ - Context->Irp->IoStatus.Status = Status; - Context->Irp->IoStatus.Information = 0; - USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); - IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); - - /* Start the next request */ - USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); - - /* Signal the context event */ - if (Context->Event) + if (Status != STATUS_SUCCESS) + { + // + // Signal the context event + // + ASSERT(Context->Event); KeSetEvent(Context->Event, 0, FALSE); - - /* Cleanup the IRP context */ - if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) - FreeItem(Context->TransferData); - FreeItem(Context->cbw); - FreeItem(Context); - } - else - { - + } + } + + if (NT_SUCCESS(Status)) + { DPRINT1("Retrying\n"); - Status = USBSTOR_HandleExecuteSCSI(*Context->PDODeviceExtension->PDODeviceObject, Context->Irp); - - /* Cleanup the old IRP context */ - if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) - FreeItem(Context->TransferData); - FreeItem(Context->cbw); - FreeItem(Context); - } + USBSTOR_HandleExecuteSCSI(*Context->PDODeviceExtension->PDODeviceObject, Context->Irp); + } + + // + // cleanup irp context + // + FreeItem(Context->cbw); + FreeItem(Context); + DPRINT1("USBSTOR_HandleTransferError returning with Status %x\n", Status); return Status; +} + +VOID +NTAPI +USBSTOR_ResetHandlerWorkItemRoutine( + PVOID Context) +{ + NTSTATUS Status; + USHORT Value; + PIO_STACK_LOCATION IoStack; + + PERRORHANDLER_WORKITEM_DATA WorkItemData = (PERRORHANDLER_WORKITEM_DATA)Context; + + // + // clear stall on BulkIn pipe + // + Status = USBSTOR_ResetPipeWithHandle(WorkItemData->Context->FDODeviceExtension->LowerDeviceObject, WorkItemData->Context->FDODeviceExtension->InterfaceInformation->Pipes[WorkItemData->Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle); + DPRINT1("USBSTOR_ResetPipeWithHandle Status %x\n", Status); + + // + // get next stack location + // + + IoStack = IoGetNextIrpStackLocation(WorkItemData->Irp); + + // + // now initialize the urb for sending the csw + // + UsbBuildInterruptOrBulkTransferRequest(&WorkItemData->Context->Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + WorkItemData->Context->FDODeviceExtension->InterfaceInformation->Pipes[WorkItemData->Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + WorkItemData->Context->csw, + NULL, + 512, //FIXME + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); + + // + // initialize stack location + // + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + IoStack->Parameters.Others.Argument1 = (PVOID)&WorkItemData->Context->Urb; + IoStack->Parameters.DeviceIoControl.InputBufferLength = WorkItemData->Context->Urb.UrbHeader.Length; + WorkItemData->Irp->IoStatus.Status = STATUS_SUCCESS; + + + // + // setup completion routine + // + IoSetCompletionRoutine(WorkItemData->Irp, USBSTOR_CSWCompletionRoutine, Context, TRUE, TRUE, TRUE); + + // + // call driver + // + IoCallDriver(WorkItemData->Context->FDODeviceExtension->LowerDeviceObject, WorkItemData->Irp); } VOID @@ -217,8 +270,21 @@ { NTSTATUS Status; PERRORHANDLER_WORKITEM_DATA WorkItemData = (PERRORHANDLER_WORKITEM_DATA)Context; - - Status = USBSTOR_HandleTransferError(WorkItemData->DeviceObject, WorkItemData->Context); + + if (WorkItemData->Context->ErrorIndex == 2) + { + // + // reset device + // + Status = USBSTOR_HandleTransferError(WorkItemData->DeviceObject, WorkItemData->Context); + } + else + { + // + // clear stall + // + USBSTOR_ResetHandlerWorkItemRoutine(WorkItemData); + } // // Free Work Item Data Modified: trunk/reactos/drivers/usb/usbstor/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/misc.c [iso-8859-1] Wed Feb 15 03:52:37 2012 @@ -411,7 +411,6 @@ // execute request // Status = USBSTOR_ClassRequest(DeviceObject, DeviceExtension, USB_BULK_RESET_DEVICE, DeviceExtension->InterfaceInformation->InterfaceNumber, USBD_TRANSFER_DIRECTION_OUT, 0, NULL); - DPRINT1("Status %x\n", Status); // // done Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Wed Feb 15 03:52:37 2012 @@ -83,6 +83,75 @@ } +BOOLEAN +USBSTOR_IsCSWValid( + PIRP_CONTEXT Context) +{ + // + // sanity checks + // + if (Context->csw->Signature != CSW_SIGNATURE) + { + DPRINT1("[USBSTOR] Expected Signature %x but got %x\n", CSW_SIGNATURE, Context->csw->Signature); + return FALSE; + } + + if (Context->csw->Tag != (ULONG)Context->csw) + { + DPRINT1("[USBSTOR] Expected Tag %x but got %x\n", (ULONG)Context->csw, Context->csw->Tag); + return FALSE; + } + + if (Context->csw->Status != 0x00) + { + DPRINT1("[USBSTOR] Expected Status 0x00 but got %x\n", Context->csw->Status); + return FALSE; + } + + // + // CSW is valid + // + return TRUE; + +} + +NTSTATUS +USBSTOR_QueueWorkItem( + PIRP_CONTEXT Context, + PIRP Irp) +{ + PERRORHANDLER_WORKITEM_DATA ErrorHandlerWorkItemData; + + // + // Allocate Work Item Data + // + ErrorHandlerWorkItemData = ExAllocatePoolWithTag(NonPagedPool, sizeof(ERRORHANDLER_WORKITEM_DATA), USB_STOR_TAG); + if (!ErrorHandlerWorkItemData) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Initialize and queue the work item to handle the error + // + ExInitializeWorkItem(&ErrorHandlerWorkItemData->WorkQueueItem, + ErrorHandlerWorkItemRoutine, + ErrorHandlerWorkItemData); + + ErrorHandlerWorkItemData->DeviceObject = Context->FDODeviceExtension->FunctionalDeviceObject; + ErrorHandlerWorkItemData->Context = Context; + ErrorHandlerWorkItemData->Irp = Irp; + ErrorHandlerWorkItemData->DeviceObject = Context->FDODeviceExtension->FunctionalDeviceObject; + + DPRINT1("Queuing WorkItemROutine\n"); + ExQueueWorkItem(&ErrorHandlerWorkItemData->WorkQueueItem, DelayedWorkQueue); + return STATUS_MORE_PROCESSING_REQUIRED; +} + + // // driver verifier // @@ -102,7 +171,7 @@ PREAD_CAPACITY_DATA_EX CapacityDataEx; PREAD_CAPACITY_DATA CapacityData; PUFI_CAPACITY_RESPONSE Response; - PERRORHANDLER_WORKITEM_DATA ErrorHandlerWorkItemData; + NTSTATUS Status; PURB Urb; @@ -143,6 +212,48 @@ } } + DPRINT1("USBSTOR_CSWCompletionRoutine Status %x\n", Irp->IoStatus.Status); + + if (!NT_SUCCESS(Irp->IoStatus.Information)) + { + if (Context->ErrorIndex == 0) + { + // + // increment error index + // + Context->ErrorIndex = 1; + + // + // clear stall and resend cbw + // + Status = USBSTOR_QueueWorkItem(Context, Irp); + ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED); + return STATUS_MORE_PROCESSING_REQUIRED; + } + + // + // perform reset recovery + // + Context->ErrorIndex = 2; + IoFreeIrp(Irp); + Status = USBSTOR_QueueWorkItem(Context, NULL); + ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED); + return STATUS_MORE_PROCESSING_REQUIRED; + } + + if (!USBSTOR_IsCSWValid(Context)) + { + // + // perform reset recovery + // + Context->ErrorIndex = 2; + IoFreeIrp(Irp); + Status = USBSTOR_QueueWorkItem(Context, NULL); + ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED); + return STATUS_MORE_PROCESSING_REQUIRED; + } + + if (Context->Irp) { // @@ -164,55 +275,6 @@ // get SCSI command data block // pCDB = (PCDB)Request->Cdb; - - // - // check status - // - if (!NT_SUCCESS(Status)) - { - DPRINT1("Status %x\n", Status); - DPRINT1("UrbStatus %x\n", Urb->UrbHeader.Status); - - // - // Check for errors that can be handled - // FIXME: Verify all usb errors that can be recovered via pipe reset/port reset/controller reset - // - if ((Urb->UrbHeader.Status & USB_RECOVERABLE_ERRORS) == Urb->UrbHeader.Status) - { - DPRINT1("Attempting Error Recovery\n"); - // - // free the allocated irp - // - IoFreeIrp(Irp); - - // - // Allocate Work Item Data - // - ErrorHandlerWorkItemData = ExAllocatePoolWithTag(NonPagedPool, sizeof(ERRORHANDLER_WORKITEM_DATA), USB_STOR_TAG); - if (!ErrorHandlerWorkItemData) - { - DPRINT1("Failed to allocate memory\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - } - else - { - // - // Initialize and queue the work item to handle the error - // - ExInitializeWorkItem(&ErrorHandlerWorkItemData->WorkQueueItem, - ErrorHandlerWorkItemRoutine, - ErrorHandlerWorkItemData); - - ErrorHandlerWorkItemData->DeviceObject = Context->FDODeviceExtension->FunctionalDeviceObject; - ErrorHandlerWorkItemData->Context = Context; - DPRINT1("Queuing WorkItemROutine\n"); - ExQueueWorkItem(&ErrorHandlerWorkItemData->WorkQueueItem, DelayedWorkQueue); - - return STATUS_MORE_PROCESSING_REQUIRED; - } - } - } - Request->SrbStatus = SRB_STATUS_SUCCESS; // @@ -268,28 +330,9 @@ } // - // sanity checks - // - if (Context->csw->Signature != CSW_SIGNATURE) - { - DPRINT1("[USBSTOR] Expected Signature %x but got %x\n", CSW_SIGNATURE, Context->csw->Signature); - } - - if (Context->csw->Tag != (ULONG)Context->csw) - { - DPRINT1("[USBSTOR] Expected Tag %x but got %x\n", (ULONG)Context->csw, Context->csw->Tag); - } - - if (Context->csw->Status != 0x00) - { - DPRINT1("[USBSTOR] Expected Status 0x00 but got %x\n", Context->csw->Status); - } - - // // free cbw // FreeItem(Context->cbw); - if (Context->Irp) { @@ -510,6 +553,19 @@ return STATUS_MORE_PROCESSING_REQUIRED; } + +VOID +DumpCBW( + PUCHAR Block) +{ + DPRINT1("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", + Block[0] & 0xFF, Block[1] & 0xFF, Block[2] & 0xFF, Block[3] & 0xFF, Block[4] & 0xFF, Block[5] & 0xFF, Block[6] & 0xFF, Block[7] & 0xFF, Block[8] & 0xFF, Block[9] & 0xFF, + Block[10] & 0xFF, Block[11] & 0xFF, Block[12] & 0xFF, Block[13] & 0xFF, Block[14] & 0xFF, Block[15] & 0xFF, Block[16] & 0xFF, Block[17] & 0xFF, Block[18] & 0xFF, Block[19] & 0xFF, + Block[20] & 0xFF, Block[21] & 0xFF, Block[22] & 0xFF, Block[23] & 0xFF, Block[24] & 0xFF, Block[25] & 0xFF, Block[26] & 0xFF, Block[27] & 0xFF, Block[28] & 0xFF, Block[29] & 0xFF, + Block[30] & 0xFF); + +} + NTSTATUS USBSTOR_SendRequest( @@ -561,6 +617,7 @@ Context->cbw); DPRINT("CBW %p\n", Context->cbw); + DumpCBW((PUCHAR)Context->cbw); // // now initialize the urb @@ -777,21 +834,6 @@ // KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - KeResetEvent(&Event); - DPRINT("Resending request\n"); - - // - // now send the request - // - Status = USBSTOR_SendRequest(DeviceObject, NULL, &Event, UFI_INQUIRY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), (PUCHAR)Response); - - // - // wait for the action to complete - // - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - - - DPRINT1("Response %p\n", Response); DPRINT1("DeviceType %x\n", Response->DeviceType); DPRINT1("RMB %x\n", Response->RMB); Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Wed Feb 15 03:52:37 2012 @@ -279,6 +279,7 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; PMDL TransferBufferMDL; PKEVENT Event; + ULONG ErrorIndex; }IRP_CONTEXT, *PIRP_CONTEXT; typedef struct _ERRORHANDLER_WORKITEM_DATA @@ -286,6 +287,7 @@ PDEVICE_OBJECT DeviceObject; PIRP_CONTEXT Context; WORK_QUEUE_ITEM WorkQueueItem; + PIRP Irp; } ERRORHANDLER_WORKITEM_DATA, *PERRORHANDLER_WORKITEM_DATA; @@ -390,6 +392,13 @@ USBSTOR_SendInquiryCmd( IN PDEVICE_OBJECT DeviceObject); +NTSTATUS +NTAPI +USBSTOR_CSWCompletionRoutine( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Ctx); + //--------------------------------------------------------------------- // // disk.c routines @@ -443,6 +452,13 @@ PVOID Context); VOID +NTAPI +ResetHandlerWorkItemRoutine( + PVOID Context); + + + +VOID USBSTOR_QueueNextRequest( IN PDEVICE_OBJECT DeviceObject); @@ -458,3 +474,8 @@ IN UCHAR bEndpointAddress, OUT PUSHORT Value); +NTSTATUS +USBSTOR_ResetPipeWithHandle( + IN PDEVICE_OBJECT DeviceObject, + IN USBD_PIPE_HANDLE PipeHandle); +

1 0

[tfaber] 55600: [SMSS2] - Do not print an uninitialized string
by tfaber＠svn.reactos.org 14 Feb '12

14 Feb '12

Author: tfaber Date: Tue Feb 14 23:06:28 2012 New Revision: 55600 URL: http://svn.reactos.org/svn/reactos?rev=55600&view=rev Log: [SMSS2] - Do not print an uninitialized string Modified: trunk/reactos/base/system/smss2/smloop.c Modified: trunk/reactos/base/system/smss2/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smloop.c… ============================================================================== --- trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] Tue Feb 14 23:06:28 2012 @@ -300,10 +300,10 @@ if ((NT_SUCCESS(Status)) && (CidSubsystem)) { /* This was an actual subsystem, so connect back to it */ - DPRINT1("Connecting back to %wZ\n", &SubsystemPort); SbApiMsg->ConnectionInfo.SbApiPortName[119] = UNICODE_NULL; RtlCreateUnicodeString(&SubsystemPort, SbApiMsg->ConnectionInfo.SbApiPortName); + DPRINT1("Connecting back to %wZ\n", &SubsystemPort); Status = NtConnectPort(&CidSubsystem->SbApiPort, &SubsystemPort, &SecurityQos,

1 0

[tkreuzer] 55599: [FREELDR] Add a hack to zero out heap allocations in the hope it fixes strange behavour
by tkreuzer＠svn.reactos.org 14 Feb '12

14 Feb '12

Author: tkreuzer Date: Tue Feb 14 22:08:34 2012 New Revision: 55599 URL: http://svn.reactos.org/svn/reactos?rev=55599&view=rev Log: [FREELDR] Add a hack to zero out heap allocations in the hope it fixes strange behavour Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Tue Feb 14 22:08:34 2012 @@ -375,6 +375,9 @@ TRACE("HeapAllocate(%p, %ld, %.4s) -> return %p\n", HeapHandle, ByteSize, &Tag, Block->Data); + /* HACK: zero out the allocation */ + RtlZeroMemory(Block->Data, Block->Size * sizeof(HEAP_BLOCK)); + #ifdef FREELDR_HEAP_VERIFIER /* Write size and redzones */ *REDZONE_SIZE(Block) = ByteSize - REDZONE_ALLOCATION;

1 0

[tkreuzer] 55598: [FREELDR] Add code to check for heap buffer overwrites
by tkreuzer＠svn.reactos.org 14 Feb '12

14 Feb '12

Author: tkreuzer Date: Tue Feb 14 21:56:39 2012 New Revision: 55598 URL: http://svn.reactos.org/svn/reactos?rev=55598&view=rev Log: [FREELDR] Add code to check for heap buffer overwrites Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Tue Feb 14 21:56:39 2012 @@ -20,10 +20,19 @@ #include <freeldr.h> #include <debug.h> +#define FREELDR_HEAP_VERIFIER + DBG_DEFAULT_CHANNEL(HEAP); #define DEFAULT_HEAP_SIZE (1024 * 1024) #define TEMP_HEAP_SIZE (1024 * 1024) + +#define REDZONE_MARK 0xCCCCCCCCCCCCCCCCULL +#define REDZONE_ALLOCATION 24 +#define REDZONE_LOW_OFFSET 16 +#define REDZONE_SIZE(Block) ((ULONG64*)Block->Data) +#define REDZONE_LOW(Block) ((ULONG64*)Block->Data + 1) +#define REDZONE_HI(Block) ((ULONG64*)((PUCHAR)Block->Data + 16 + *REDZONE_SIZE(Block))) PVOID FrLdrDefaultHeap; PVOID FrLdrTempHeap; @@ -156,7 +165,16 @@ Block = Block + 1 + Block->Size) { /* Continue, if its not free */ - if (Block->Tag != 0) continue; + if (Block->Tag != 0) + { +#ifdef FREELDR_HEAP_VERIFIER + /* Verify size and redzones */ + ASSERT(*REDZONE_SIZE(Block) <= Block->Size * sizeof(HEAP_BLOCK)); + ASSERT(*REDZONE_LOW(Block) == REDZONE_MARK); + ASSERT(*REDZONE_HI(Block) == REDZONE_MARK); +#endif + continue; + } /* Calculate page aligned start address of the free region */ StartAddress = ALIGN_UP_POINTER_BY(Block->Data, PAGE_SIZE); @@ -277,6 +295,11 @@ USHORT BlockSize, Remaining; ULONGLONG Time = __rdtsc(); +#ifdef FREELDR_HEAP_VERIFIER + /* Add space for a size field and 2 redzones */ + ByteSize += REDZONE_ALLOCATION; +#endif + /* Check if the allocation is too large */ if ((ByteSize + sizeof(HEAP_BLOCK)) > MAXUSHORT * sizeof(HEAP_BLOCK)) { @@ -352,6 +375,15 @@ TRACE("HeapAllocate(%p, %ld, %.4s) -> return %p\n", HeapHandle, ByteSize, &Tag, Block->Data); +#ifdef FREELDR_HEAP_VERIFIER + /* Write size and redzones */ + *REDZONE_SIZE(Block) = ByteSize - REDZONE_ALLOCATION; + *REDZONE_LOW(Block) = REDZONE_MARK; + *REDZONE_HI(Block) = REDZONE_MARK; + + /* Allcoation starts after size field and redzone */ + return (PUCHAR)Block->Data + REDZONE_LOW_OFFSET; +#endif /* Return pointer to the data */ return Block->Data; } @@ -382,6 +414,14 @@ } Block = ((PHEAP_BLOCK)Pointer) - 1; +#ifdef FREELDR_HEAP_VERIFIER + Block = (PHEAP_BLOCK)((PUCHAR)Block - REDZONE_LOW_OFFSET); + + /* Verify size and redzones */ + ASSERT(*REDZONE_SIZE(Block) <= Block->Size * sizeof(HEAP_BLOCK)); + ASSERT(*REDZONE_LOW(Block) == REDZONE_MARK); + ASSERT(*REDZONE_HI(Block) == REDZONE_MARK); +#endif /* Check if the tag matches */ if ((Tag && (Block->Tag != Tag)) || (Block->Tag == 0))

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
58
Older →

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 February 2012