Changeset 63079 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 6, 2016 1:45:43 PM (8 years ago)

Author:

vboxsync

Message:

vbsfDeleteConnection: Status was used uninitialized if vbsfOpenConnectionHandle failed.

File:

• trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c

@@ -46 +46 @@
     NTSTATUS Status = STATUS_SUCCESS;
     PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
-    UCHAR MajorFunctionCode = IrpSp->MajorFunction;
-    ULONG MinorFunctionCode = IrpSp->MinorFunction;
 
     Log(("VBOXSF: MRxFsdDispatch: major %d, minor %d: %s\n",
-         MajorFunctionCode, MinorFunctionCode, MajorFunctionString(MajorFunctionCode, MinorFunctionCode)));
+         IrpSp->MajorFunction, IrpSp->MinorFunction, MajorFunctionString(IrpSp->MajorFunction, IrpSp->MinorFunction)));
 
     if (DeviceObject != (PDEVICE_OBJECT)VBoxMRxDeviceObject)
@@ -1121 +1119 @@
 }
 
-static HANDLE vbsfOpenConnectionHandle(PUNICODE_STRING ConnectionName)
+static HANDLE vbsfOpenConnectionHandle(PUNICODE_STRING ConnectionName, NTSTATUS *prcNt)
 {
     NTSTATUS Status;
@@ -1159 +1157 @@
         || Handle == INVALID_HANDLE_VALUE)
     {
-        Log(("VBOXSF: vbsfOpenConnectionHandle: ZwCreateFile failed status 0x%08X or invalid handle!\n",
-             Status));
+        Log(("VBOXSF: vbsfOpenConnectionHandle: ZwCreateFile failed status 0x%08X or invalid handle!\n", Status));
+        if (prcNt)
+            *prcNt = !NT_SUCCESS(Status) ? Status : STATUS_UNSUCCESSFUL;
         Handle = INVALID_HANDLE_VALUE;
     }
@@ -1214 +1213 @@
         FileName.MaximumLength = (USHORT)cbConnectName;
 
-        Handle = vbsfOpenConnectionHandle(&FileName);
+        Handle = vbsfOpenConnectionHandle(&FileName, NULL);
 
         if (Handle != INVALID_HANDLE_VALUE)
@@ -1349 +1348 @@
         FileName.MaximumLength = (USHORT)cbConnectName;
 
-        Handle = vbsfOpenConnectionHandle(&FileName);
-
+        Handle = vbsfOpenConnectionHandle(&FileName, &Status);
         if (Handle != INVALID_HANDLE_VALUE)
         {
@@ -1380 +1378 @@
 
             ZwClose(Handle);
-        }
-
-        if (NT_SUCCESS(Status))
-        {
-            PWCHAR pwc;
-            ULONG i;
-
-            /* Skip the "\Device\VBoxMiniRdr\;X:" of the string "\Device\VBoxMiniRdr\;X:\vboxsrv\sf" */
-            pwc = pwcConnectName;
-            for (i = 0; i < cbConnectName; i += sizeof(WCHAR))
+
+            if (NT_SUCCESS(Status))
             {
-                if (*pwc == L':')
+                PWCHAR pwc;
+                ULONG i;
+
+                /* Skip the "\Device\VBoxMiniRdr\;X:" of the string "\Device\VBoxMiniRdr\;X:\vboxsrv\sf" */
+                pwc = pwcConnectName;
+                for (i = 0; i < cbConnectName; i += sizeof(WCHAR))
                 {
-                    break;
+                    if (*pwc == L':')
+                    {
+                        break;
+                    }
+                    pwc++;
                 }
-                pwc++;
-            }
-
-            if (i >= sizeof(WCHAR) && i < cbConnectName)
-            {
-                pwc--;
-
-                if (*pwc >= L'A' && *pwc <= L'Z')
+
+                if (i >= sizeof(WCHAR) && i < cbConnectName)
                 {
-                    uint32_t idx = *pwc - L'A';
-
-                    if (idx >= RTL_NUMBER_OF(pDeviceExtension->cLocalConnections))
-                    {
-                        Log(("VBOXSF: vbsfDeleteConnection: Index 0x%x is invalid!\n",
-                             idx));
-                        Status = STATUS_BAD_NETWORK_NAME;
-                    }
-                    else
-                    {
-                        ExAcquireFastMutex(&pDeviceExtension->mtxLocalCon);
-                        fMutexAcquired = TRUE;
-
-                        pDeviceExtension->cLocalConnections[idx] = FALSE;
-
-                        /* Free saved name */
-                        if (pDeviceExtension->wszLocalConnectionName[idx])
+                    pwc--;
+
+                    if (*pwc >= L'A' && *pwc <= L'Z')
+                    {
+                        uint32_t idx = *pwc - L'A';
+
+                        if (idx >= RTL_NUMBER_OF(pDeviceExtension->cLocalConnections))
                         {
-                            vbsfFreeNonPagedMem(pDeviceExtension->wszLocalConnectionName[idx]);
-                            pDeviceExtension->wszLocalConnectionName[idx] = NULL;
+                            Log(("VBOXSF: vbsfDeleteConnection: Index 0x%x is invalid!\n",
+                                 idx));
+                            Status = STATUS_BAD_NETWORK_NAME;
                         }
-
-                        ExReleaseFastMutex(&pDeviceExtension->mtxLocalCon);
-                        fMutexAcquired = FALSE;
-
-                        Log(("VBOXSF: vbsfDeleteConnection: deleted index 0x%x\n",
-                             idx));
+                        else
+                        {
+                            ExAcquireFastMutex(&pDeviceExtension->mtxLocalCon);
+                            fMutexAcquired = TRUE;
+
+                            pDeviceExtension->cLocalConnections[idx] = FALSE;
+
+                            /* Free saved name */
+                            if (pDeviceExtension->wszLocalConnectionName[idx])
+                            {
+                                vbsfFreeNonPagedMem(pDeviceExtension->wszLocalConnectionName[idx]);
+                                pDeviceExtension->wszLocalConnectionName[idx] = NULL;
+                            }
+
+                            ExReleaseFastMutex(&pDeviceExtension->mtxLocalCon);
+                            fMutexAcquired = FALSE;
+
+                            Log(("VBOXSF: vbsfDeleteConnection: deleted index 0x%x\n",
+                                 idx));
+                        }
                     }
                 }
-            }
-            else
-            {
-                Log(("VBOXSF: vbsfCreateConnection: bad format\n"));
-                Status = STATUS_BAD_NETWORK_NAME;
+                else
+                {
+                    Log(("VBOXSF: vbsfCreateConnection: bad format\n"));
+                    Status = STATUS_BAD_NETWORK_NAME;
+                }
             }
         }