Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[hbelusca] 70417: [KDCOM] For MSVC builds (using KDCOM kd64 WinDbg protocol): Bail out for droppable packets after a given number of retries, if no debugger is attached (list of droppable packets c...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Dec 25 18:43:16 2015 New Revision: 70417 URL: http://svn.reactos.org/svn/reactos?rev=70417&view=rev Log: [KDCOM] For MSVC builds (using KDCOM kd64 WinDbg protocol): Bail out for droppable packets after a given number of retries, if no debugger is attached (list of droppable packets can be found in http://articles.sysprogs.org/kdvmware/kdcom.shtml section "KDCOM protocol", subsection "Droppable packets"). CORE-10541 #resolve #comment Finally fixed in revision r70417! CORE-7106 Modified: trunk/reactos/drivers/base/kdcom/kddll.c Modified: trunk/reactos/drivers/base/kdcom/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] Fri Dec 25 18:43:16 2015 @@ -11,7 +11,7 @@ /* GLOBALS ********************************************************************/ ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; -ULONG RemotePacketId = INITIAL_PACKET_ID; +ULONG RemotePacketId = INITIAL_PACKET_ID; /* PRIVATE FUNCTIONS **********************************************************/ @@ -90,7 +90,7 @@ ULONG Checksum; /* Special handling for breakin packet */ - if(PacketType == PACKET_TYPE_KD_POLL_BREAKIN) + if (PacketType == PACKET_TYPE_KD_POLL_BREAKIN) { return KdpPollBreakIn(); } @@ -170,14 +170,14 @@ CurrentPacketId ^= 1; return KDP_PACKET_RECEIVED; } - /* That's not what we were waiting for, start over. */ + /* That's not what we were waiting for, start over */ continue; case PACKET_TYPE_KD_RESET: - KDDBGPRINT("KdReceivePacket - got a reset packet\n"); + KDDBGPRINT("KdReceivePacket - got PACKET_TYPE_KD_RESET\n"); + CurrentPacketId = INITIAL_PACKET_ID; + RemotePacketId = INITIAL_PACKET_ID; KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); - CurrentPacketId = INITIAL_PACKET_ID; - RemotePacketId = INITIAL_PACKET_ID; /* Fall through */ case PACKET_TYPE_KD_RESEND: @@ -187,7 +187,8 @@ default: KDDBGPRINT("KdReceivePacket - got unknown control packet\n"); - return KDP_PACKET_RESEND; + /* We got an invalid packet, ignore it and start over */ + continue; } } @@ -218,7 +219,7 @@ /* Receive the message header data */ KdStatus = KdpReceiveBuffer(MessageHeader->Buffer, - MessageHeader->Length); + MessageHeader->Length); if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive data. Packet needs to be resent. */ @@ -277,7 +278,7 @@ if (Packet.Checksum != Checksum) { KDDBGPRINT("KdReceivePacket - wrong cheksum, got %x, calculated %x\n", - Packet.Checksum, Checksum); + Packet.Checksum, Checksum); KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); continue; } @@ -369,6 +370,7 @@ { /* Packet received, we can quit the loop */ CurrentPacketId &= ~SYNC_PACKET_ID; + Retries = KdContext->KdpDefaultRetries; break; } else if (KdStatus == KDP_PACKET_TIMEOUT) @@ -383,10 +385,36 @@ */ if (Retries == 0) { - if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + ULONG MessageId = *(PULONG)MessageHeader->Buffer; + switch (PacketType) { - return; + case PACKET_TYPE_KD_DEBUG_IO: + { + if (MessageId != DbgKdPrintStringApi) continue; + break; + } + + case PACKET_TYPE_KD_STATE_CHANGE32: + case PACKET_TYPE_KD_STATE_CHANGE64: + { + if (MessageId != DbgKdLoadSymbolsStateChange) continue; + break; + } + + case PACKET_TYPE_KD_FILE_IO: + { + if (MessageId != DbgKdCreateFileApi) continue; + break; + } } + + /* Reset debugger state */ + KD_DEBUGGER_NOT_PRESENT = TRUE; + SharedUserData->KdDebuggerEnabled &= ~0x00000002; + CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; + RemotePacketId = INITIAL_PACKET_ID; + + return; } } // else (KdStatus == KDP_PACKET_RESEND) /* Resend the packet */

8 years, 10 months

[tkreuzer] 70416: [NTOS/KDBK] Fix the value for EIP used by KDBG after an INT3 set by KDBG itself. The address is already fixed by KiDispatchException, but only in the context frame, not in the tra...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 23 22:38:46 2015 New Revision: 70416 URL: http://svn.reactos.org/svn/reactos?rev=70416&view=rev Log: [NTOS/KDBK] Fix the value for EIP used by KDBG after an INT3 set by KDBG itself. The address is already fixed by KiDispatchException, but only in the context frame, not in the trap frame and KDBG insists to use the trap frame for a lot of things. Also, after a cont from such an int3, KDBG uses a single step to re-enable the breakpoint (it needs to disable it after it was hit to be able to execute the actual instruction), but it used to dismiss *any* single steps after that. So make sure, that an actual single step, as created by the debugger is not being dismissed, but the break point is still restored after the next single step entry. You might expect that a kernel debugger would at least support setting breakpoints, but this is KDBG. Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=70… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Wed Dec 23 22:38:46 2015 @@ -38,6 +38,7 @@ static PKDB_BREAKPOINT KdbHwBreakPoints[KDB_MAXIMUM_HW_BREAKPOINT_COUNT]; /* Enabled hardware breakpoints, orderless */ static PKDB_BREAKPOINT KdbBreakPointToReenable = NULL; /* Set to a breakpoint struct when single stepping after a software breakpoint was hit, to reenable it */ +static BOOLEAN KdbpEvenThoughWeHaveABreakPointToReenableWeAlsoHaveARealSingleStep; LONG KdbLastBreakPointNr = -1; /* Index of the breakpoint which cause KDB to be entered */ ULONG KdbNumSingleSteps = 0; /* How many single steps to do */ BOOLEAN KdbSingleStepOver = FALSE; /* Whether to step over calls/reps. */ @@ -1407,6 +1408,15 @@ KdbpPrint("Couldn't restore original instruction after INT3! Cannot continue execution.\n"); KeBugCheck(0); // FIXME: Proper bugcode! } + + /* Also since we are past the int3 now, decrement EIP in the + TrapFrame. This is only needed because KDBG insists on working + with the TrapFrame instead of with the Context, as it is supposed + to do. The context has already EIP point to the int3, since + KiDispatchException accounts for that. Whatever we do here with + the TrapFrame does not matter anyway, since KiDispatchException + will overwrite it with the values from the Context! */ + TrapFrame->Eip--; } if ((BreakPoint->Type == KdbBreakPointHardware) && @@ -1427,8 +1437,6 @@ /* Delete the temporary breakpoint which was used to step over or into the instruction. */ KdbpDeleteBreakPoint(-1, BreakPoint); - - TrapFrame->Eip--; if (--KdbNumSingleSteps > 0) { @@ -1520,8 +1528,14 @@ if (KdbNumSingleSteps == 0) Context->EFlags &= ~EFLAGS_TF; - goto continue_execution; /* return */ - } + if (!KdbpEvenThoughWeHaveABreakPointToReenableWeAlsoHaveARealSingleStep) + { + goto continue_execution; /* return */ + } + } + + /* Quoth the raven, 'Nevermore!' */ + KdbpEvenThoughWeHaveABreakPointToReenableWeAlsoHaveARealSingleStep = FALSE; /* Check if we expect a single step */ if ((TrapFrame->Dr6 & 0xf) == 0 && KdbNumSingleSteps > 0) @@ -1645,6 +1659,9 @@ /* Check if we should single step */ if (KdbNumSingleSteps > 0) { + /* Variable explains itself! */ + KdbpEvenThoughWeHaveABreakPointToReenableWeAlsoHaveARealSingleStep = TRUE; + if ((KdbSingleStepOver && KdbpStepOverInstruction(KdbCurrentTrapFrame->Tf.Eip)) || (!KdbSingleStepOver && KdbpStepIntoInstruction(KdbCurrentTrapFrame->Tf.Eip))) {

8 years, 10 months

[akhaldi] 70415: [0.4.0] * Apply the second part of the hackfix from CORE-9836 by Joachim Henze. Addendum to r70393.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 23 18:13:34 2015 New Revision: 70415 URL: http://svn.reactos.org/svn/reactos?rev=70415&view=rev Log: [0.4.0] * Apply the second part of the hackfix from CORE-9836 by Joachim Henze. Addendum to r70393. Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/cursoricon.c branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/msgqueue.c Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Wed Dec 23 18:13:34 2015 @@ -1086,11 +1086,14 @@ goto leave; } + pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; + /* See if it was destroyed in the meantime */ if (UserObjectInDestroy(hOldCursor)) - hOldCursor = NULL; - pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; - UserDereferenceObject(pcurOld); + { + UserDereferenceObject(pcurOld); + pcurOld = NULL; + } } leave: Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Dec 23 18:13:34 2015 @@ -2280,8 +2280,12 @@ IntGetSysCursorInfo()->CurrentCursorObject = NULL; } - TRACE("DereferenceObject pCursor\n"); - UserDereferenceObject(pCursor); + if (pCursor && UserObjectInDestroy(UserHMGetHandle(pCursor))) + { + TRACE("DereferenceObject pCursor\n"); + UserDereferenceObject(pCursor); + pCursor = NULL; + } } if (gpqForeground == MessageQueue)

8 years, 10 months

[gedmurphy] 70414: [FLTMGR] - Change the start type to demand. - Should stop free loader from throwing a tantrum because it can't load a non-existant boot driver

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Dec 23 16:29:33 2015 New Revision: 70414 URL: http://svn.reactos.org/svn/reactos?rev=70414&view=rev Log: [FLTMGR] - Change the start type to demand. - Should stop free loader from throwing a tantrum because it can't load a non-existant boot driver Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Dec 23 16:29:33 2015 @@ -1947,7 +1947,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ErrorControl",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ImagePath",0x00020000,"system32\drivers\rosfltmgr.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Type",0x00010001,0x00000002 ; ControlSet selection settings

8 years, 10 months

[hbelusca] 70413: [XDK] Correctly fix the definition of DRIVER_FS_NOTIFICATION (done the same way as the other DRIVER_xxx "callback" functions; by the way you'll notice they are all NTAPI aka. __st...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 23 16:15:08 2015 New Revision: 70413 URL: http://svn.reactos.org/svn/reactos?rev=70413&view=rev Log: [XDK] Correctly fix the definition of DRIVER_FS_NOTIFICATION (done the same way as the other DRIVER_xxx "callback" functions; by the way you'll notice they are all NTAPI aka. __stdcall. This is not explicitely mentioned in the W(D)DK, because MS supposes you compile all your kernel-mode code in stdcall convention, the WDK environment coming with preset default compiler switches enabling that. But if you try changing them, you'll run into big troubles. In our headers on the contrary we explicitely mention the calling conventions). [FLTMGR] Fix FltpFsNotification to adhere to the correct DRIVER_FS_NOTIFICATION definition. Addendum to r70410. Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c trunk/reactos/include/xdk/iotypes.h Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Wed Dec 23 16:15:08 2015 @@ -66,6 +66,7 @@ DRIVER_FS_NOTIFICATION FltpFsNotification; VOID +NTAPI FltpFsNotification( _In_ PDEVICE_OBJECT DeviceObject, _In_ BOOLEAN FsActive @@ -586,6 +587,7 @@ DRIVER_FS_NOTIFICATION FltpFsNotification; VOID +NTAPI FltpFsNotification(_In_ PDEVICE_OBJECT DeviceObject, _In_ BOOLEAN FsActive) { Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Wed Dec 23 16:15:08 2015 @@ -6939,17 +6939,11 @@ #define IO_STOP_ON_SYMLINK 0x0008 #define IO_MM_PAGING_FILE 0x0010 -//typedef VOID -//( *PDRIVER_FS_NOTIFICATION) ( -// _In_ PDEVICE_OBJECT DeviceObject, -// _In_ BOOLEAN FsActive); - -typedef -VOID -DRIVER_FS_NOTIFICATION( - _In_ PDEVICE_OBJECT DeviceObject, - _In_ BOOLEAN FsActive -); +_Function_class_(DRIVER_FS_NOTIFICATION) +typedef VOID +(NTAPI DRIVER_FS_NOTIFICATION)( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ BOOLEAN FsActive); typedef DRIVER_FS_NOTIFICATION *PDRIVER_FS_NOTIFICATION; typedef enum _FS_FILTER_SECTION_SYNC_TYPE {

8 years, 10 months

[tkreuzer] 70412: [WIN32K] Pass cjMaxBits parameter from GreCreateDIBitmapInternal to IntCreateDIBitmap and check the image size before creating the bitmap. Should fix crash when hitting about tab ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 23 14:55:34 2015 New Revision: 70412 URL: http://svn.reactos.org/svn/reactos?rev=70412&view=rev Log: [WIN32K] Pass cjMaxBits parameter from GreCreateDIBitmapInternal to IntCreateDIBitmap and check the image size before creating the bitmap. Should fix crash when hitting about tab in Office2000 WinWord. CORE-10583 #comment please retest Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed Dec 23 14:55:34 2015 @@ -248,6 +248,7 @@ UINT StartScan, UINT ScanLines, CONST VOID *Bits, + ULONG cjMaxBits, CONST BITMAPINFO *bmi, UINT ColorUse) { @@ -260,6 +261,11 @@ PPALETTE ppalDIB = 0; if (!bmi) return 0; + + if (bmi->bmiHeader.biSizeImage > cjMaxBits) + { + return 0; + } SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, ScanLines, @@ -1316,6 +1322,7 @@ ULONG compression, DWORD init, LPBYTE bits, + ULONG cjMaxBits, PBITMAPINFO data, DWORD coloruse) { @@ -1390,7 +1397,7 @@ if ((NULL != handle) && (CBM_INIT & init)) { - IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse); + IntSetDIBits(Dc, handle, 0, height, bits, cjMaxBits, data, coloruse); } return handle; @@ -1529,7 +1536,7 @@ planes = 0; compression = 0; } - Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, cjMaxBits, pbmi, iUsage); DC_UnlockDc(Dc); if(!hDc)

8 years, 10 months

[gedmurphy] 70411: [FLTMGR] - Add the service key

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Dec 23 14:55:17 2015 New Revision: 70411 URL: http://svn.reactos.org/svn/reactos?rev=70411&view=rev Log: [FLTMGR] - Add the service key Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Dec 23 14:55:17 2015 @@ -1943,6 +1943,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","Ext3ForceWriting",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","AutoMount",0x00010001,0x00000001 +; Filesystem Filter Manager driver +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ErrorControl",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ImagePath",0x00020000,"system32\drivers\rosfltmgr.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Type",0x00010001,0x00000002 + ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001

8 years, 10 months

[gedmurphy] 70410: [XDK] - hackfix just DRIVER_FS_NOTIFICATION until we decide how we want to declare them - Should fix build

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Dec 23 14:45:15 2015 New Revision: 70410 URL: http://svn.reactos.org/svn/reactos?rev=70410&view=rev Log: [XDK] - hackfix just DRIVER_FS_NOTIFICATION until we decide how we want to declare them - Should fix build Modified: trunk/reactos/include/xdk/iotypes.h Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Wed Dec 23 14:45:15 2015 @@ -6939,10 +6939,18 @@ #define IO_STOP_ON_SYMLINK 0x0008 #define IO_MM_PAGING_FILE 0x0010 -typedef VOID -(NTAPI *PDRIVER_FS_NOTIFICATION) ( - _In_ PDEVICE_OBJECT DeviceObject, - _In_ BOOLEAN FsActive); +//typedef VOID +//( *PDRIVER_FS_NOTIFICATION) ( +// _In_ PDEVICE_OBJECT DeviceObject, +// _In_ BOOLEAN FsActive); + +typedef +VOID +DRIVER_FS_NOTIFICATION( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ BOOLEAN FsActive +); +typedef DRIVER_FS_NOTIFICATION *PDRIVER_FS_NOTIFICATION; typedef enum _FS_FILTER_SECTION_SYNC_TYPE { SyncTypeOther = 0,

8 years, 10 months

[gedmurphy] 70409: [FLTMGR] - Add the beginning of the fltmgr. It's called rosfltmgr for now so I can test in Windows. - It's currently just base code which registers for file systems appearing (or...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Dec 23 14:41:05 2015 New Revision: 70409 URL: http://svn.reactos.org/svn/reactos?rev=70409&view=rev Log: [FLTMGR] - Add the beginning of the fltmgr. It's called rosfltmgr for now so I can test in Windows. - It's currently just base code which registers for file systems appearing (or disappearing), and attaches itself to them and all other mounted devices in their chain. - Although it builds (touch wood), don't add it to a running system. The IRPs aren't plugged in yet and it'll just bugcheck lower down the stack. Added: trunk/reactos/drivers/fs_minifilter/ trunk/reactos/drivers/fs_minifilter/CMakeLists.txt (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/ trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc (with props) Modified: trunk/reactos/drivers/CMakeLists.txt Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -8,6 +8,7 @@ add_subdirectory(crypto) add_subdirectory(filesystems) add_subdirectory(filters) +add_subdirectory(fs_minifilter) add_subdirectory(hid) add_subdirectory(input) add_subdirectory(ksfilter) Added: trunk/reactos/drivers/fs_minifilter/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/CMak… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/CMakeLists.txt (added) +++ trunk/reactos/drivers/fs_minifilter/CMakeLists.txt [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,2 @@ + +add_subdirectory(fltmgr) Propchange: trunk/reactos/drivers/fs_minifilter/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,12 @@ + +list(APPEND SOURCE + Interface.c + Lib.c + fltmgr.h) + +add_library(rosfltmgr SHARED ${SOURCE} fltmgr.rc) +set_module_type(rosfltmgr kernelmodedriver) +target_link_libraries(rosfltmgr ${PSEH_LIB}) +add_importlibs(rosfltmgr ntoskrnl hal) +add_pch(rosfltmgr fltmgr.h SOURCE) +add_cd_file(TARGET rosfltmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,805 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/fs_minifilter/fltmgr/interface.c +* PURPOSE: Implements the driver interface +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" + +//#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + +DRIVER_INITIALIZE DriverEntry; +NTSTATUS +NTAPI +DriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath +); + +static +NTSTATUS +SetupDispatchAndCallbacksTables( + _In_ PDRIVER_OBJECT DriverObject +); + +static +NTSTATUS +FltpAttachDeviceObject( + _In_ PDEVICE_OBJECT SourceDevice, + _In_ PDEVICE_OBJECT Targetevice, + _Out_ PDEVICE_OBJECT *AttachedToDeviceObject +); + +static +BOOLEAN +FltpIsAttachedToDevice( + _In_ PDEVICE_OBJECT DeviceObject, + _In_opt_ PDEVICE_OBJECT *AttachedDeviceObject +); + +static +NTSTATUS +FltpEnumerateFileSystemVolumes( + _In_ PDEVICE_OBJECT DeviceObject +); + +static +NTSTATUS +FltpAttachToFileSystemDevice( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PUNICODE_STRING DeviceName +); + +static +LONG_PTR +FltpDetachFromFileSystemDevice( + _In_ PDEVICE_OBJECT DeviceObject +); + +DRIVER_FS_NOTIFICATION FltpFsNotification; +VOID +FltpFsNotification( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ BOOLEAN FsActive +); + + +#ifdef ALLOC_PRAGMA +#pragma alloc_text(INIT, DriverEntry) +#pragma alloc_text(INIT, SetupDispatchAndCallbacksTables) +#pragma alloc_text(PAGE, FltpAttachDeviceObject) +#pragma alloc_text(PAGE, FltpIsAttachedToDevice) +#pragma alloc_text(PAGE, FltpEnumerateFileSystemVolumes) +#pragma alloc_text(PAGE, FltpAttachToFileSystemDevice) +#pragma alloc_text(PAGE, FltpDetachFromFileSystemDevice) +#pragma alloc_text(PAGE, FltpFsNotification) +//#pragma alloc_text(PAGE, ) +#endif + +#define MAX_DEVNAME_LENGTH 64 + +DRIVER_DATA DriverData; + +typedef struct _FLTMGR_DEVICE_EXTENSION +{ + /* The file system we're attached to */ + PDEVICE_OBJECT AttachedToDeviceObject; + + // Pointer to the real (disk) device object that is associated with + // the file system device object we are attached to + /* The storage stack(disk) accociated with the file system device object we're attached to */ + PDEVICE_OBJECT StorageStackDeviceObject; + + /* Either physical drive for volume device objects otherwise + * it's the name of the control device we're attached to */ + UNICODE_STRING DeviceName; + WCHAR DeviceNameBuffer[MAX_DEVNAME_LENGTH]; + +} FLTMGR_DEVICE_EXTENSION, *PFLTMGR_DEVICE_EXTENSION; + + + + +/* DISPATCH ROUTINES **********************************************/ + +NTSTATUS +NTAPI +FltpPreFsFilterOperation(_In_ PFS_FILTER_CALLBACK_DATA Data, + _Out_ PVOID *CompletionContext) +{ + UNREFERENCED_PARAMETER(Data); + UNREFERENCED_PARAMETER(CompletionContext); + __debugbreak(); + return STATUS_SUCCESS; +} + +VOID +NTAPI +FltpPostFsFilterOperation(_In_ PFS_FILTER_CALLBACK_DATA Data, + _In_ NTSTATUS OperationStatus, + _In_ PVOID CompletionContext) +{ + UNREFERENCED_PARAMETER(Data); + UNREFERENCED_PARAMETER(OperationStatus); + UNREFERENCED_PARAMETER(CompletionContext); + __debugbreak(); +} + +NTSTATUS +NTAPI +FltpDispatch(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + __debugbreak(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +FltpCreate(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + __debugbreak(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +FltpFsControl(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + __debugbreak(); + return STATUS_SUCCESS; +} + + + +/* FUNCTIONS **********************************************/ + +VOID +FltpCleanupDeviceObject(_In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension) + { + // cleanup device extension + } +} + +static +NTSTATUS +FltpAttachDeviceObject(_In_ PDEVICE_OBJECT SourceDevice, + _In_ PDEVICE_OBJECT TargetDevice, + _Out_ PDEVICE_OBJECT *AttachedToDeviceObject) +{ + NTSTATUS Status; + + PAGED_CODE(); + + /* Before attaching, copy the flags from the device we're going to attach to */ + if (FlagOn(SourceDevice->Flags, DO_BUFFERED_IO)) + { + SetFlag(TargetDevice->Flags, DO_BUFFERED_IO); + } + if (FlagOn(SourceDevice->Flags, DO_DIRECT_IO)) + { + SetFlag(TargetDevice->Flags, DO_DIRECT_IO); + } + if (FlagOn(SourceDevice->Flags, DO_SYSTEM_BOOT_PARTITION)) + { + SetFlag(TargetDevice->Characteristics, FILE_DEVICE_SECURE_OPEN); + } + + /* Attach this device to the top of the driver stack */ + Status = IoAttachDeviceToDeviceStackSafe(SourceDevice, + TargetDevice, + AttachedToDeviceObject); + + return Status; +} + +static +BOOLEAN +FltpIsAttachedToDevice(_In_ PDEVICE_OBJECT DeviceObject, + _In_opt_ PDEVICE_OBJECT *AttachedDeviceObject) +{ + PDEVICE_OBJECT CurrentDeviceObject; + PDEVICE_OBJECT NextDeviceObject; + + PAGED_CODE(); + + /* Initialize the return pointer */ + if (AttachedDeviceObject) *AttachedDeviceObject = NULL; + + /* Start by getting the top level device in the chain */ + CurrentDeviceObject = IoGetAttachedDeviceReference(DeviceObject); + + /* Loop while there are attached devices */ + while (CurrentDeviceObject) + { + /* Check if this device driver matches ours */ + if (CurrentDeviceObject->DriverObject == DriverData.DriverObject) + { + FLT_ASSERT(CurrentDeviceObject->DeviceExtension != NULL); + + /* We're attached, return the device object if the caller asked for it */ + if (AttachedDeviceObject) + { + *AttachedDeviceObject = CurrentDeviceObject; + } + else + { + /* We aren't returning the reference, so decrement the count */ + ObDereferenceObject(CurrentDeviceObject); + } + + return TRUE; + } + + /* Get the next device in the chain */ + NextDeviceObject = IoGetLowerDeviceObject(CurrentDeviceObject); + + /* Decrement the count on the last device before we update the pointer */ + ObDereferenceObject(CurrentDeviceObject); + CurrentDeviceObject = NextDeviceObject; + } + + return FALSE; +} + +static +NTSTATUS +FltpEnumerateFileSystemVolumes(_In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION NewDeviceExtension; + PDEVICE_OBJECT BaseDeviceObject; + PDEVICE_OBJECT NewDeviceObject; + PDEVICE_OBJECT *DeviceList; + PDEVICE_OBJECT StorageStackDeviceObject; + UNICODE_STRING DeviceName; + ULONG NumDevices; + ULONG i; + NTSTATUS Status; + + PAGED_CODE(); + + /* Get the base device */ + BaseDeviceObject = IoGetDeviceAttachmentBaseRef(DeviceObject); + + /* get the number of device object linked to the base file system */ + Status = IoEnumerateDeviceObjectList(BaseDeviceObject->DriverObject, + NULL, + 0, + &NumDevices); + if (Status != STATUS_BUFFER_TOO_SMALL) return Status; + + /* Add a few more slots in case the size changed between calls and allocate some memory to hold the pointers */ + NumDevices += 4; + DeviceList = ExAllocatePoolWithTag(NonPagedPool, + (NumDevices * sizeof(PDEVICE_OBJECT)), + FM_TAG_DEV_OBJ_PTRS); + if (DeviceList == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Now get all the device objects that this base driver has created */ + Status = IoEnumerateDeviceObjectList(BaseDeviceObject->DriverObject, + DeviceList, + (NumDevices * sizeof(PDEVICE_OBJECT)), + &NumDevices); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(DeviceList, FM_TAG_DEV_OBJ_PTRS); + return Status; + } + + /* Loop through all the devices looking for ones to attach to */ + for (i = 0; i < NumDevices; i++) + { + RtlInitUnicodeString(&DeviceName, NULL); + StorageStackDeviceObject = NULL; + NewDeviceObject = NULL; + + /* Ignore the device we passed in, and devices of the wrong type */ + if ((DeviceList[i] == BaseDeviceObject) || + (DeviceList[i]->DeviceType != BaseDeviceObject->DeviceType)) + { + goto CleanupAndNext; + } + + /* Ignore this device if we're already attached to it */ + if (FltpIsAttachedToDevice(DeviceList[i], NULL) == FALSE) + { + goto CleanupAndNext; + } + + + /* + * If the device has a name, it must be a control device. + * This handles drivers with more then one control device (like FastFat) + */ + FltpGetBaseDeviceObjectName(DeviceList[i], &DeviceName); + if (NT_SUCCESS(Status) && DeviceName.Length > 0) + { + goto CleanupAndNext; + } + + /* + * Try to get the storage stack (disk) device object accociated with + * this file system device object. Ignore the device if we don't have one + */ + Status = IoGetDiskDeviceObject(DeviceList[i], + &StorageStackDeviceObject); + if (!NT_SUCCESS(Status)) + { + goto CleanupAndNext; + } + + + /* + * TODO: Don't attach to shadow copy volumes, + * ros doesn't have any so it's not an issues yet + */ + + /* + * We're far enough to be ready to attach, create a device + * object which we'll use to do so + */ + Status = IoCreateDevice(DriverData.DriverObject, + sizeof(FLTMGR_DEVICE_EXTENSION), + NULL, + DeviceList[i]->DeviceType, + 0, + FALSE, + &NewDeviceObject); + if (!NT_SUCCESS(Status)) + { + goto CleanupAndNext; + } + + /* Get the device extension for this new object and store our disk object there */ + NewDeviceExtension = NewDeviceObject->DeviceExtension; + NewDeviceExtension->StorageStackDeviceObject = StorageStackDeviceObject; + + /* Lookup and store the device name for the storage stack */ + RtlInitEmptyUnicodeString(&NewDeviceExtension->DeviceName, + NewDeviceExtension->DeviceNameBuffer, + sizeof(NewDeviceExtension->DeviceNameBuffer)); + FltpGetObjectName(StorageStackDeviceObject, + &NewDeviceExtension->DeviceName); + + + /* Grab the attach lock before we attempt to attach */ + ExAcquireFastMutex(&DriverData.FilterAttachLock); + + /* Check again that we aren't already attached. It may have changed since our last check */ + if (FltpIsAttachedToDevice(DeviceList[i], NULL) == FALSE) + { + FLT_ASSERT(NewDeviceObject->DriverObject == DriverData.DriverObject); + + /* Finally, attach to the volume */ + Status = FltpAttachDeviceObject(DeviceList[i], + NewDeviceObject, + &NewDeviceExtension->AttachedToDeviceObject); + if (NT_SUCCESS(Status)) + { + /* Clean the initializing flag so other filters can attach to our device object */ + ClearFlag(NewDeviceObject->Flags, DO_DEVICE_INITIALIZING); + } + } + else + { + /* We're already attached. Just cleanup */ + Status = STATUS_DEVICE_ALREADY_ATTACHED; + } + + ExReleaseFastMutex(&DriverData.FilterAttachLock); + +CleanupAndNext: + + if (!NT_SUCCESS(Status)) + { + if (NewDeviceObject) + { + FltpCleanupDeviceObject(NewDeviceObject); + IoDeleteDevice(NewDeviceObject); + } + } + + if (StorageStackDeviceObject) + { + /* A ref was added for us when we attached, so we can deref ours now */ + ObDereferenceObject(StorageStackDeviceObject); + } + + /* Remove the ref which was added by IoEnumerateDeviceObjectList */ + ObDereferenceObject(DeviceList[i]); + + /* Free the buffer that FltpGetBaseDeviceObjectName added */ + FltpFreeUnicodeString(&DeviceName); + + } + + /* Free the memory we allocated for the list */ + ExFreePoolWithTag(DeviceList, FM_TAG_DEV_OBJ_PTRS); + + return STATUS_SUCCESS; +} + +static +NTSTATUS +FltpAttachToFileSystemDevice(_In_ PDEVICE_OBJECT DeviceObject, + _In_ PUNICODE_STRING DeviceName) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT NewDeviceObject; + WCHAR Buffer[MAX_DEVNAME_LENGTH]; + UNICODE_STRING FileSystemDeviceName; + UNICODE_STRING FsRecDeviceName; + NTSTATUS Status; + + PAGED_CODE(); + + /* Only handle device types we're interested in */ + if (DeviceObject->DeviceType != FILE_DEVICE_DISK_FILE_SYSTEM && + DeviceObject->DeviceType != FILE_DEVICE_CD_ROM_FILE_SYSTEM && + DeviceObject->DeviceType != FILE_DEVICE_NETWORK_FILE_SYSTEM) + { + return STATUS_SUCCESS; + } + + /* Setup the buffer to hold the device name */ + RtlInitEmptyUnicodeString(&FileSystemDeviceName, + Buffer, + MAX_DEVNAME_LENGTH * sizeof(WCHAR)); + + /* Get the the name of the file system device */ + Status = FltpGetObjectName(DeviceObject->DriverObject, &FileSystemDeviceName); + if (!NT_SUCCESS(Status)) return Status; + + DPRINT("Found device %wZ, checking if we need to attach...", &FileSystemDeviceName); + + /* Build up the name of the file system recognizer device */ + RtlInitUnicodeString(&FsRecDeviceName, L"\\FileSystem\\Fs_Rec"); + + /* We don't attach to recognizer devices, so bail if this is one */ + if (RtlCompareUnicodeString(&FileSystemDeviceName, &FsRecDeviceName, TRUE) == 0) + { + return STATUS_SUCCESS; + } + + /* Create a device object which we can attach to this file system */ + Status = IoCreateDevice(DriverData.DriverObject, + sizeof(FLTMGR_DEVICE_EXTENSION), + NULL, + DeviceObject->DeviceType, + 0, + FALSE, + &NewDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create a DO for attatching to a FS : 0x%X", Status); + return Status; + } + + /* Cast the device extension to something we understand */ + DeviceExtension = NewDeviceObject->DeviceExtension; + + /* Attach this device to the top of the driver stack and store the DO we attached to in the DE */ + Status = FltpAttachDeviceObject(NewDeviceObject, + DeviceObject, + &DeviceExtension->AttachedToDeviceObject); + if (NT_SUCCESS(Status)) + { + DPRINT("Attached to %wZ", &FileSystemDeviceName); + } + else + { + DPRINT1("Failed to attach to the driver stack : 0x%X", Status); + goto Cleanup; + } + + /* Setup the unicode string buffer and copy the device name to the device extension */ + RtlInitEmptyUnicodeString(&DeviceExtension->DeviceName, + DeviceExtension->DeviceNameBuffer, + MAX_DEVNAME_LENGTH * sizeof(WCHAR)); + RtlCopyUnicodeString(&DeviceExtension->DeviceName, DeviceName); + + /* We're done, remove the initializing flag */ + ClearFlag(NewDeviceObject->Flags, DO_DEVICE_INITIALIZING); + + /* Look for existing mounted devices for this file system */ + Status = FltpEnumerateFileSystemVolumes(DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to enumerate file system volumes for this file system : 0x%X", Status); + IoDetachDevice(DeviceExtension->AttachedToDeviceObject); + } + +Cleanup: + + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(NewDeviceObject); + } + + return Status; +} + +static +LONG_PTR +FltpDetachFromFileSystemDevice(_In_ PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_OBJECT AttachedDevice, LowestDevice; + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + LONG_PTR Count; + + PAGED_CODE(); + + /* Get the attached device and increment the ref count on it */ + AttachedDevice = IoGetAttachedDeviceReference(DeviceObject); + + /* Loop through all attached devices until we reach the bottom (file system driver) */ + while (AttachedDevice->DriverObject != DriverData.DriverObject) + { + /* Get the attached device */ + LowestDevice = IoGetLowerDeviceObject(AttachedDevice); + + /* Remove the reference we added. If it's zero then we're already clean */ + Count = ObfDereferenceObject(AttachedDevice); + if (Count == 0) return Count; + + /* Try the next one */ + AttachedDevice = LowestDevice; + } + + + DeviceExtension = AttachedDevice->DeviceExtension; + if (DeviceExtension) + { + // + // FIXME: Put any device extension cleanup code here + // + } + + /* Detach the device from the chain and delete the object */ + IoDetachDevice(DeviceObject); + IoDeleteDevice(AttachedDevice); + + /* Remove the reference we added so the delete can complete */ + return ObfDereferenceObject(AttachedDevice); +} + +DRIVER_FS_NOTIFICATION FltpFsNotification; +VOID +FltpFsNotification(_In_ PDEVICE_OBJECT DeviceObject, + _In_ BOOLEAN FsActive) +{ + UNICODE_STRING DeviceName; + NTSTATUS Status; + __debugbreak(); + PAGED_CODE(); + + /* Set an empty string */ + RtlInitUnicodeString(&DeviceName, NULL); + + /* Get the name of the lowest device object on the stack */ + Status = FltpGetBaseDeviceObjectName(DeviceObject, &DeviceName); + if (NT_SUCCESS(Status)) + { + /* Check if it's attaching or detaching*/ + if (FsActive) + { + /* Run the attach routine */ + FltpAttachToFileSystemDevice(DeviceObject, &DeviceName); + } + else + { + /* Run the detatch routine */ + FltpDetachFromFileSystemDevice(DeviceObject); + } + + /* Free the buffer which FltpGetBaseDeviceObjectName allocated */ + FltpFreeUnicodeString(&DeviceName); + } +} + +DRIVER_INITIALIZE DriverEntry; +NTSTATUS +NTAPI +DriverEntry(_In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) +{ + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\FileSystem\\Filters\\"DRIVER_NAME); + PDEVICE_OBJECT RawDeviceObject; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT RawFileObject; + UNICODE_STRING ObjectName; + UNICODE_STRING SymLink; + + NTSTATUS Status; + __debugbreak(); + RtlZeroMemory(&DriverData, sizeof(DRIVER_DATA)); + DriverData.DriverObject = DriverObject; + + /* Save the registry key for this driver */ + DriverData.ServiceKey.Length = RegistryPath->Length; + DriverData.ServiceKey.MaximumLength = RegistryPath->MaximumLength; + DriverData.ServiceKey.Buffer = (PWCHAR)ExAllocatePoolWithTag(NonPagedPool, + RegistryPath->MaximumLength, + FM_TAG_REGISTRY_DATA); + if (!DriverData.ServiceKey.Buffer) return STATUS_INSUFFICIENT_RESOURCES; + RtlCopyUnicodeString(&DriverData.ServiceKey, RegistryPath); + + /* Do some initialization */ + ExInitializeFastMutex(&DriverData.FilterAttachLock); + + /* Create the main filter manager device object */ + Status = IoCreateDevice(DriverObject, + 0, + &DeviceName, + FILE_DEVICE_DISK_FILE_SYSTEM, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("fltmgr IoCreateDevice failed. Status = %X", Status); + goto Cleanup; + } + + /* Store a global reference so we can access from callbacks */ + DriverData.DeviceObject = DeviceObject; + + /* Generate the symbolic link name */ + RtlInitUnicodeString(&SymLink, L"\\??\\"DRIVER_NAME); + Status = IoCreateSymbolicLink(&SymLink, &DeviceName); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Create the callbacks for the dispatch table, FastIo and FS callbacks */ + Status = SetupDispatchAndCallbacksTables(DriverObject); + if (!NT_SUCCESS(Status)) goto Cleanup; + + // + // TODO: Create fltmgr message device + // + + /* Register for notifications when a new file system is loaded. This also enumerates any existing file systems */ + Status = IoRegisterFsRegistrationChange(DriverObject, FltpFsNotification); + FLT_ASSERT(Status != STATUS_DEVICE_ALREADY_ATTACHED); // Windows checks for this, but I'm not sure how that can happen?? + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* IoRegisterFsRegistrationChange isn't notified about the raw file systems, so we attach to them manually */ + RtlInitUnicodeString(&ObjectName, L"\\Device\\RawDisk"); + Status = IoGetDeviceObjectPointer(&ObjectName, + FILE_READ_ATTRIBUTES, + &RawFileObject, + &RawDeviceObject); + if (NT_SUCCESS(Status)) + { + FltpFsNotification(RawDeviceObject, TRUE); + ObfDereferenceObject(RawFileObject); + } + + RtlInitUnicodeString(&ObjectName, L"\\Device\\RawCdRom"); + Status = IoGetDeviceObjectPointer(&ObjectName, + FILE_READ_ATTRIBUTES, + &RawFileObject, + &RawDeviceObject); + if (NT_SUCCESS(Status)) + { + FltpFsNotification(RawDeviceObject, TRUE); + ObfDereferenceObject(RawFileObject); + } + + /* We're done, clear the initializing flag */ + ClearFlag(DeviceObject->Flags, DO_DEVICE_INITIALIZING); + Status = STATUS_SUCCESS; + +Cleanup: + + if (!NT_SUCCESS(Status)) + { + if (DriverData.FastIoDispatch) + { + DriverObject->FastIoDispatch = NULL; + ExFreePoolWithTag(DriverData.FastIoDispatch, FM_TAG_DISPATCH_TABLE); + } + + IoDeleteSymbolicLink(&SymLink); + + if (DeviceObject) + IoDeleteDevice(DeviceObject); + + if (DriverData.ServiceKey.Buffer) + ExFreePoolWithTag(DriverData.ServiceKey.Buffer, FM_TAG_REGISTRY_DATA); + } + + return Status; +} + + +static +NTSTATUS +SetupDispatchAndCallbacksTables(_In_ PDRIVER_OBJECT DriverObject) +{ + PFAST_IO_DISPATCH FastIoDispatch; + FS_FILTER_CALLBACKS Callbacks; + ULONG i; + + /* Plug all the IRPs */ + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + { + DriverObject->MajorFunction[i] = FltpDispatch; + } + + /* Override the ones we're interested in */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = FltpCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = FltpCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = FltpCreate; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FltpFsControl; + + /* The FastIo diapatch table is stored in the pool along with a tag */ + FastIoDispatch = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_IO_DISPATCH), FM_TAG_DISPATCH_TABLE); + if (FastIoDispatch == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Fill out the FastIo table */ + RtlZeroMemory(FastIoDispatch, sizeof(FAST_IO_DISPATCH)); + FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); + FastIoDispatch->FastIoCheckIfPossible = (PFAST_IO_CHECK_IF_POSSIBLE)NULL; + FastIoDispatch->FastIoRead = (PFAST_IO_READ)NULL; + FastIoDispatch->FastIoWrite = (PFAST_IO_WRITE)NULL; + FastIoDispatch->FastIoQueryBasicInfo = (PFAST_IO_QUERY_BASIC_INFO)NULL; + FastIoDispatch->FastIoQueryStandardInfo = (PFAST_IO_QUERY_STANDARD_INFO)NULL; + FastIoDispatch->FastIoLock = (PFAST_IO_LOCK)NULL; + FastIoDispatch->FastIoUnlockSingle = (PFAST_IO_UNLOCK_SINGLE)NULL; + FastIoDispatch->FastIoUnlockAll = (PFAST_IO_UNLOCK_ALL)NULL; + FastIoDispatch->FastIoUnlockAllByKey = (PFAST_IO_UNLOCK_ALL_BY_KEY)NULL; + FastIoDispatch->FastIoDeviceControl = (PFAST_IO_DEVICE_CONTROL)NULL; + FastIoDispatch->FastIoDetachDevice = (PFAST_IO_DETACH_DEVICE)NULL; + FastIoDispatch->FastIoQueryNetworkOpenInfo = (PFAST_IO_QUERY_NETWORK_OPEN_INFO)NULL; + FastIoDispatch->MdlRead = (PFAST_IO_MDL_READ)NULL; + FastIoDispatch->MdlReadComplete = (PFAST_IO_MDL_READ_COMPLETE)NULL; + FastIoDispatch->PrepareMdlWrite = (PFAST_IO_PREPARE_MDL_WRITE)NULL; + FastIoDispatch->MdlWriteComplete = (PFAST_IO_MDL_WRITE_COMPLETE)NULL; + FastIoDispatch->FastIoReadCompressed = (PFAST_IO_READ_COMPRESSED)NULL; + FastIoDispatch->FastIoWriteCompressed = (PFAST_IO_WRITE_COMPRESSED)NULL; + FastIoDispatch->MdlReadCompleteCompressed = (PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)NULL; + FastIoDispatch->MdlWriteCompleteCompressed = (PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)NULL; + FastIoDispatch->FastIoQueryOpen = (PFAST_IO_QUERY_OPEN)NULL; + + /* Store the FastIo table address for easy reference */ + DriverData.FastIoDispatch = FastIoDispatch; + + /* Initialize the callback table */ + Callbacks.SizeOfFsFilterCallbacks = sizeof(FS_FILTER_CALLBACKS); + Callbacks.PreAcquireForSectionSynchronization = FltpPreFsFilterOperation; + Callbacks.PostAcquireForSectionSynchronization = FltpPostFsFilterOperation; + Callbacks.PreReleaseForSectionSynchronization = FltpPreFsFilterOperation; + Callbacks.PostReleaseForSectionSynchronization = FltpPostFsFilterOperation; + Callbacks.PreAcquireForCcFlush = FltpPreFsFilterOperation; + Callbacks.PostAcquireForCcFlush = FltpPostFsFilterOperation; + Callbacks.PreReleaseForCcFlush = FltpPreFsFilterOperation; + Callbacks.PostReleaseForCcFlush = FltpPostFsFilterOperation; + Callbacks.PreAcquireForModifiedPageWriter = FltpPreFsFilterOperation; + Callbacks.PostAcquireForModifiedPageWriter = FltpPostFsFilterOperation; + Callbacks.PreReleaseForModifiedPageWriter = FltpPreFsFilterOperation; + Callbacks.PostReleaseForModifiedPageWriter = FltpPostFsFilterOperation; + + /* Register our callbacks */ + return FsRtlRegisterFileSystemFilterCallbacks(DriverObject, &Callbacks); +} Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,160 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/fs_minifilter/fltmgr/Lib.c +* PURPOSE: Miscellaneous library functions +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + + + +/* FUNCTIONS **********************************************/ + +NTSTATUS +FltpGetBaseDeviceObjectName(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PUNICODE_STRING ObjectName) +{ + PDEVICE_OBJECT BaseDeviceObject; + NTSTATUS Status; + + /* + * Get the lowest device object on the stack, which may be the + * object we were passed, and lookup the name for that object + */ + BaseDeviceObject = IoGetDeviceAttachmentBaseRef(DeviceObject); + Status = FltpGetObjectName(BaseDeviceObject, ObjectName); + ObDereferenceObject(BaseDeviceObject); + + return Status; +} + +NTSTATUS +FltpGetObjectName(_In_ PVOID Object, + _Inout_ PUNICODE_STRING ObjectName) +{ + POBJECT_NAME_INFORMATION ObjectNameInfo = NULL; + OBJECT_NAME_INFORMATION LocalNameInfo; + ULONG ReturnLength; + NTSTATUS Status; + + if (ObjectName == NULL) + return STATUS_INVALID_PARAMETER; + + /* Get the size of the buffer required to hold the nameinfo */ + Status = ObQueryNameString(Object, + &LocalNameInfo, + sizeof(LocalNameInfo), + &ReturnLength); + if (Status == STATUS_INFO_LENGTH_MISMATCH) + { + ObjectNameInfo = ExAllocatePoolWithTag(PagedPool, + ReturnLength, + FM_TAG_UNICODE_STRING); + if (ObjectNameInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the actual name info now we have the buffer to hold it */ + Status = ObQueryNameString(Object, + ObjectNameInfo, + ReturnLength, + &ReturnLength); + } + + + if (NT_SUCCESS(Status)) + { + /* Make sure the buffer we were passed is large enough to hold the string */ + if (ObjectName->MaximumLength < ObjectNameInfo->Name.Length) + { + /* It wasn't, let's enlarge the buffer */ + Status = FltpReallocateUnicodeString(ObjectName, + ObjectNameInfo->Name.Length, + FALSE); + + } + + if (NT_SUCCESS(Status)) + { + /* Copy the object name into the callers buffer */ + RtlCopyUnicodeString(ObjectName, &ObjectNameInfo->Name); + } + } + + if (ObjectNameInfo) + { + ExFreePoolWithTag(ObjectNameInfo, FM_TAG_UNICODE_STRING); + } + + return Status; +} + +VOID +FltpFreeUnicodeString(_In_ PUNICODE_STRING String) +{ + /* Free up any existing buffer */ + if (String->Buffer) + { + ExFreePoolWithTag(String->Buffer, FM_TAG_UNICODE_STRING); + } + + /* Empty the string */ + String->Buffer = NULL; + String->Length = 0; + String->MaximumLength = 0; +} + +NTSTATUS +FltpReallocateUnicodeString(_In_ PUNICODE_STRING String, + _In_ SIZE_T NewLength, + _In_ BOOLEAN CopyExisting) +{ + PWCH NewBuffer; + + /* Don't bother reallocating if the buffer is smaller */ + if (NewLength <= String->MaximumLength) + { + String->Length = 0; + return STATUS_SUCCESS; + } + + /* Allocate a new buffer at the size requested */ + NewBuffer = ExAllocatePoolWithTag(PagedPool, NewLength, FM_TAG_UNICODE_STRING); + if (NewBuffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + if (CopyExisting) + { + /* Copy the old data across */ + RtlCopyMemory(NewBuffer, String->Buffer, String->Length); + } + else + { + /* Reset the length */ + String->Length = 0; + } + + /* Free any old buffer */ + if (String->Buffer) + ExFreePoolWithTag(String->Buffer, FM_TAG_UNICODE_STRING); + + /* Update the lengths */ + String->Buffer = NewBuffer; + String->MaximumLength = NewLength; + + return STATUS_SUCCESS; +} + +NTSTATUS +FltpCopyUnicodeString(_In_ PUNICODE_STRING StringOne, + _In_ PUNICODE_STRING StringTwo) +{ + return 0; +} Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,264 @@ +#ifndef _FLTMGR_H +#define _FLTMGR_H + +#include <ntifs.h> +//#include <fltkernel.h> +#include <pseh/pseh2.h> + +#define DRIVER_NAME L"RosFltMgr" + +#define FM_TAG_DISPATCH_TABLE 'ifMF' +#define FM_TAG_REGISTRY_DATA 'rtMF' +#define FM_TAG_DEV_OBJ_PTRS 'ldMF' +#define FM_TAG_UNICODE_STRING 'suMF' + +typedef struct _DRIVER_DATA +{ + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DeviceObject; + UNICODE_STRING ServiceKey; + + PFAST_IO_DISPATCH FastIoDispatch; + + FAST_MUTEX FilterAttachLock; + +} DRIVER_DATA, *PDRIVER_DATA; + + +#define FLT_ASSERT(_e) NT_ASSERT(_e) //FIXME + + +//FM ? ? -fltmgr.sys - Unrecognized FltMgr tag(update pooltag.w) +//FMac - fltmgr.sys - ASCII String buffers +//FMas - fltmgr.sys - ASYNC_IO_COMPLETION_CONTEXT structure +//FMcb - fltmgr.sys - FLT_CCB structure +//FMcr - fltmgr.sys - Context registration structures +//FMct - fltmgr.sys - TRACK_COMPLETION_NODES structure +//FMdl - fltmgr.sys - Array of DEVICE_OBJECT pointers +//FMea - fltmgr.sys - EA buffer for create +//FMfc - fltmgr.sys - FLTMGR_FILE_OBJECT_CONTEXT structure +//FMfi - fltmgr.sys - Fast IO dispatch table +//FMfk - fltmgr.sys - Byte Range Lock structure +//FMfl - fltmgr.sys - FLT_FILTER structure +//FMfn - fltmgr.sys - NAME_CACHE_NODE structure +//FMfr - fltmgr.sys - FLT_FRAME structure +//FMfz - fltmgr.sys - FILE_LIST_CTRL structure +//FMib - fltmgr.sys - Irp SYSTEM buffers +//FMic - fltmgr.sys - IRP_CTRL structure +//FMin - fltmgr.sys - FLT_INSTANCE name +//FMil - fltmgr.sys - IRP_CTRL completion node stack +//FMis - fltmgr.sys - FLT_INSTANCE structure +//FMla - fltmgr.sys - Per - processor IRPCTRL lookaside lists +//FMnc - fltmgr.sys - NAME_CACHE_CREATE_CTRL structure +//FMng - fltmgr.sys - NAME_GENERATION_CONTEXT structure +//FMol - fltmgr.sys - OPLOCK_CONTEXT structure +//FMos - fltmgr.sys - Operation status ctrl structure +//FMpl - fltmgr.sys - Cache aware pushLock +//FMpr - fltmgr.sys - FLT_PRCB structure +//FMrl - fltmgr.sys - FLT_OBJECT rundown logs +//FMrp - fltmgr.sys - Reparse point data buffer +//FMrr - fltmgr.sys - Per - processor Cache - aware rundown ref structure +//FMsd - fltmgr.sys - Security descriptors +//FMsl - fltmgr.sys - STREAM_LIST_CTRL structure +//FMtn - fltmgr.sys - Temporary file names +//FMtr - fltmgr.sys - Temporary Registry information +//FMts - fltmgr.sys - Tree Stack +//FMus - fltmgr.sys - Unicode string +//FMvf - fltmgr.sys - FLT_VERIFIER_EXTENSION structure +//FMvj - fltmgr.sys - FLT_VERIFIER_OBJECT structure +//FMvo - fltmgr.sys - FLT_VOLUME structure +//FMwi - fltmgr.sys - Work item structures +//FMcn - fltmgr.sys - Non paged context extension structures. +//FMtp - fltmgr.sys - Non Paged tx vol context structures. +//FMlp - fltmgr.sys - Paged stream list control entry structures. + + + + +/* +FltAcquirePushLockExclusive +FltAcquirePushLockShared +FltAcquireResourceExclusive +FltAcquireResourceShared +FltAllocateCallbackData +FltAllocateContext +FltAllocateDeferredIoWorkItem +FltAllocateFileLock +FltAllocateGenericWorkItem +FltAllocatePoolAlignedWithTag +FltAttachVolume +FltAttachVolumeAtAltitude +FltBuildDefaultSecurityDescriptor +FltCancelFileOpen +FltCancelIo +FltCbdqDisable +FltCbdqEnable +FltCbdqInitialize +FltCbdqInsertIo +FltCbdqRemoveIo +FltCbdqRemoveNextIo +FltCheckAndGrowNameControl +FltCheckLockForReadAccess +FltCheckLockForWriteAccess +FltCheckOplock +FltClearCallbackDataDirty +FltClearCancelCompletion +FltClose +FltCloseClientPort +FltCloseCommunicationPort +FltCompareInstanceAltitudes +FltCompletePendedPostOperation +FltCompletePendedPreOperation +FltCreateCommunicationPort +FltCreateFile +FltCreateFileEx +FltCreateSystemVolumeInformationFolder +FltCurrentBatchOplock +FltDecodeParameters +FltDeleteContext +FltDeleteFileContext +FltDeleteInstanceContext +FltDeletePushLock +FltDeleteStreamContext +FltDeleteStreamHandleContext +FltDeleteVolumeContext +FltDetachVolume +FltDeviceIoControlFile +FltDoCompletionProcessingWhenSafe +FltEnumerateFilterInformation +FltEnumerateFilters +FltEnumerateInstanceInformationByFilter +FltEnumerateInstanceInformationByVolume +FltEnumerateInstances +FltEnumerateVolumeInformation +FltEnumerateVolumes +FltFlushBuffers +FltFreeCallbackData +FltFreeDeferredIoWorkItem +FltFreeFileLock +FltFreeGenericWorkItem +FltFreePoolAlignedWithTag +FltFreeSecurityDescriptor +FltFsControlFile +FltGetBottomInstance +FltGetContexts +FltGetDestinationFileNameInformation +FltGetDeviceObject +FltGetDiskDeviceObject +FltGetFileContext +FltGetFileNameInformation +FltGetFileNameInformationUnsafe +FltGetFilterFromInstance +FltGetFilterFromName +FltGetFilterInformation +FltGetInstanceContext +FltGetInstanceInformation +FltGetIrpName +FltGetLowerInstance +FltGetRequestorProcess +FltGetRequestorProcessId +FltGetRoutineAddress +FltGetStreamContext +FltGetStreamHandleContext +FltGetSwappedBufferMdlAddress +FltGetTopInstance +FltGetTunneledName +FltGetUpperInstance +FltGetVolumeContext +FltGetVolumeFromDeviceObject +FltGetVolumeFromFileObject +FltGetVolumeFromInstance +FltGetVolumeFromName +FltGetVolumeGuidName +FltGetVolumeInstanceFromName +FltGetVolumeName +FltGetVolumeProperties +FltInitializeFileLock +FltInitializeOplock +FltInitializePushLock +FltIs32bitProcess +FltIsCallbackDataDirty +FltIsDirectory +FltIsIoCanceled +FltIsOperationSynchronous +FltIsVolumeWritable +FltLoadFilter +FltLockUserBuffer +FltNotifyFilterChangeDirectory +FltObjectDereference +FltObjectReference +FltOpenVolume +FltOplockFsctrl +FltOplockIsFastIoPossible +FltParseFileName +FltParseFileNameInformation +FltPerformAsynchronousIo +FltPerformSynchronousIo +FltProcessFileLock +FltPurgeFileNameInformationCache +FltQueryEaFile +FltQueryInformationFile +FltQuerySecurityObject +FltQueryVolumeInformation +FltQueryVolumeInformationFile +FltQueueDeferredIoWorkItem +FltQueueGenericWorkItem +FltReadFile +FltReferenceContext +FltReferenceFileNameInformation +FltRegisterFilter +FltReissueSynchronousIo +FltReleaseContext +FltReleaseContexts +FltReleaseFileNameInformation +FltReleasePushLock +FltReleaseResource +FltRequestOperationStatusCallback +FltRetainSwappedBufferMdlAddress +FltReuseCallbackData +FltSendMessage +FltSetCallbackDataDirty +FltSetCancelCompletion +FltSetEaFile +FltSetFileContext +FltSetInformationFile +FltSetInstanceContext +FltSetSecurityObject +FltSetStreamContext +FltSetStreamHandleContext +FltSetVolumeContext +FltSetVolumeInformation +FltStartFiltering +FltSupportsFileContexts +FltSupportsStreamContexts +FltSupportsStreamHandleContexts +FltTagFile +FltUninitializeFileLock +FltUninitializeOplock +FltUnloadFilter +FltUnregisterFilter +FltUntagFile +FltWriteFile +*/ + + + +/////////// FIXME: put these into the correct header +NTSTATUS +FltpGetBaseDeviceObjectName(_In_ PDEVICE_OBJECT DeviceObject, +_Inout_ PUNICODE_STRING ObjectName); + +NTSTATUS +FltpGetObjectName(_In_ PVOID Object, +_Inout_ PUNICODE_STRING ObjectName); + +NTSTATUS +FltpReallocateUnicodeString(_In_ PUNICODE_STRING String, +_In_ SIZE_T NewLength, +_In_ BOOLEAN CopyExisting); + +VOID +FltpFreeUnicodeString(_In_ PUNICODE_STRING String); +//////////////////////////////////////////////// + +#endif /* _FLTMGR_H */ Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc [iso-8859-1] Wed Dec 23 14:41:05 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Filesystem Filter Manager" +#define REACTOS_STR_INTERNAL_NAME "fltmgr" +#define REACTOS_STR_ORIGINAL_FILENAME "fltmgr.sys" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.rc ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 10 months

[gedmurphy] 70408: [NTOSKRNL] - Raise the IRQL when enumerating device lists so it doesn't get edited mid-listing - Don't hardcode the pointer size when checking the buffer size

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Dec 23 11:26:28 2015 New Revision: 70408 URL: http://svn.reactos.org/svn/reactos?rev=70408&view=rev Log: [NTOSKRNL] - Raise the IRQL when enumerating device lists so it doesn't get edited mid-listing - Don't hardcode the pointer size when checking the buffer size Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Wed Dec 23 11:26:28 2015 @@ -1088,6 +1088,10 @@ { ULONG ActualDevices = 1; PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject; + KIRQL OldIrql; + + /* Raise to dispatch level */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); /* Find out how many devices we'll enumerate */ while ((CurrentDevice = CurrentDevice->NextDevice)) ActualDevices++; @@ -1099,13 +1103,14 @@ *ActualNumberDeviceObjects = ActualDevices; /* Check if we can support so many */ - if ((ActualDevices * 4) > DeviceObjectListSize) + if ((ActualDevices * sizeof(PDEVICE_OBJECT)) > DeviceObjectListSize) { /* Fail because the buffer was too small */ + KeLowerIrql(OldIrql); return STATUS_BUFFER_TOO_SMALL; } - /* Check if the caller only wanted the size */ + /* Check if the caller wanted the device list */ if (DeviceObjectList) { /* Loop through all the devices */ @@ -1123,6 +1128,9 @@ DeviceObjectList++; } } + + /* Return back to previous IRQL */ + KeLowerIrql(OldIrql); /* Return the status */ return STATUS_SUCCESS;

8 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
26
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 December 2015