Changeset 23610 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Oct 7, 2009 9:22:10 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53284

Message:

IPRT,VMM,SUPDrv,VBGLR0: Added a parameter to RTR0MemObjLockUser/Kernel that indicates read/write intent so we can correctly lock readonly memory on Windows and OS/2. (Guest property strings, see #4238.)

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCMInternal.cpp (modified) (17 diffs)
• SysHlp.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

@@ -47 +47 @@
 /** Linux needs to use bounce buffers since RTR0MemObjLockUser has unwanted
  *  side effects. */
-# define USE_BOUNCH_BUFFERS
+# define USE_BOUNCE_BUFFERS
 #endif
 
@@ -64 +64 @@
         uint32_t    iParm;
         RTR0MEMOBJ  hObj;
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
         void       *pvSmallBuf;
 #endif
@@ -274 +274 @@
                 if (cb != 0)
                 {
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
                     void       *pvSmallBuf = NULL;
 #endif
@@ -280 +280 @@
                     RTR0MEMOBJ  hObj;
                     int         rc;
+                    uint32_t    fAccess =    pSrcParm->type == VMMDevHGCMParmType_LinAddr_In
+                                          || pSrcParm->type == VMMDevHGCMParmType_LinAddr_Locked_In
+                                        ? RTMEM_PROT_READ
+                                        : RTMEM_PROT_READ | RTMEM_PROT_WRITE;
 
                     AssertReturn(iLockBuf < RT_ELEMENTS(pParmInfo->aLockBufs), VERR_INVALID_PARAMETER);
@@ -286 +290 @@
                         AssertMsgReturn(cb <= VBGLR0_MAX_HGCM_KERNEL_PARM, ("%#x > %#x\n", cb, VBGLR0_MAX_HGCM_KERNEL_PARM),
                                         VERR_OUT_OF_RANGE);
-                        rc = RTR0MemObjLockKernel(&hObj, (void *)pSrcParm->u.Pointer.u.linearAddr, cb);
+                        rc = RTR0MemObjLockKernel(&hObj, (void *)pSrcParm->u.Pointer.u.linearAddr, cb, fAccess);
                         if (RT_FAILURE(rc))
                         {
@@ -306 +310 @@
                         }
 
-#ifndef USE_BOUNCH_BUFFERS
-                        rc = RTR0MemObjLockUser(&hObj, (RTR3PTR)pSrcParm->u.Pointer.u.linearAddr, cb, NIL_RTR0PROCESS);
+#ifndef USE_BOUNCE_BUFFERS
+                        rc = RTR0MemObjLockUser(&hObj, (RTR3PTR)pSrcParm->u.Pointer.u.linearAddr, cb, fAccess, NIL_RTR0PROCESS);
                         if (RT_FAILURE(rc))
                         {
@@ -317 +321 @@
                               iParm, pSrcParm->type, cb, pSrcParm->u.Pointer.u.linearAddr, hObj));
 
-#else  /* USE_BOUNCH_BUFFERS */
+#else  /* USE_BOUNCE_BUFFERS */
                         /*
                          * This is a bit massive, but we don't want to waste a
@@ -347 +351 @@
                                 }
                             }
-                            rc = RTR0MemObjLockKernel(&hObj, pvSmallBuf, cb);
+                            rc = RTR0MemObjLockKernel(&hObj, pvSmallBuf, cb, fAccess);
                             if (RT_FAILURE(rc))
                             {
@@ -380 +384 @@
                                   iParm, pSrcParm->type, cb, pSrcParm->u.Pointer.u.linearAddr, hObj));
                         }
-#endif /* USE_BOUNCH_BUFFERS */
+#endif /* USE_BOUNCE_BUFFERS */
                     }
 
                     pParmInfo->aLockBufs[iLockBuf].iParm      = iParm;
                     pParmInfo->aLockBufs[iLockBuf].hObj       = hObj;
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
                     pParmInfo->aLockBufs[iLockBuf].pvSmallBuf = pvSmallBuf;
 #endif
@@ -541 +545 @@
                 if (pSrcParm->u.Pointer.size != 0)
                 {
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
                     void      *pvSmallBuf = pParmInfo->aLockBufs[iLockBuf].pvSmallBuf;
 #endif
@@ -557 +561 @@
                         pDstParm->u.PageList.offset = offExtra;
                         pDstPgLst->flags            = vbglR0HGCMInternalLinAddrTypeToPageListFlags(pSrcParm->type);
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
                         if (fIsUser)
                             pDstPgLst->offFirstPage = (uintptr_t)pvSmallBuf & PAGE_OFFSET_MASK;
@@ -576 +580 @@
                         pDstParm->type = vbglR0HGCMInternalConvertLinAddrType(pSrcParm->type);
                         pDstParm->u.Pointer.size = pSrcParm->u.Pointer.size;
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
                         if (fIsUser)
                             pDstParm->u.Pointer.u.linearAddr = pvSmallBuf
@@ -749 +753 @@
     HGCMFunctionParameter       *pDstParm = VBOXGUEST_HGCM_CALL_PARMS(pCallInfo);
     uint32_t    cParms   = pCallInfo->cParms;
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
     uint32_t    iLockBuf = 0;
 #endif
@@ -777 +781 @@
             case VMMDevHGCMParmType_LinAddr_Locked_In:
             case VMMDevHGCMParmType_LinAddr_In:
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
                 if (    fIsUser
                     &&  iLockBuf < pParmInfo->cLockBufs
@@ -798 +802 @@
             case VMMDevHGCMParmType_LinAddr:
             {
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
                 if (fIsUser)
                 {
@@ -830 +834 @@
     }
 
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
     Assert(!fIsUser || pParmInfo->cLockBufs == iLockBuf);
 #endif
@@ -904 +908 @@
         {
             RTR0MemObjFree(ParmInfo.aLockBufs[ParmInfo.cLockBufs].hObj, false /*fFreeMappings*/);
-#ifdef USE_BOUNCH_BUFFERS
+#ifdef USE_BOUNCE_BUFFERS
             RTMemTmpFree(ParmInfo.aLockBufs[ParmInfo.cLockBufs].pvSmallBuf);
 #endif

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp

@@ -100 +100 @@
      *       know they aren't pagable.
      */
-    RTR0MEMOBJ MemObj = NIL_RTR0MEMOBJ;
+    RTR0MEMOBJ  MemObj = NIL_RTR0MEMOBJ;
+    uint32_t    fAccess = RTMEM_PROT_READ | (fWriteAccess ? RTMEM_PROT_WRITE : 0);
     if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
-        rc = RTR0MemObjLockUser(&MemObj, (RTR3PTR)pv, u32Size, NIL_RTR0PROCESS);
+        rc = RTR0MemObjLockUser(&MemObj, (RTR3PTR)pv, u32Size, fAccess, NIL_RTR0PROCESS);
     else
-        rc = RTR0MemObjLockKernel(&MemObj, pv, u32Size);
+        rc = RTR0MemObjLockKernel(&MemObj, pv, u32Size, fAccess);
     if (RT_SUCCESS(rc))
         *ppvCtx = MemObj;