release spin lock before accessing *SetTokenObjectType

git-svn-id: http://dokan.googlecode.com/svn/trunk@146 53ea604a-054e-0410-8546-456bafaea6b0
zy26 · Apr 10, 2010 · 46f7936 · 46f7936
1 parent 6b37404
commit 46f7936
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/sys/access.c b/sys/access.c
@@ -20,6 +20,8 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "dokan.h"
 
+extern POBJECT_TYPE * SeTokenObjectType;
+
 NTSTATUS
 DokanGetAccessToken(
    __in PDEVICE_OBJECT	DeviceObject,
@@ -32,15 +34,14 @@ DokanGetAccessToken(
 	PDokanVCB			vcb;
 	PEVENT_INFORMATION	eventInfo;
 	PACCESS_TOKEN		accessToken;
-	NTSTATUS			status;
+	NTSTATUS			status = STATUS_INVALID_PARAMETER;
 	HANDLE				handle;
 	PIO_STACK_LOCATION	irpSp = NULL;
 	BOOLEAN				hasLock = FALSE;
 	ULONG				outBufferLen;
 	ULONG				inBufferLen;
 	PACCESS_STATE		accessState;
 
-
 	DDbgPrint("==> DokanGetAccessToken\n");
 
 	__try {
@@ -91,13 +92,23 @@ DokanGetAccessToken(
 			accessState = irpEntry->IrpSp->Parameters.Create.SecurityContext->AccessState;
 			break;
 		}
+		KeReleaseSpinLock(&vcb->Dcb->PendingIrp.ListLock, oldIrql);
+		hasLock = FALSE;
+
 		if (accessState == NULL) {
 			DDbgPrint("  can't find pending Irp: %d\n", eventInfo->SerialNumber);
 			__leave;
 		}
 
 		accessToken = SeQuerySubjectContextToken(&accessState->SubjectSecurityContext);
-		status = ObOpenObjectByPointer(accessToken, 0, NULL, GENERIC_ALL, *SeTokenObjectType, KernelMode, &handle);
+		if (accessToken == NULL) {
+			DDbgPrint("  accessToken == NULL\n");
+			__leave;
+		}
+		// NOTE: Accessing *SeTokenObjectType while acquring sping lock causes
+		// BSOD on Windows XP.
+		status = ObOpenObjectByPointer(accessToken, 0, NULL, GENERIC_ALL,
+			*SeTokenObjectType, KernelMode, &handle);
 		if (!NT_SUCCESS(status)) {
 			DDbgPrint("  ObOpenObjectByPointer failed: 0x%x\n", status);
 			__leave;

diff --git a/sys/dokan.h b/sys/dokan.h
@@ -38,7 +38,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
 #define DOKAN_DEBUG_DEFAULT 1
-//#define USE_DBGPRINT 1
 
 extern ULONG g_Debug;
 
@@ -73,17 +72,12 @@ extern ULONG g_Debug;
 
 #define DOKAN_KEEPALIVE_TIMEOUT		(1000 * 15) // in millisecond
 
-#ifdef USE_DBGPRINT
+#if _WIN32_NT > 0x501
 	#define DDbgPrint(...) \
-	if (g_Debug) { DbgPrint("[DokanFS] " __VA_ARGS__); }
-#else
-	#if _WIN32_WINNT >= 0x0501
-		#define DDbgPrint(...)	\
 		if (g_Debug) { KdPrintEx((DPFLTR_IHVDRIVER_ID, DPFLTR_TRACE_LEVEL, "[DokanFS] " __VA_ARGS__ )); }
-	#else
-        #define DDbgPrint(...) \
-		if (g_Debug) { KdPrint(("[DokanFS] " __VA_ARGS__)); }
-	#endif
+#else
+	#define DDbgPrint(...) \
+		if (g_Debug) { DbgPrint("[DokanFS] " __VA_ARGS__); }
 #endif
 
 #if _WIN32_WINNT < 0x0501