Changeset 79710 in vbox

Timestamp:

Jul 12, 2019 5:10:42 AM (5 years ago)

Author:

vboxsync

Message:

os2/VBoxSF: FS32_OPENCREATE should fail on directories. Corrected attribute filtering calculations in FS32_FINDFIRST (caused COPY *.* to see directories, causing previous issue). FS32_FINDFROMNAME & FS32_FINDNEXT should not fail if FI_LVL_EAS_FROM_LIST[_64] are requested, we can handle it (FS32_FINDFIRST lets them thru) and WPS needs it for browsing shared folders.

Location:

trunk/src/VBox/Additions/os2/VBoxSF

Files:

• VBoxSFFile.cpp (modified) (1 diff)
• VBoxSFFind.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFile.cpp

@@ -307 +307 @@
                 {
                     rc = ERROR_OPEN_FAILED; //ERROR_FILE_EXISTS;
+                    break;
+                }
+                if (RTFS_IS_DIRECTORY(pReq->CreateParms.Info.Attr.fMode))
+                {
+                    LogFlow(("FS32_OPENCREATE: directory, closing and returning ERROR_ACCESS_DENIED!\n"));
+                    AssertCompile(RTASSERT_OFFSET_OF(VBOXSFCREATEREQ, CreateParms.Handle) > sizeof(VBOXSFCLOSEREQ)); /* no aliasing issues */
+                    VbglR0SfHostReqClose(pFolder->idHostRoot, (VBOXSFCLOSEREQ *)pReq, pReq->CreateParms.Handle);
+                    rc = ERROR_ACCESS_DENIED;
                     break;
                 }

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFind.cpp

@@ -625 +625 @@
                                 pDataBuf->pEntry        = NULL;
                                 pDataBuf->pFilter       = pFilter;
-                                pDataBuf->fMustHaveAttribs   = (uint8_t)((fAttribs >> 8) & (RTFS_DOS_MASK_OS2 >> RTFS_DOS_SHIFT));
-                                pDataBuf->fExcludedAttribs   = (uint8_t)(~fAttribs
-                                                                         & (  (RTFS_DOS_MASK_OS2 & ~(RTFS_DOS_ARCHIVED | RTFS_DOS_READONLY)
-                                                                            >> RTFS_DOS_SHIFT)));
+                                pDataBuf->fMustHaveAttribs   = (uint8_t)(  (fAttribs >> 8)
+                                                                         & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY | FILE_ARCHIVED));
+                                pDataBuf->fExcludedAttribs   = (uint8_t)(~fAttribs & (FILE_HIDDEN | FILE_SYSTEM | FILE_DIRECTORY));
                                 pDataBuf->fLongFilenames     = RT_BOOL(fAttribs & FF_ATTR_LONG_FILENAME);
+                                LogFlow(("FS32_FINDFIRST: fMustHaveAttribs=%#x fExcludedAttribs=%#x fLongFilenames=%d (fAttribs=%#x)\n",
+                                         pDataBuf->fMustHaveAttribs, pDataBuf->fExcludedAttribs, pDataBuf->fLongFilenames, fAttribs));
                                 pDataBuf->cMinLocalTimeDelta = vboxSfOs2GetLocalTimeDelta();
 
@@ -724 +725 @@
         case FI_LVL_STANDARD_EASIZE:
         case FI_LVL_STANDARD_EASIZE_64:
-            break;
-
         case FI_LVL_EAS_FROM_LIST:
         case FI_LVL_EAS_FROM_LIST_64:
-            Log(("FS32_FINDFIRST: FI_LVL_EAS_FROM_LIST[_64] -> ERROR_EAS_NOT_SUPPORTED\n"));
-            return ERROR_EAS_NOT_SUPPORTED;
+            break;
 
         default:
-            LogRel(("FS32_FINDFIRST: Unsupported info level %u!\n", uLevel));
+            LogRel(("FS32_FINDFROMNAME: Unsupported info level %u!\n", uLevel));
             return ERROR_INVALID_LEVEL;
     }
@@ -782 +780 @@
         case FI_LVL_STANDARD_EASIZE:
         case FI_LVL_STANDARD_EASIZE_64:
-            break;
-
         case FI_LVL_EAS_FROM_LIST:
         case FI_LVL_EAS_FROM_LIST_64:
-            Log(("FS32_FINDFIRST: FI_LVL_EAS_FROM_LIST[_64] -> ERROR_EAS_NOT_SUPPORTED\n"));
-            return ERROR_EAS_NOT_SUPPORTED;
+            break;
 
         default:
-            LogRel(("FS32_FINDFIRST: Unsupported info level %u!\n", uLevel));
+            LogRel(("FS32_FINDNEXT: Unsupported info level %u!\n", uLevel));
             return ERROR_INVALID_LEVEL;
     }