Changeset 52050 in vbox for trunk/include/iprt

Timestamp:

Jul 16, 2014 1:53:24 PM (11 years ago)

Author:

vboxsync

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

95047

Message:

RTMemSafer: Split generic from ring-3 specific page based implementation. Adjusted the ring-3 implementation to use RTMemPage when SUPR3PageAllocEx isn't available, and to separate the real data from the heap metadata to make finding the data just a little bit more difficult.

Location:

trunk/include/iprt

Files:

• err.h (modified) (1 diff)
• memsafer.h (modified) (5 diffs)

trunk/include/iprt/err.h

@@ -921 +921 @@
 /** An account is restricted in a certain way. */
 #define VINF_ACCOUNT_RESTRICTED             22405
+/** Not able satisfy all the requirements of the request. */
+#define VERR_UNABLE_TO_SATISFY_REQUIREMENTS (-22406)
+/** Not able satisfy all the requirements of the request. */
+#define VWRN_UNABLE_TO_SATISFY_REQUIREMENTS 22406
+/** The requested allocation is too big. */
+#define VERR_ALLOCATION_TOO_BIG             (-22405)
 /** @} */
 

trunk/include/iprt/memsafer.h

@@ -57 +57 @@
  */
 
-/** Default memory allocation, non-pageable memory backing, return error
- * if not possible to allocate such memor. */
-#define RTMEMSAFER_ALLOC_EX_FLAGS_DEFAULT                   (0)
-/** Allow pageable memory backing for cases where the content is not that sensitive
- * and allocating non-pageable memory failes. Use with care! */
-#define RTMEMSAFER_ALLOC_EX_ALLOW_PAGEABLE_BACKING RT_BIT_32(1)
+/** @name RTMEMSAFER_F_XXX
+ * @{ */
+/** Require the memory to not hit the page file.
+ * @remarks Makes not guarantees with regards to hibernation /
+ *          suspend-to-disk. */
+#define RTMEMSAFER_F_REQUIRE_NOT_PAGABLE    RT_BIT_32(0)
+/** Mask of valid bits.  */
+#define RTMEMSAFER_F_VALID_MASK             UINT32_C(0x00000001)
+/** @} */
 
 /**
@@ -92 +95 @@
 RTDECL(int) RTMemSaferUnscramble(void *pv, size_t cb);
 
-
 /**
  * Allocates memory for sensitive data.
@@ -102 +104 @@
  * @param   ppvNew      Where to return the pointer to the memory.
  * @param   cb          Number of bytes to allocate.
- * @param   fFlags      Flags for controlling the allocation. See RTMEMSAFER_ALLOC_EX_FLAGS_* defines.
+ * @param   fFlags      Flags for controlling the allocation, see
+ *                      RTMEMSAFER_F_XXX.
  * @param   pszTag      Allocation tag used for statistics and such.
  */
@@ -116 +119 @@
  * @param   a_ppvNew    Where to return the pointer to the memory.
  * @param   a_cb        Number of bytes to allocate.
- * @param   a_fFlags    Flags for controlling the allocation. See RTMEMSAFER_ALLOC_EX_FLAGS_* defines.
+ * @param   a_fFlags    Flags for controlling the allocation, see
+ *                      RTMEMSAFER_F_XXX.
  */
 #define RTMemSaferAllocZEx(a_ppvNew, a_cb, a_fFlags) RTMemSaferAllocZExTag(a_ppvNew, a_cb, a_fFlags, RTMEM_TAG)
@@ -159 +163 @@
  * @param   cbNew       The size of the new allocation.
  * @param   ppvNew      Where to return the pointer to the new memory.
- * @param   fFlags      Flags for controlling the allocation. See RTMEMSAFER_ALLOC_EX_FLAGS_* defines,
- *                      this takes only effect when allocating completely new memory, for extending or
- *                      shrinking existing allocations the flags of the allocation take precedence.
+ * @param   a_fFlags    Flags for controlling the allocation, see
+ *                      RTMEMSAFER_F_XXX.  It is not permitted to drop saftely
+ *                      requirments after the initial allocation.
  * @param   pszTag      Allocation tag used for statistics and such.
  */