Changeset 66424 in vbox

Timestamp:

Apr 5, 2017 9:27:55 AM (8 years ago)

Author:

vboxsync

Message:

Runtime/r0drv: rtStrFormatKernelAddress() for Linux

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/linux/Makefile (modified) (2 diffs)
• HostDrivers/Support/linux/files_vboxdrv (modified) (2 diffs)
• Runtime/r0drv/linux/rtStrFormatKernelAddress-r0drv-linux.c (copied) (copied from trunk/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp ) (2 diffs)

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -90 +90 @@
         r0drv/linux/mpnotification-r0drv-linux.o \
         r0drv/linux/process-r0drv-linux.o \
+        r0drv/linux/rtStrFormatKernelAddress-r0drv-linux.o \
         r0drv/linux/semevent-r0drv-linux.o \
         r0drv/linux/semeventmulti-r0drv-linux.o \
@@ -149 +150 @@
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.o \
         generic/RTTimerCreate-generic.o \
-        generic/rtStrFormatKernelAddress-generic.o \
         generic/errvars-generic.o \
         generic/mppresent-generic.o \

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -153 +153 @@
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/thread.h=>include/internal/thread.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/time.h=>include/internal/time.h \
-    ${PATH_ROOT}/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp=>generic/rtStrFormatKernelAddress-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp=>generic/RTAssertShouldPanic-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp=>generic/RTLogWriteStdErr-stub-generic.c \
@@ -175 +174 @@
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/power-r0drv.h=>r0drv/power-r0drv.h \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/powernotification-r0drv.c=>r0drv/powernotification-r0drv.c \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/rtStrFormatKernelAddress-r0drv-linux.c=>r0drv/linux/rtStrFormatKernelAddress-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c=>r0drv/linux/RTLogWriteDebugger-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c=>r0drv/linux/assert-r0drv-linux.c \

trunk/src/VBox/Runtime/r0drv/linux/rtStrFormatKernelAddress-r0drv-linux.c

@@ -30 +30 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP RTLOGGROUP_STRING
-#include <iprt/string.h>
+#include "the-linux-kernel.h"
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+# include <linux/capability.h>
+# include <linux/security.h>
+#endif
 #include "internal/iprt.h"
 
@@ -39 +43 @@
 
 
-
 DECLHIDDEN(size_t) rtStrFormatKernelAddress(char *pszBuf, size_t cbBuf, RTR0INTPTR uPtr, signed int cchWidth,
                                             signed int cchPrecision, unsigned int fFlags)
 {
-#ifndef DEBUG
-    RT_NOREF(uPtr, cchWidth, cchPrecision);
+#if !defined(DEBUG) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+    bool fRestrict = false;
+    if (kptr_restrict > 1)
+        fRestrict = true;
+    else if (kptr_restrict == 1)
+    {
+        const struct cred *cred = current_cred();
+        if (   !has_capability_noaudit(current, CAP_SYSLOG)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
+            || !uid_eq(cred->euid, cred->uid)
+            || !gid_eq(cred->egid, cred->gid)
+# endif
+            )
+            fRestrict = true;
+    }
+
+    if (fRestrict)
+    {
+        RT_NOREF(uPtr, cchWidth, cchPrecision);
 # if R0_ARCH_BITS == 64
-    static const char s_szObfuscated[] = "0xXXXXXXXXXXXXXXXX";
+        static const char s_szObfuscated[] = "0xXXXXXXXXXXXXXXXX";
 # else
-    static const char s_szObfuscated[] = "0xXXXXXXXX";
+        static const char s_szObfuscated[] = "0xXXXXXXXX";
 # endif
-    size_t      cbSrc  = sizeof(s_szObfuscated);
-    const char *pszSrc = s_szObfuscated;
-    if (!(fFlags & RTSTR_F_SPECIAL))
-    {
-        pszSrc += 2;
-        cbSrc  -= 2;
+        size_t      cbSrc  = sizeof(s_szObfuscated);
+        const char *pszSrc = s_szObfuscated;
+        if (!(fFlags & RTSTR_F_SPECIAL))
+        {
+            pszSrc += 2;
+            cbSrc  -= 2;
+        }
+        if (cbSrc <= cbBuf)
+        {
+            memcpy(pszBuf, pszSrc, cbSrc);
+            return cbSrc;
+        }
+        AssertFailed();
+        memcpy(pszBuf, pszSrc, cbBuf);
+        pszBuf[cbBuf - 1] = '\0';
+        return cbBuf - 1;
     }
-    if (cbSrc <= cbBuf)
-    {
-        memcpy(pszBuf, pszSrc, cbSrc);
-        return cbSrc;
-    }
-    AssertFailed();
-    memcpy(pszBuf, pszSrc, cbBuf);
-    pszBuf[cbBuf - 1] = '\0';
-    return cbBuf - 1;
-
-#else  /* DEBUG */
+#endif  /* DEBUG && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) */
     Assert(cbBuf >= 64);
     return RTStrFormatNumber(pszBuf, uPtr, 16, cchWidth, cchPrecision, fFlags);
-#endif /* DEBUG */
 }
-