Changeset 68995 in vbox for trunk/src/VBox/Runtime

Timestamp:

Oct 6, 2017 7:46:09 AM (7 years ago)

Author:

vboxsync

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

118264

Message:

Runtime/r0drv/darwin: Don't obfuscate R0 pointers, kernel addresses are logged to the kernel log only root has access to

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (8 diffs)
• r0drv/darwin/rtStrFormatKernelAddress-r0drv-darwin.cpp (copied) (copied from trunk/src/VBox/Runtime/r0drv/linux/rtStrFormatKernelAddress-r0drv-linux.c ) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2198 +2198 @@
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
-        generic/rtStrFormatKernelAddress-generic.cpp \
         generic/critsect-generic.cpp \
         generic/errvars-generic.cpp \
@@ -2227 +2226 @@
         generic/RTMpGetCoreCount-generic.cpp \
         generic/mppresent-generic.cpp \
+        generic/rtStrFormatKernelAddress-generic.cpp \
         r0drv/linux/alloc-r0drv-linux.c \
         r0drv/linux/assert-r0drv-linux.c \
@@ -2357 +2357 @@
         generic/mppresent-generic-online.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/rtStrFormatKernelAddress-generic.cpp \
         nt/RTErrConvertFromNtStatus.cpp \
         nt/RTNtPathExpand8dot3Path.cpp \
@@ -2413 +2414 @@
         r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp \
         r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp \
+        r0drv/darwin/rtStrFormatKernelAddress-r0drv-darwin.cpp \
         r0drv/darwin/semevent-r0drv-darwin.cpp \
         r0drv/darwin/semeventmulti-r0drv-darwin.cpp \
@@ -2521 +2523 @@
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
+        generic/rtStrFormatKernelAddress-generic.cpp \
         r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp \
         r0drv/generic/mpnotification-r0drv-generic.cpp \
@@ -2555 +2558 @@
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
+        generic/rtStrFormatKernelAddress-generic.cpp \
         r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp \
         r0drv/generic/mpnotification-r0drv-generic.cpp \
@@ -2585 +2589 @@
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
+        generic/rtStrFormatKernelAddress-generic.cpp \
         r0drv/memobj-r0drv.cpp \
         r0drv/mpnotification-r0drv.c \
@@ -2621 +2626 @@
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
+        generic/rtStrFormatKernelAddress-generic.cpp \
         r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp \
         r0drv/generic/mpnotification-r0drv-generic.cpp \

trunk/src/VBox/Runtime/r0drv/darwin/rtStrFormatKernelAddress-r0drv-darwin.cpp

@@ -30 +30 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP RTLOGGROUP_STRING
-#include "the-linux-kernel.h"
+#include "the-darwin-kernel.h"
 #include "internal/iprt.h"
 
@@ -42 +42 @@
                                             signed int cchPrecision, unsigned int fFlags)
 {
-#if !defined(DEBUG) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
-    RT_NOREF(cchWidth, cchPrecision);
-    /* use the Linux kernel function which is able to handle "%pK" */
-    static const char s_szFmt[] = "0x%pK";
-    const char *pszFmt = s_szFmt;
-    if (!(fFlags & RTSTR_F_SPECIAL))
-        pszFmt += 2;
-    return scnprintf(pszBuf, cbBuf, pszFmt, uPtr);
-#else
+    /*
+     * Kernel addresses don't need obfuscation in R0 because the kernel log is only accessible
+     * as root.
+     */
     Assert(cbBuf >= 64);
     return RTStrFormatNumber(pszBuf, uPtr, 16, cchWidth, cchPrecision, fFlags);
-#endif
 }