Changeset 44173 in vbox for trunk/src/VBox/HostDrivers
- Timestamp:
- Dec 19, 2012 6:12:31 PM (12 years ago)
- svn:sync-xref-src-repo-rev:
- 82883
- Location:
- trunk/src/VBox/HostDrivers/Support
- Files:
-
- 17 edited
-
SUPDrv.c (modified) (12 diffs)
-
SUPDrvInternal.h (modified) (2 diffs)
-
SUPLib.cpp (modified) (7 diffs)
-
SUPLibInternal.h (modified) (2 diffs)
-
SUPR3HardenedMain.cpp (modified) (1 diff)
-
darwin/SUPDrv-darwin.cpp (modified) (14 diffs)
-
darwin/SUPLib-darwin.cpp (modified) (7 diffs)
-
freebsd/SUPDrv-freebsd.c (modified) (1 diff)
-
freebsd/SUPLib-freebsd.cpp (modified) (4 diffs)
-
linux/SUPDrv-linux.c (modified) (1 diff)
-
linux/SUPLib-linux.cpp (modified) (5 diffs)
-
os2/SUPDrv-os2.cpp (modified) (1 diff)
-
os2/SUPLib-os2.cpp (modified) (2 diffs)
-
solaris/SUPDrv-solaris.c (modified) (37 diffs)
-
solaris/SUPLib-solaris.cpp (modified) (3 diffs)
-
win/SUPDrv-win.cpp (modified) (1 diff)
-
win/SUPLib-win.cpp (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/HostDrivers/Support/SUPDrv.c
r43394 r44173 657 657 * 658 658 * @returns IPRT status code. 659 * @param pDevExt Device extension. 660 * @param fUser Flag indicating whether this is a user or kernel session. 661 * @param ppSession Where to store the pointer to the session data. 662 */ 663 int VBOXCALL supdrvCreateSession(PSUPDRVDEVEXT pDevExt, bool fUser, PSUPDRVSESSION *ppSession) 659 * @param pDevExt Device extension. 660 * @param fUser Flag indicating whether this is a user or kernel 661 * session. 662 * @param fUnrestricted Unrestricted access (system) or restricted access 663 * (user)? 664 * @param ppSession Where to store the pointer to the session data. 665 */ 666 int VBOXCALL supdrvCreateSession(PSUPDRVDEVEXT pDevExt, bool fUser, bool fUnrestricted, PSUPDRVSESSION *ppSession) 664 667 { 665 668 /* … … 682 685 pSession->pDevExt = pDevExt; 683 686 pSession->u32Cookie = BIRD_INV; 687 pSession->fUnrestricted = fUnrestricted; 684 688 /*pSession->pLdrUsage = NULL; 685 689 pSession->pVM = NULL; … … 1081 1085 * @param pReqHdr The request header. 1082 1086 */ 1083 static int supdrvIOCtlInner (uintptr_t uIOCtl, PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPREQHDR pReqHdr)1087 static int supdrvIOCtlInnerUnrestricted(uintptr_t uIOCtl, PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPREQHDR pReqHdr) 1084 1088 { 1085 1089 /* … … 1758 1762 PSUPVTCAPS pReq = (PSUPVTCAPS)pReqHdr; 1759 1763 REQ_CHECK_SIZES(SUP_IOCTL_VT_CAPS); 1760 REQ_CHECK_EXPR(SUP_IOCTL_VT_CAPS, pReq->Hdr.cbIn <= SUP_IOCTL_VT_CAPS_SIZE_IN);1761 1764 1762 1765 /* execute */ … … 1846 1849 1847 1850 /** 1848 * I/O Control worker.1851 * I/O Control inner worker for the restricted operations. 1849 1852 * 1850 1853 * @returns IPRT status code. … … 1856 1859 * @param pReqHdr The request header. 1857 1860 */ 1861 static int supdrvIOCtlInnerRestricted(uintptr_t uIOCtl, PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPREQHDR pReqHdr) 1862 { 1863 /* 1864 * The switch. 1865 */ 1866 switch (SUP_CTL_CODE_NO_SIZE(uIOCtl)) 1867 { 1868 case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_COOKIE): 1869 { 1870 PSUPCOOKIE pReq = (PSUPCOOKIE)pReqHdr; 1871 REQ_CHECK_SIZES(SUP_IOCTL_COOKIE); 1872 if (strncmp(pReq->u.In.szMagic, SUPCOOKIE_MAGIC, sizeof(pReq->u.In.szMagic))) 1873 { 1874 OSDBGPRINT(("SUP_IOCTL_COOKIE: invalid magic %.16s\n", pReq->u.In.szMagic)); 1875 pReq->Hdr.rc = VERR_INVALID_MAGIC; 1876 return 0; 1877 } 1878 1879 /* 1880 * Match the version. 1881 * The current logic is very simple, match the major interface version. 1882 */ 1883 if ( pReq->u.In.u32MinVersion > SUPDRV_IOC_VERSION 1884 || (pReq->u.In.u32MinVersion & 0xffff0000) != (SUPDRV_IOC_VERSION & 0xffff0000)) 1885 { 1886 OSDBGPRINT(("SUP_IOCTL_COOKIE: Version mismatch. Requested: %#x Min: %#x Current: %#x\n", 1887 pReq->u.In.u32ReqVersion, pReq->u.In.u32MinVersion, SUPDRV_IOC_VERSION)); 1888 pReq->u.Out.u32Cookie = 0xffffffff; 1889 pReq->u.Out.u32SessionCookie = 0xffffffff; 1890 pReq->u.Out.u32SessionVersion = 0xffffffff; 1891 pReq->u.Out.u32DriverVersion = SUPDRV_IOC_VERSION; 1892 pReq->u.Out.pSession = NULL; 1893 pReq->u.Out.cFunctions = 0; 1894 pReq->Hdr.rc = VERR_VERSION_MISMATCH; 1895 return 0; 1896 } 1897 1898 /* 1899 * Fill in return data and be gone. 1900 * N.B. The first one to change SUPDRV_IOC_VERSION shall makes sure that 1901 * u32SessionVersion <= u32ReqVersion! 1902 */ 1903 /** @todo Somehow validate the client and negotiate a secure cookie... */ 1904 pReq->u.Out.u32Cookie = pDevExt->u32Cookie; 1905 pReq->u.Out.u32SessionCookie = pSession->u32Cookie; 1906 pReq->u.Out.u32SessionVersion = SUPDRV_IOC_VERSION; 1907 pReq->u.Out.u32DriverVersion = SUPDRV_IOC_VERSION; 1908 pReq->u.Out.pSession = pSession; 1909 pReq->u.Out.cFunctions = 0; 1910 pReq->Hdr.rc = VINF_SUCCESS; 1911 return 0; 1912 } 1913 1914 case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_VT_CAPS): 1915 { 1916 /* validate */ 1917 PSUPVTCAPS pReq = (PSUPVTCAPS)pReqHdr; 1918 REQ_CHECK_SIZES(SUP_IOCTL_VT_CAPS); 1919 1920 /* execute */ 1921 pReq->Hdr.rc = SUPR0QueryVTCaps(pSession, &pReq->u.Out.Caps); 1922 if (RT_FAILURE(pReq->Hdr.rc)) 1923 pReq->Hdr.cbOut = sizeof(pReq->Hdr); 1924 return 0; 1925 } 1926 1927 default: 1928 Log(("Unknown IOCTL %#lx\n", (long)uIOCtl)); 1929 break; 1930 } 1931 return VERR_GENERAL_FAILURE; 1932 } 1933 1934 1935 /** 1936 * I/O Control worker. 1937 * 1938 * @returns IPRT status code. 1939 * @retval VERR_INVALID_PARAMETER if the request is invalid. 1940 * 1941 * @param uIOCtl Function number. 1942 * @param pDevExt Device extention. 1943 * @param pSession Session data. 1944 * @param pReqHdr The request header. 1945 */ 1858 1946 int VBOXCALL supdrvIOCtl(uintptr_t uIOCtl, PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPREQHDR pReqHdr) 1859 1947 { … … 1898 1986 1899 1987 /* 1900 * Hand it to an inner function to avoid lots of unnecessary return tracepoints 1901 */ 1902 rc = supdrvIOCtlInner(uIOCtl, pDevExt, pSession, pReqHdr); 1988 * Hand it to an inner function to avoid lots of unnecessary return tracepoints. 1989 */ 1990 if (pSession->fUnrestricted) 1991 rc = supdrvIOCtlInnerUnrestricted(uIOCtl, pDevExt, pSession, pReqHdr); 1992 else 1993 rc = supdrvIOCtlInnerRestricted(uIOCtl, pDevExt, pSession, pReqHdr); 1903 1994 1904 1995 VBOXDRV_IOCTL_RETURN(pSession, uIOCtl, pReqHdr, pReqHdr->rc, rc); … … 2002 2093 pReq->u.Out.uDriverRevision = VBOX_SVN_REV; 2003 2094 2004 pReq->Hdr.rc = supdrvCreateSession(pDevExt, false /* fUser */, &pSession);2095 pReq->Hdr.rc = supdrvCreateSession(pDevExt, false /* fUser */, true /*fUnrestricted*/, &pSession); 2005 2096 if (RT_FAILURE(pReq->Hdr.rc)) 2006 2097 { … … 3224 3315 3225 3316 3226 /** @todo document me */ 3317 /** 3318 * Quries the AMD-V and VT-x capabilities of the calling CPU. 3319 * 3320 * @returns VBox status code. 3321 * @retval VERR_VMX_NO_VMX 3322 * @retval VERR_VMX_MSR_LOCKED_OR_DISABLED 3323 * @retval VERR_SVM_NO_SVM 3324 * @retval VERR_SVM_DISABLED 3325 * @retval VERR_UNSUPPORTED_CPU if not identifiable as an AMD, Intel or VIA 3326 * (centaur) CPU. 3327 * 3328 * @param pSession The session handle. 3329 * @param pfCaps Where to store the capabilities. 3330 */ 3227 3331 SUPR0DECL(int) SUPR0QueryVTCaps(PSUPDRVSESSION pSession, uint32_t *pfCaps) 3228 3332 { … … 3237 3341 if (ASMHasCpuId()) 3238 3342 { 3239 uint32_t u32FeaturesECX; 3240 uint32_t u32Dummy; 3241 uint32_t u32FeaturesEDX; 3242 uint32_t u32VendorEBX, u32VendorECX, u32VendorEDX, u32AMDFeatureEDX, u32AMDFeatureECX; 3243 uint64_t val; 3244 3245 ASMCpuId(0, &u32Dummy, &u32VendorEBX, &u32VendorECX, &u32VendorEDX); 3246 ASMCpuId(1, &u32Dummy, &u32Dummy, &u32FeaturesECX, &u32FeaturesEDX); 3247 /* Query AMD features. */ 3248 ASMCpuId(0x80000001, &u32Dummy, &u32Dummy, &u32AMDFeatureECX, &u32AMDFeatureEDX); 3249 3250 if ( u32VendorEBX == X86_CPUID_VENDOR_INTEL_EBX 3251 && u32VendorECX == X86_CPUID_VENDOR_INTEL_ECX 3252 && u32VendorEDX == X86_CPUID_VENDOR_INTEL_EDX 3343 uint32_t fFeaturesECX, fFeaturesEDX, uDummy; 3344 uint32_t uMaxId, uVendorEBX, uVendorECX, uVendorEDX; 3345 uint64_t u64Value; 3346 3347 ASMCpuId(0, &uMaxId, &uVendorEBX, &uVendorECX, &uVendorEDX); 3348 ASMCpuId(1, &uDummy, &uDummy, &fFeaturesECX, &fFeaturesEDX); 3349 3350 if ( ASMIsValidStdRange(uMaxId) 3351 && ( ASMIsIntelCpuEx( uVendorEBX, uVendorECX, uVendorEDX) 3352 || ASMIsViaCentaurCpuEx(uVendorEBX, uVendorECX, uVendorEDX) ) 3253 3353 ) 3254 3354 { 3255 if ( ( u32FeaturesECX & X86_CPUID_FEATURE_ECX_VMX)3256 && ( u32FeaturesEDX & X86_CPUID_FEATURE_EDX_MSR)3257 && ( u32FeaturesEDX & X86_CPUID_FEATURE_EDX_FXSR)3355 if ( (fFeaturesECX & X86_CPUID_FEATURE_ECX_VMX) 3356 && (fFeaturesEDX & X86_CPUID_FEATURE_EDX_MSR) 3357 && (fFeaturesEDX & X86_CPUID_FEATURE_EDX_FXSR) 3258 3358 ) 3259 3359 { 3260 val = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);3261 3360 /* 3262 3361 * Both the LOCK and VMXON bit must be set; otherwise VMXON will generate a #GP. 3263 3362 * Once the lock bit is set, this MSR can no longer be modified. 3264 3363 */ 3265 if ( (val & (MSR_IA32_FEATURE_CONTROL_VMXON|MSR_IA32_FEATURE_CONTROL_LOCK)) 3266 == (MSR_IA32_FEATURE_CONTROL_VMXON|MSR_IA32_FEATURE_CONTROL_LOCK) /* enabled and locked */ 3267 || !(val & MSR_IA32_FEATURE_CONTROL_LOCK) /* not enabled, but not locked either */ 3364 u64Value = ASMRdMsr(MSR_IA32_FEATURE_CONTROL); 3365 if ( (u64Value & (MSR_IA32_FEATURE_CONTROL_VMXON | MSR_IA32_FEATURE_CONTROL_LOCK)) 3366 == (MSR_IA32_FEATURE_CONTROL_VMXON | MSR_IA32_FEATURE_CONTROL_LOCK) /* enabled and locked */ 3367 || !(u64Value & MSR_IA32_FEATURE_CONTROL_LOCK) /* not enabled, but not locked either */ 3268 3368 ) 3269 3369 { … … 3286 3386 } 3287 3387 3288 if ( u32VendorEBX == X86_CPUID_VENDOR_AMD_EBX 3289 && u32VendorECX == X86_CPUID_VENDOR_AMD_ECX 3290 && u32VendorEDX == X86_CPUID_VENDOR_AMD_EDX 3291 ) 3292 { 3293 if ( (u32AMDFeatureECX & X86_CPUID_AMD_FEATURE_ECX_SVM) 3294 && (u32FeaturesEDX & X86_CPUID_FEATURE_EDX_MSR) 3295 && (u32FeaturesEDX & X86_CPUID_FEATURE_EDX_FXSR) 3388 if ( ASMIsAmdCpuEx(uVendorEBX, uVendorECX, uVendorEDX) 3389 && ASMIsValidStdRange(uMaxId)) 3390 { 3391 uint32_t fExtFeaturesEcx, uExtMaxId; 3392 ASMCpuId(0x80000000, &uExtMaxId, &uDummy, &uDummy, &uDummy); 3393 ASMCpuId(0x80000001, &uDummy, &uDummy, &fExtFeaturesEcx, &uDummy); 3394 if ( ASMIsValidExtRange(uExtMaxId) 3395 && uExtMaxId >= 0x8000000a 3396 && (fExtFeaturesEcx & X86_CPUID_AMD_FEATURE_ECX_SVM) 3397 && (fFeaturesEDX & X86_CPUID_FEATURE_EDX_MSR) 3398 && (fFeaturesEDX & X86_CPUID_FEATURE_EDX_FXSR) 3296 3399 ) 3297 3400 { 3298 3401 /* Check if SVM is disabled */ 3299 val= ASMRdMsr(MSR_K8_VM_CR);3300 if (!( val& MSR_K8_VM_CR_SVM_DISABLE))3402 u64Value = ASMRdMsr(MSR_K8_VM_CR); 3403 if (!(u64Value & MSR_K8_VM_CR_SVM_DISABLE)) 3301 3404 { 3302 3405 *pfCaps |= SUPVTCAPS_AMD_V; 3303 3406 3304 /* Query AMD features. */3305 ASMCpuId(0x8000000A, &u32Dummy, &u32Dummy, &u32Dummy, &u32FeaturesEDX);3306 3307 if ( u32FeaturesEDX& AMD_CPUID_SVM_FEATURE_EDX_NESTED_PAGING)3407 /* Query AMD-V features. */ 3408 uint32_t fSvmFeatures; 3409 ASMCpuId(0x8000000a, &uDummy, &uDummy, &uDummy, &fSvmFeatures); 3410 if (fSvmFeatures & AMD_CPUID_SVM_FEATURE_EDX_NESTED_PAGING) 3308 3411 *pfCaps |= SUPVTCAPS_NESTED_PAGING; 3309 3412 … … 5477 5580 /* Check for "AuthenticAMD" */ 5478 5581 ASMCpuId(0, &uEAX, &uEBX, &uECX, &uEDX); 5479 if ( uEAX >= 1 5480 && uEBX == X86_CPUID_VENDOR_AMD_EBX 5481 && uECX == X86_CPUID_VENDOR_AMD_ECX 5482 && uEDX == X86_CPUID_VENDOR_AMD_EDX) 5582 if ( uEAX >= 1 5583 && ASMIsAmdCpuEx(uEBX, uECX, uEDX)) 5483 5584 { 5484 5585 /* Check for APM support and that TscInvariant is cleared. */ -
trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h
r43379 r44173 407 407 /** Session Cookie. */ 408 408 uint32_t u32Cookie; 409 /** Set if is an unrestricted session, clear if restricted. */ 410 bool fUnrestricted; 409 411 410 412 /** The VM associated with the session. */ … … 675 677 int VBOXCALL supdrvInitDevExt(PSUPDRVDEVEXT pDevExt, size_t cbSession); 676 678 void VBOXCALL supdrvDeleteDevExt(PSUPDRVDEVEXT pDevExt); 677 int VBOXCALL supdrvCreateSession(PSUPDRVDEVEXT pDevExt, bool fUser, PSUPDRVSESSION *ppSession);679 int VBOXCALL supdrvCreateSession(PSUPDRVDEVEXT pDevExt, bool fUser, bool fUnrestricted, PSUPDRVSESSION *ppSession); 678 680 void VBOXCALL supdrvCloseSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession); 679 681 void VBOXCALL supdrvCleanupSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession); -
trunk/src/VBox/HostDrivers/Support/SUPLib.cpp
r43400 r44173 5 5 6 6 /* 7 * Copyright (C) 2006-201 0Oracle Corporation7 * Copyright (C) 2006-2012 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 98 98 SUPLIBDATA g_supLibData = 99 99 { 100 SUP_HDEVICE_NIL 100 /*.hDevice = */ SUP_HDEVICE_NIL, 101 /*.fUnrestricted = */ true 101 102 #if defined(RT_OS_DARWIN) 102 , NULL103 ,/* .uConnection = */ NULL 103 104 #elif defined(RT_OS_LINUX) 104 , false105 ,/* .fSysMadviseWorks = */ false 105 106 #endif 106 107 }; … … 210 211 211 212 212 SUPR3DECL(int) SUPR3Init (PSUPDRVSESSION *ppSession)213 SUPR3DECL(int) SUPR3InitEx(bool fUnrestricted, PSUPDRVSESSION *ppSession) 213 214 { 214 215 /* … … 229 230 *ppSession = g_pSession; 230 231 if (g_cInits++ > 0) 232 { 233 if (fUnrestricted && !g_supLibData.fUnrestricted) 234 { 235 g_cInits--; 236 if (ppSession) 237 *ppSession = NULL; 238 return VERR_VM_DRIVER_NOT_ACCESSIBLE; /** @todo different status code? */ 239 } 231 240 return VINF_SUCCESS; 241 } 232 242 233 243 /* … … 252 262 * Open the support driver. 253 263 */ 254 int rc = suplibOsInit(&g_supLibData, g_fPreInited );264 int rc = suplibOsInit(&g_supLibData, g_fPreInited, fUnrestricted); 255 265 if (RT_SUCCESS(rc)) 256 266 { … … 282 292 * Query the functions. 283 293 */ 284 PSUPQUERYFUNCS pFuncsReq = (PSUPQUERYFUNCS)RTMemAllocZ(SUP_IOCTL_QUERY_FUNCS_SIZE(CookieReq.u.Out.cFunctions));285 if ( pFuncsReq)294 PSUPQUERYFUNCS pFuncsReq = NULL; 295 if (g_supLibData.fUnrestricted) 286 296 { 287 pFuncsReq->Hdr.u32Cookie = CookieReq.u.Out.u32Cookie; 288 pFuncsReq->Hdr.u32SessionCookie = CookieReq.u.Out.u32SessionCookie; 289 pFuncsReq->Hdr.cbIn = SUP_IOCTL_QUERY_FUNCS_SIZE_IN; 290 pFuncsReq->Hdr.cbOut = SUP_IOCTL_QUERY_FUNCS_SIZE_OUT(CookieReq.u.Out.cFunctions); 291 pFuncsReq->Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT; 292 pFuncsReq->Hdr.rc = VERR_INTERNAL_ERROR; 293 rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_QUERY_FUNCS(CookieReq.u.Out.cFunctions), pFuncsReq, SUP_IOCTL_QUERY_FUNCS_SIZE(CookieReq.u.Out.cFunctions)); 294 if (RT_SUCCESS(rc)) 295 rc = pFuncsReq->Hdr.rc; 296 if (RT_SUCCESS(rc)) 297 pFuncsReq = (PSUPQUERYFUNCS)RTMemAllocZ(SUP_IOCTL_QUERY_FUNCS_SIZE(CookieReq.u.Out.cFunctions)); 298 if (pFuncsReq) 297 299 { 298 /* 299 * Map the GIP into userspace. 300 */ 301 Assert(!g_pSUPGlobalInfoPage); 302 SUPGIPMAP GipMapReq; 303 GipMapReq.Hdr.u32Cookie = CookieReq.u.Out.u32Cookie; 304 GipMapReq.Hdr.u32SessionCookie = CookieReq.u.Out.u32SessionCookie; 305 GipMapReq.Hdr.cbIn = SUP_IOCTL_GIP_MAP_SIZE_IN; 306 GipMapReq.Hdr.cbOut = SUP_IOCTL_GIP_MAP_SIZE_OUT; 307 GipMapReq.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT; 308 GipMapReq.Hdr.rc = VERR_INTERNAL_ERROR; 309 GipMapReq.u.Out.HCPhysGip = NIL_RTHCPHYS; 310 GipMapReq.u.Out.pGipR0 = NIL_RTR0PTR; 311 GipMapReq.u.Out.pGipR3 = NULL; 312 rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_GIP_MAP, &GipMapReq, SUP_IOCTL_GIP_MAP_SIZE); 300 pFuncsReq->Hdr.u32Cookie = CookieReq.u.Out.u32Cookie; 301 pFuncsReq->Hdr.u32SessionCookie = CookieReq.u.Out.u32SessionCookie; 302 pFuncsReq->Hdr.cbIn = SUP_IOCTL_QUERY_FUNCS_SIZE_IN; 303 pFuncsReq->Hdr.cbOut = SUP_IOCTL_QUERY_FUNCS_SIZE_OUT(CookieReq.u.Out.cFunctions); 304 pFuncsReq->Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT; 305 pFuncsReq->Hdr.rc = VERR_INTERNAL_ERROR; 306 rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_QUERY_FUNCS(CookieReq.u.Out.cFunctions), pFuncsReq, 307 SUP_IOCTL_QUERY_FUNCS_SIZE(CookieReq.u.Out.cFunctions)); 313 308 if (RT_SUCCESS(rc)) 314 rc = GipMapReq.Hdr.rc;309 rc = pFuncsReq->Hdr.rc; 315 310 if (RT_SUCCESS(rc)) 316 311 { 317 AssertRelease(GipMapReq.u.Out.pGipR3->u32Magic == SUPGLOBALINFOPAGE_MAGIC);318 AssertRelease(GipMapReq.u.Out.pGipR3->u32Version >= SUPGLOBALINFOPAGE_VERSION);319 320 312 /* 321 * Set the globals and return success.313 * Map the GIP into userspace. 322 314 */ 323 ASMAtomicXchgSize(&g_HCPhysSUPGlobalInfoPage, GipMapReq.u.Out.HCPhysGip); 324 ASMAtomicCmpXchgPtr((void * volatile *)&g_pSUPGlobalInfoPage, GipMapReq.u.Out.pGipR3, NULL); 325 ASMAtomicCmpXchgPtr((void * volatile *)&g_pSUPGlobalInfoPageR0, (void *)GipMapReq.u.Out.pGipR0, NULL); 326 327 g_u32Cookie = CookieReq.u.Out.u32Cookie; 328 g_u32SessionCookie = CookieReq.u.Out.u32SessionCookie; 329 g_pSession = CookieReq.u.Out.pSession; 330 g_pFunctions = pFuncsReq; 331 if (ppSession) 332 *ppSession = CookieReq.u.Out.pSession; 333 return VINF_SUCCESS; 315 Assert(!g_pSUPGlobalInfoPage); 316 SUPGIPMAP GipMapReq; 317 GipMapReq.Hdr.u32Cookie = CookieReq.u.Out.u32Cookie; 318 GipMapReq.Hdr.u32SessionCookie = CookieReq.u.Out.u32SessionCookie; 319 GipMapReq.Hdr.cbIn = SUP_IOCTL_GIP_MAP_SIZE_IN; 320 GipMapReq.Hdr.cbOut = SUP_IOCTL_GIP_MAP_SIZE_OUT; 321 GipMapReq.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT; 322 GipMapReq.Hdr.rc = VERR_INTERNAL_ERROR; 323 GipMapReq.u.Out.HCPhysGip = NIL_RTHCPHYS; 324 GipMapReq.u.Out.pGipR0 = NIL_RTR0PTR; 325 GipMapReq.u.Out.pGipR3 = NULL; 326 rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_GIP_MAP, &GipMapReq, SUP_IOCTL_GIP_MAP_SIZE); 327 if (RT_SUCCESS(rc)) 328 rc = GipMapReq.Hdr.rc; 329 if (RT_SUCCESS(rc)) 330 { 331 /* 332 * Set the GIP globals. 333 */ 334 AssertRelease(GipMapReq.u.Out.pGipR3->u32Magic == SUPGLOBALINFOPAGE_MAGIC); 335 AssertRelease(GipMapReq.u.Out.pGipR3->u32Version >= SUPGLOBALINFOPAGE_VERSION); 336 337 ASMAtomicXchgSize(&g_HCPhysSUPGlobalInfoPage, GipMapReq.u.Out.HCPhysGip); 338 ASMAtomicCmpXchgPtr((void * volatile *)&g_pSUPGlobalInfoPage, GipMapReq.u.Out.pGipR3, NULL); 339 ASMAtomicCmpXchgPtr((void * volatile *)&g_pSUPGlobalInfoPageR0, (void *)GipMapReq.u.Out.pGipR0, NULL); 340 } 334 341 } 335 342 } 336 337 /* bailout */ 338 RTMemFree(pFuncsReq); 343 else 344 rc = VERR_NO_MEMORY; 339 345 } 340 else 341 rc = VERR_NO_MEMORY; 346 347 if (RT_SUCCESS(rc)) 348 { 349 /* 350 * Set the globals and return success. 351 */ 352 g_u32Cookie = CookieReq.u.Out.u32Cookie; 353 g_u32SessionCookie = CookieReq.u.Out.u32SessionCookie; 354 g_pSession = CookieReq.u.Out.pSession; 355 g_pFunctions = pFuncsReq; 356 if (ppSession) 357 *ppSession = CookieReq.u.Out.pSession; 358 return VINF_SUCCESS; 359 } 360 361 /* bailout */ 362 RTMemFree(pFuncsReq); 342 363 } 343 364 else … … 371 392 372 393 return rc; 394 } 395 396 397 SUPR3DECL(int) SUPR3Init(PSUPDRVSESSION *ppSession) 398 { 399 return SUPR3InitEx(true, ppSession); 373 400 } 374 401 -
trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h
r38636 r44173 190 190 int hDevice; 191 191 #endif 192 /** Indicates whether we have unrestricted (true) or restricted access to the 193 * support device. */ 194 bool fUnrestricted; 192 195 #if defined(RT_OS_DARWIN) 193 196 /** The connection to the VBoxSupDrv service. */ … … 264 267 int suplibOsInstall(void); 265 268 int suplibOsUninstall(void); 266 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited );269 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted); 267 270 int suplibOsTerm(PSUPLIBDATA pThis); 268 271 int suplibOsIOCtl(PSUPLIBDATA pThis, uintptr_t uFunction, void *pvReq, size_t cbReq); -
trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
r39538 r44173 578 578 static void supR3HardenedMainOpenDevice(void) 579 579 { 580 int rc = suplibOsInit(&g_SupPreInitData.Data, false );580 int rc = suplibOsInit(&g_SupPreInitData.Data, false /*fPreInit*/, true /*fUnrestricted*/); 581 581 if (RT_SUCCESS(rc)) 582 582 return; -
trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
r43394 r44173 5 5 6 6 /* 7 * Copyright (C) 2006-20 07Oracle Corporation7 * Copyright (C) 2006-2012 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 80 80 *******************************************************************************/ 81 81 82 /** The module name. */ 83 #define DEVICE_NAME "vboxdrv" 82 /** The system device node name. */ 83 #define DEVICE_NAME_SYS "vboxdrv" 84 /** The user device node name. */ 85 #define DEVICE_NAME_USR "vboxdrvu" 84 86 85 87 … … 203 205 /** Major device number. */ 204 206 static int g_iMajorDeviceNo = -1; 205 /** Registered devfs device handle. */ 206 static void *g_hDevFsDevice = NULL; 207 /** Registered devfs device handle for the system device. */ 208 static void *g_hDevFsDeviceSys = NULL; 209 /** Registered devfs device handle for the user device. */ 210 static void *g_hDevFsDeviceUsr = NULL; 207 211 208 212 /** Spinlock protecting g_apSessionHashTab. */ … … 261 265 { 262 266 #ifdef VBOX_WITH_HARDENING 263 g_hDevFsDevice = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,264 UID_ROOT, GID_WHEEL, 0600, DEVICE_NAME);267 g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR, 268 UID_ROOT, GID_WHEEL, 0600, DEVICE_NAME_SYS); 265 269 #else 266 g_hDevFsDevice = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,267 UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME);270 g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR, 271 UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_SYS); 268 272 #endif 269 if (g_hDevFsDevice )273 if (g_hDevFsDeviceSys) 270 274 { 271 LogRel(("VBoxDrv: version " VBOX_VERSION_STRING " r%d; IOCtl version %#x; IDC version %#x; dev major=%d\n", 272 VBOX_SVN_REV, SUPDRV_IOC_VERSION, SUPDRV_IDC_VERSION, g_iMajorDeviceNo)); 273 274 /* Register a sleep/wakeup notification callback */ 275 g_pSleepNotifier = registerPrioritySleepWakeInterest(&VBoxDrvDarwinSleepHandler, &g_DevExt, NULL); 276 if (g_pSleepNotifier == NULL) 277 LogRel(("VBoxDrv: register for sleep/wakeup events failed\n")); 278 279 /* Find kernel symbols that are kind of optional. */ 280 vboxdrvDarwinResolveSymbols(); 281 return KMOD_RETURN_SUCCESS; 275 g_hDevFsDeviceUsr = devfs_make_node(makedev(g_iMajorDeviceNo, 1), DEVFS_CHAR, 276 UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_USR); 277 if (g_hDevFsDeviceUsr) 278 { 279 LogRel(("VBoxDrv: version " VBOX_VERSION_STRING " r%d; IOCtl version %#x; IDC version %#x; dev major=%d\n", 280 VBOX_SVN_REV, SUPDRV_IOC_VERSION, SUPDRV_IDC_VERSION, g_iMajorDeviceNo)); 281 282 /* Register a sleep/wakeup notification callback */ 283 g_pSleepNotifier = registerPrioritySleepWakeInterest(&VBoxDrvDarwinSleepHandler, &g_DevExt, NULL); 284 if (g_pSleepNotifier == NULL) 285 LogRel(("VBoxDrv: register for sleep/wakeup events failed\n")); 286 287 /* Find kernel symbols that are kind of optional. */ 288 vboxdrvDarwinResolveSymbols(); 289 return KMOD_RETURN_SUCCESS; 290 } 291 292 LogRel(("VBoxDrv: devfs_make_node(makedev(%d,1),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_USR)); 293 devfs_remove(g_hDevFsDeviceSys); 294 g_hDevFsDeviceSys = NULL; 282 295 } 283 284 LogRel(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME)); 296 else 297 LogRel(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_SYS)); 298 285 299 cdevsw_remove(g_iMajorDeviceNo, &g_DevCW); 286 300 g_iMajorDeviceNo = -1; … … 360 374 } 361 375 362 devfs_remove(g_hDevFsDevice); 363 g_hDevFsDevice = NULL; 376 devfs_remove(g_hDevFsDeviceUsr); 377 g_hDevFsDeviceUsr = NULL; 378 379 devfs_remove(g_hDevFsDeviceSys); 380 g_hDevFsDeviceSys = NULL; 364 381 365 382 rc = cdevsw_remove(g_iMajorDeviceNo, &g_DevCW); … … 386 403 * Device open. Called on open /dev/vboxdrv 387 404 * 388 * @param pInode Pointer to inode info structure. 389 * @param pFilp Associated file pointer. 405 * @param Dev The device number. 406 * @param fFlags ???. 407 * @param fDevType ???. 408 * @param pProcess The process issuing this request. 390 409 */ 391 410 static int VBoxDrvDarwinOpen(dev_t Dev, int fFlags, int fDevType, struct proc *pProcess) … … 399 418 400 419 /* 420 * Only two minor devices numbers are allowed. 421 */ 422 if (minor(Dev) != 0 && minor(Dev) != 1) 423 return EACCES; 424 425 /* 401 426 * Find the session created by org_virtualbox_SupDrvClient, fail 402 427 * if no such session, and mark it as opened. We set the uid & gid 403 428 * here too, since that is more straight forward at this point. 404 429 */ 430 const bool fUnrestricted = minor(Dev) == 0; 405 431 int rc = VINF_SUCCESS; 406 432 PSUPDRVSESSION pSession = NULL; … … 420 446 421 447 pSession = g_apSessionHashTab[iHash]; 422 if (pSession && pSession->Process != Process) 423 { 424 do pSession = pSession->pNextHash; 425 while (pSession && pSession->Process != Process); 426 } 448 while (pSession && pSession->Process != Process) 449 pSession = pSession->pNextHash; 427 450 if (pSession) 428 451 { … … 430 453 { 431 454 pSession->fOpened = true; 455 pSession->fUnrestricted = fUnrestricted; 432 456 pSession->Uid = Uid; 433 457 pSession->Gid = Gid; … … 488 512 static int VBoxDrvDarwinIOCtl(dev_t Dev, u_long iCmd, caddr_t pData, int fFlags, struct proc *pProcess) 489 513 { 514 const bool fUnrestricted = minor(Dev) == 0; 490 515 const RTPROCESS Process = proc_pid(pProcess); 491 516 const unsigned iHash = SESSION_HASH(Process); … … 497 522 RTSpinlockAcquire(g_Spinlock); 498 523 pSession = g_apSessionHashTab[iHash]; 499 if (pSession && pSession->Process != Process) 500 { 501 do pSession = pSession->pNextHash; 502 while (pSession && pSession->Process != Process); 503 } 524 while (pSession && pSession->Process != Process && pSession->fUnrestricted == fUnrestricted && pSession->fOpened) 525 pSession = pSession->pNextHash; 504 526 RTSpinlockReleaseNoInts(g_Spinlock); 505 527 if (!pSession) … … 514 536 * the session and iCmd, and only returns a VBox status code. 515 537 */ 516 if ( iCmd == SUP_IOCTL_FAST_DO_RAW_RUN 517 || iCmd == SUP_IOCTL_FAST_DO_HM_RUN 518 || iCmd == SUP_IOCTL_FAST_DO_NOP) 538 if ( ( iCmd == SUP_IOCTL_FAST_DO_RAW_RUN 539 || iCmd == SUP_IOCTL_FAST_DO_HM_RUN 540 || iCmd == SUP_IOCTL_FAST_DO_NOP) 541 && fUnrestricted) 519 542 return supdrvIOCtlFast(iCmd, *(uint32_t *)pData, &g_DevExt, pSession); 520 543 return VBoxDrvDarwinIOCtlSlow(pSession, iCmd, pData, pProcess); … … 1094 1117 * Create a new session. 1095 1118 */ 1096 int rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &m_pSession);1119 int rc = supdrvCreateSession(&g_DevExt, true /* fUser */, false /*fUnrestricted*/, &m_pSession); 1097 1120 if (RT_SUCCESS(rc)) 1098 1121 { 1099 1122 m_pSession->fOpened = false; 1100 /* The Uid and Gid fields are set on open. */1123 /* The Uid, Gid and fUnrestricted fields are set on open. */ 1101 1124 1102 1125 /* 1103 1126 * Insert it into the hash table, checking that there isn't 1104 * already one for this process first. 1127 * already one for this process first. (One session per proc!) 1105 1128 */ 1106 1129 unsigned iHash = SESSION_HASH(m_pSession->Process); … … 1147 1170 /** 1148 1171 * Common worker for clientClose and VBoxDrvDarwinClose. 1149 *1150 * It will1151 1172 */ 1152 1173 /* static */ void org_virtualbox_SupDrvClient::sessionClose(RTPROCESS Process) 1153 1174 { 1154 1175 /* 1155 * Look for the session. 1176 * Find the session and remove it from the hash table. 1177 * 1178 * Note! Only one session per process. (Both start() and 1179 * VBoxDrvDarwinOpen makes sure this is so.) 1156 1180 */ 1157 1181 const unsigned iHash = SESSION_HASH(Process); -
trunk/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp
r37596 r44173 62 62 * Defined Constants And Macros * 63 63 *******************************************************************************/ 64 /** BSD Device name. */ 65 #define DEVICE_NAME "/dev/vboxdrv" 64 /** System device name. */ 65 #define DEVICE_NAME_SYS "/dev/vboxdrv" 66 /** User device name. */ 67 #define DEVICE_NAME_USR "/dev/vboxdrvu" 66 68 /** The IOClass key of the service (see SUPDrv-darwin.cpp / Info.plist). */ 67 69 #define IOCLASS_NAME "org_virtualbox_SupDrv" … … 74 76 * @returns VBox status code. 75 77 */ 76 static int suplibDarwinOpenDevice(PSUPLIBDATA pThis )78 static int suplibDarwinOpenDevice(PSUPLIBDATA pThis, bool fUnrestricted) 77 79 { 78 80 /* … … 81 83 * started, so it has to be done after opening the service (IOC v9.1+). 82 84 */ 83 int hDevice = open( DEVICE_NAME, O_RDWR, 0);85 int hDevice = open(fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, O_RDWR, 0); 84 86 if (hDevice < 0) 85 87 { … … 93 95 default: rc = VERR_VM_DRIVER_OPEN_ERROR; break; 94 96 } 95 LogRel(("SUP: Failed to open \"%s\", errno=%d, rc=%Rrc\n", DEVICE_NAME, errno, rc));97 LogRel(("SUP: Failed to open \"%s\", errno=%d, rc=%Rrc\n", fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, errno, rc)); 96 98 return rc; 97 99 } … … 113 115 } 114 116 115 pThis->hDevice = hDevice; 117 pThis->hDevice = hDevice; 118 pThis->fUnrestricted = fUnrestricted; 116 119 return VINF_SUCCESS; 117 120 } … … 183 186 184 187 185 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited )188 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted) 186 189 { 187 190 /* … … 198 201 if (RT_SUCCESS(rc)) 199 202 { 200 rc = suplibDarwinOpenDevice(pThis );203 rc = suplibDarwinOpenDevice(pThis, fUnrestricted); 201 204 if (RT_FAILURE(rc)) 202 205 { -
trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
r43435 r44173 230 230 * Create a new session. 231 231 */ 232 rc = supdrvCreateSession(&g_VBoxDrvFreeBSDDevExt, true /* fUser */, &pSession);232 rc = supdrvCreateSession(&g_VBoxDrvFreeBSDDevExt, true /* fUser */, true /*fUnrestricted*/, &pSession); 233 233 if (RT_SUCCESS(rc)) 234 234 { -
trunk/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp
r39521 r44173 61 61 * Defined Constants And Macros * 62 62 *******************************************************************************/ 63 /** FreeBSD base device name. */ 64 #define DEVICE_NAME "/dev/vboxdrv" 63 /** System device name. */ 64 #define DEVICE_NAME_SYS "/dev/vboxdrv" 65 /** User device name. */ 66 #define DEVICE_NAME_USR "/dev/vboxdrvu" 65 67 66 68 67 69 68 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited )70 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted) 69 71 { 70 72 /* … … 77 79 * Try open the BSD device. 78 80 */ 79 int hDevice = open( DEVICE_NAME, O_RDWR, 0);81 int hDevice = open(fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, O_RDWR, 0); 80 82 if (hDevice < 0) 81 83 { … … 89 91 default: rc = VERR_VM_DRIVER_OPEN_ERROR; break; 90 92 } 91 LogRel(("Failed to open \"%s\", errno=%d, rc=%Rrc\n", DEVICE_NAME, errno, rc));93 LogRel(("Failed to open \"%s\", errno=%d, rc=%Rrc\n", fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, errno, rc)); 92 94 return rc; 93 95 } … … 112 114 * We're done. 113 115 */ 114 pThis->hDevice = hDevice; 116 pThis->hDevice = hDevice; 117 pThis->fUnrestricted = fUnrestricted; 115 118 return VINF_SUCCESS; 116 119 } -
trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
r43394 r44173 436 436 * Call common code for the rest. 437 437 */ 438 rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &pSession);438 rc = supdrvCreateSession(&g_DevExt, true /* fUser */, true /*fUnrestricted*/, &pSession); 439 439 if (!rc) 440 440 { -
trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
r39091 r44173 62 62 * Defined Constants And Macros * 63 63 *******************************************************************************/ 64 /** Unix Device name. */ 65 #define DEVICE_NAME "/dev/vboxdrv" 64 /** System device name. */ 65 #define DEVICE_NAME_SYS "/dev/vboxdrv" 66 /** User device name. */ 67 #define DEVICE_NAME_USR "/dev/vboxdrvu" 66 68 67 69 /* define MADV_DONTFORK if it's missing from the system headers. */ … … 72 74 73 75 74 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited )76 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted) 75 77 { 76 78 /* … … 93 95 * Try open the device. 94 96 */ 95 int hDevice = open( DEVICE_NAME, O_RDWR, 0);97 int hDevice = open(fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, O_RDWR, 0); 96 98 if (hDevice < 0) 97 99 { … … 99 101 * Try load the device. 100 102 */ 101 hDevice = open( DEVICE_NAME, O_RDWR, 0);103 hDevice = open(fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, O_RDWR, 0); 102 104 if (hDevice < 0) 103 105 { … … 133 135 * We're done. 134 136 */ 135 pThis->hDevice = hDevice; 137 pThis->hDevice = hDevice; 138 pThis->fUnrestricted = fUnrestricted; 136 139 return VINF_SUCCESS; 137 140 } -
trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp
r41067 r44173 151 151 * Create a new session. 152 152 */ 153 rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &pSession);153 rc = supdrvCreateSession(&g_DevExt, true /* fUser */, true /*fUnrestricted*/, &pSession); 154 154 if (RT_SUCCESS(rc)) 155 155 { -
trunk/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp
r37596 r44173 66 66 67 67 68 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited )68 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted) 69 69 { 70 70 /* … … 101 101 102 102 pThis->hDevice = hDevice; 103 pThis->fUnrestricted = true; 103 104 return VINF_SUCCESS; 104 105 } -
trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
r43394 r44173 197 197 int _init(void) 198 198 { 199 LogFlowFunc(( DEVICE_NAME ":_init\n"));199 LogFlowFunc(("vboxdrv:_init\n")); 200 200 201 201 /* … … 206 206 pModCtl->mod_loadflags |= MOD_NOAUTOUNLOAD; 207 207 else 208 LogRel(( DEVICE_NAME ":failed to disable autounloading!\n"));208 LogRel(("vboxdrv: failed to disable autounloading!\n")); 209 209 210 210 /* … … 235 235 236 236 ddi_soft_state_fini(&g_pVBoxDrvSolarisState); 237 LogRel(( DEVICE_NAME ":mod_install failed! rc=%d\n", rc));237 LogRel(("vboxdrv: mod_install failed! rc=%d\n", rc)); 238 238 } 239 239 else 240 LogRel(( DEVICE_NAME ":failed to initialize soft state.\n"));240 LogRel(("vboxdrv: failed to initialize soft state.\n")); 241 241 242 242 RTSpinlockDestroy(g_Spinlock); … … 245 245 else 246 246 { 247 LogRel(( DEVICE_NAME ":VBoxDrvSolarisAttach: RTSpinlockCreate failed\n"));247 LogRel(("VBoxDrvSolarisAttach: RTSpinlockCreate failed\n")); 248 248 rc = RTErrConvertToErrno(rc); 249 249 } … … 252 252 else 253 253 { 254 LogRel(( DEVICE_NAME ":VBoxDrvSolarisAttach: supdrvInitDevExt failed\n"));254 LogRel(("VBoxDrvSolarisAttach: supdrvInitDevExt failed\n")); 255 255 rc = RTErrConvertToErrno(rc); 256 256 } … … 259 259 else 260 260 { 261 LogRel(( DEVICE_NAME ":VBoxDrvSolarisAttach: failed to init R0Drv\n"));261 LogRel(("VBoxDrvSolarisAttach: failed to init R0Drv\n")); 262 262 rc = RTErrConvertToErrno(rc); 263 263 } … … 270 270 int _fini(void) 271 271 { 272 LogFlowFunc(( DEVICE_NAME ":_fini\n"));272 LogFlowFunc(("vboxdrv:_fini\n")); 273 273 274 274 /* … … 296 296 int _info(struct modinfo *pModInfo) 297 297 { 298 LogFlowFunc(( DEVICE_NAME ":_info\n"));298 LogFlowFunc(("vboxdrv:_info\n")); 299 299 int e = mod_info(&g_VBoxDrvSolarisModLinkage, pModInfo); 300 300 return e; … … 312 312 static int VBoxDrvSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd) 313 313 { 314 LogFlowFunc(( DEVICE_NAME ":VBoxDrvSolarisAttach\n"));314 LogFlowFunc(("VBoxDrvSolarisAttach\n")); 315 315 316 316 switch (enmCmd) … … 325 325 if (ddi_soft_state_zalloc(g_pVBoxDrvSolarisState, instance) != DDI_SUCCESS) 326 326 { 327 LogRel(( DEVICE_NAME ":VBoxDrvSolarisAttach: state alloc failed\n"));327 LogRel(("VBoxDrvSolarisAttach: state alloc failed\n")); 328 328 return DDI_FAILURE; 329 329 } … … 338 338 "pm-hardware-state", "needs-suspend-resume", sizeof("needs-suspend-resume")); 339 339 if (rc != DDI_PROP_SUCCESS) 340 LogRel(( DEVICE_NAME ":Suspend/Resume notification registration failed.\n"));340 LogRel(("vboxdrv: Suspend/Resume notification registration failed.\n")); 341 341 342 342 /* … … 372 372 #endif 373 373 RTPowerSignalEvent(RTPOWEREVENT_RESUME); 374 LogFlow(( DEVICE_NAME ": Awakened from suspend.\n"));374 LogFlow(("vboxdrv: Awakened from suspend.\n")); 375 375 return DDI_SUCCESS; 376 376 } … … 394 394 static int VBoxDrvSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd) 395 395 { 396 LogFlowFunc(( DEVICE_NAME ":VBoxDrvSolarisDetach\n"));396 LogFlowFunc(("VBoxDrvSolarisDetach\n")); 397 397 switch (enmCmd) 398 398 { … … 421 421 #endif 422 422 RTPowerSignalEvent(RTPOWEREVENT_SUSPEND); 423 LogFlow(( DEVICE_NAME ": Falling to suspend mode.\n"));423 LogFlow(("vboxdrv: Falling to suspend mode.\n")); 424 424 return DDI_SUCCESS; 425 425 … … 440 440 int rc; 441 441 PSUPDRVSESSION pSession; 442 LogFlowFunc(( DEVICE_NAME ":VBoxDrvSolarisOpen: pDev=%p:%#x\n", pDev, *pDev));442 LogFlowFunc(("VBoxDrvSolarisOpen: pDev=%p:%#x\n", pDev, *pDev)); 443 443 444 444 #ifndef USE_SESSION_HASH … … 462 462 if (!pState) 463 463 { 464 LogRel(( DEVICE_NAME ":VBoxDrvSolarisOpen: too many open instances.\n"));464 LogRel(("VBoxDrvSolarisOpen: too many open instances.\n")); 465 465 return ENXIO; 466 466 } … … 469 469 * Create a new session. 470 470 */ 471 rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &pSession);471 rc = supdrvCreateSession(&g_DevExt, true /* fUser */, true /*fUnrestricted*/, &pSession); 472 472 if (RT_SUCCESS(rc)) 473 473 { … … 477 477 pState->pSession = pSession; 478 478 *pDev = makedevice(getmajor(*pDev), iOpenInstance); 479 LogFlow(( DEVICE_NAME ":VBoxDrvSolarisOpen: Dev=%#x pSession=%p pid=%d r0proc=%p thread=%p\n",480 479 LogFlow(("VBoxDrvSolarisOpen: Dev=%#x pSession=%p pid=%d r0proc=%p thread=%p\n", 480 *pDev, pSession, RTProcSelf(), RTR0ProcHandleSelf(), RTThreadNativeSelf() )); 481 481 return 0; 482 482 } … … 491 491 * in VBoxDrvSolarisIOCtlSlow() while calling supdrvIOCtl() 492 492 */ 493 rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &pSession);493 rc = supdrvCreateSession(&g_DevExt, true /* fUser */, true /*fUnrestricted*/, &pSession); 494 494 if (RT_SUCCESS(rc)) 495 495 { … … 507 507 g_apSessionHashTab[iHash] = pSession; 508 508 RTSpinlockReleaseNoInts(g_Spinlock); 509 LogFlow(( DEVICE_NAME ":VBoxDrvSolarisOpen success\n"));509 LogFlow(("VBoxDrvSolarisOpen success\n")); 510 510 } 511 511 … … 520 520 if (instance >= DEVICE_MAXINSTANCES) 521 521 { 522 LogRel(( DEVICE_NAME ":VBoxDrvSolarisOpen: All instances exhausted\n"));522 LogRel(("VBoxDrvSolarisOpen: All instances exhausted\n")); 523 523 return ENXIO; 524 524 } … … 533 533 static int VBoxDrvSolarisClose(dev_t Dev, int flag, int otyp, cred_t *cred) 534 534 { 535 LogFlowFunc(( DEVICE_NAME ":VBoxDrvSolarisClose: Dev=%#x\n", Dev));535 LogFlowFunc(("VBoxDrvSolarisClose: Dev=%#x\n", Dev)); 536 536 537 537 #ifndef USE_SESSION_HASH … … 542 542 if (!pState) 543 543 { 544 LogRel(( DEVICE_NAME ":VBoxDrvSolarisClose: no state data for %#x (%d)\n", Dev, getminor(Dev)));544 LogRel(("VBoxDrvSolarisClose: no state data for %#x (%d)\n", Dev, getminor(Dev))); 545 545 return EFAULT; 546 546 } … … 552 552 if (!pSession) 553 553 { 554 LogRel(( DEVICE_NAME ":VBoxDrvSolarisClose: no session in state data for %#x (%d)\n", Dev, getminor(Dev)));554 LogRel(("VBoxDrvSolarisClose: no session in state data for %#x (%d)\n", Dev, getminor(Dev))); 555 555 return EFAULT; 556 556 } 557 LogFlow(( DEVICE_NAME ":VBoxDrvSolarisClose: Dev=%#x pSession=%p pid=%d r0proc=%p thread=%p\n",557 LogFlow(("VBoxDrvSolarisClose: Dev=%#x pSession=%p pid=%d r0proc=%p thread=%p\n", 558 558 Dev, pSession, RTProcSelf(), RTR0ProcHandleSelf(), RTThreadNativeSelf() )); 559 559 … … 597 597 if (!pSession) 598 598 { 599 LogRel((DEVICE_NAME ":VBoxDrvSolarisClose: WHAT?!? pSession == NULL! This must be a mistake... pid=%d (close)\n", 600 (int)Process)); 599 LogRel(("VBoxDrvSolarisClose: WHAT?!? pSession == NULL! This must be a mistake... pid=%d (close)\n", (int)Process)); 601 600 return EFAULT; 602 601 } … … 613 612 static int VBoxDrvSolarisRead(dev_t Dev, struct uio *pUio, cred_t *pCred) 614 613 { 615 LogFlowFunc(( DEVICE_NAME ":VBoxDrvSolarisRead"));614 LogFlowFunc(("VBoxDrvSolarisRead")); 616 615 return 0; 617 616 } … … 620 619 static int VBoxDrvSolarisWrite(dev_t Dev, struct uio *pUio, cred_t *pCred) 621 620 { 622 LogFlowFunc(( DEVICE_NAME ":VBoxDrvSolarisWrite"));621 LogFlowFunc(("VBoxDrvSolarisWrite")); 623 622 return 0; 624 623 } … … 646 645 if (!pState) 647 646 { 648 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtl: no state data for %#x (%d)\n", Dev, getminor(Dev)));647 LogRel(("VBoxDrvSolarisIOCtl: no state data for %#x (%d)\n", Dev, getminor(Dev))); 649 648 return EINVAL; 650 649 } … … 653 652 if (!pSession) 654 653 { 655 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtl: no session in state data for %#x (%d)\n", Dev, getminor(Dev)));654 LogRel(("VBoxDrvSolarisIOCtl: no session in state data for %#x (%d)\n", Dev, getminor(Dev))); 656 655 return DDI_SUCCESS; 657 656 } … … 674 673 if (!pSession) 675 674 { 676 LogRel(( DEVICE_NAME ":VBoxSupDrvIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x\n",675 LogRel(("VBoxSupDrvIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x\n", 677 676 (int)Process, Cmd)); 678 677 return EINVAL; … … 732 731 if (RT_UNLIKELY(IOCPARM_LEN(iCmd) != sizeof(StackBuf.Hdr))) 733 732 { 734 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: iCmd=%#x len %d expected %d\n", iCmd, IOCPARM_LEN(iCmd), sizeof(StackBuf.Hdr)));733 LogRel(("VBoxDrvSolarisIOCtlSlow: iCmd=%#x len %d expected %d\n", iCmd, IOCPARM_LEN(iCmd), sizeof(StackBuf.Hdr))); 735 734 return EINVAL; 736 735 } … … 738 737 if (RT_UNLIKELY(rc)) 739 738 { 740 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: ddi_copyin(,%#lx,) failed; iCmd=%#x. rc=%d\n", iArg, iCmd, rc));739 LogRel(("VBoxDrvSolarisIOCtlSlow: ddi_copyin(,%#lx,) failed; iCmd=%#x. rc=%d\n", iArg, iCmd, rc)); 741 740 return EFAULT; 742 741 } 743 742 if (RT_UNLIKELY((StackBuf.Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK) != SUPREQHDR_FLAGS_MAGIC)) 744 743 { 745 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: bad header magic %#x; iCmd=%#x\n", StackBuf.Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK, iCmd));744 LogRel(("VBoxDrvSolarisIOCtlSlow: bad header magic %#x; iCmd=%#x\n", StackBuf.Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK, iCmd)); 746 745 return EINVAL; 747 746 } … … 751 750 || cbBuf > _1M*16)) 752 751 { 753 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: max(%#x,%#x); iCmd=%#x\n", StackBuf.Hdr.cbIn, StackBuf.Hdr.cbOut, iCmd));752 LogRel(("VBoxDrvSolarisIOCtlSlow: max(%#x,%#x); iCmd=%#x\n", StackBuf.Hdr.cbIn, StackBuf.Hdr.cbOut, iCmd)); 754 753 return EINVAL; 755 754 } … … 765 764 if (RT_UNLIKELY(!pHdr)) 766 765 { 767 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: failed to allocate buffer of %d bytes for iCmd=%#x.\n", cbBuf, iCmd));766 LogRel(("VBoxDrvSolarisIOCtlSlow: failed to allocate buffer of %d bytes for iCmd=%#x.\n", cbBuf, iCmd)); 768 767 return ENOMEM; 769 768 } … … 772 771 if (RT_UNLIKELY(rc)) 773 772 { 774 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: copy_from_user(,%#lx, %#x) failed; iCmd=%#x. rc=%d\n", iArg, cbBuf, iCmd, rc));773 LogRel(("VBoxDrvSolarisIOCtlSlow: copy_from_user(,%#lx, %#x) failed; iCmd=%#x. rc=%d\n", iArg, cbBuf, iCmd, rc)); 775 774 if (pHdr != &StackBuf.Hdr) 776 775 RTMemFree(pHdr); … … 791 790 if (RT_UNLIKELY(cbOut > cbBuf)) 792 791 { 793 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: too much output! %#x > %#x; iCmd=%#x!\n", cbOut, cbBuf, iCmd));792 LogRel(("VBoxDrvSolarisIOCtlSlow: too much output! %#x > %#x; iCmd=%#x!\n", cbOut, cbBuf, iCmd)); 794 793 cbOut = cbBuf; 795 794 } … … 798 797 { 799 798 /* this is really bad */ 800 LogRel(( DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: ddi_copyout(,%p,%d) failed. rc=%d\n", (void *)iArg, cbBuf, rc));799 LogRel(("VBoxDrvSolarisIOCtlSlow: ddi_copyout(,%p,%d) failed. rc=%d\n", (void *)iArg, cbBuf, rc)); 801 800 rc = EFAULT; 802 801 } -
trunk/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp
r41774 r44173 65 65 * Defined Constants And Macros * 66 66 *******************************************************************************/ 67 /** Solaris device link. */ 68 #define DEVICE_NAME "/dev/vboxdrv" 69 70 71 72 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited) 67 /** Solaris device link - system. */ 68 #define DEVICE_NAME_SYS "/dev/vboxdrv" 69 /** Solaris device link - user. */ 70 #define DEVICE_NAME_USR "/dev/vboxdrvu" 71 72 73 74 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted) 73 75 { 74 76 /* … … 102 104 * Try to open the device. 103 105 */ 104 int hDevice = open( DEVICE_NAME, O_RDWR, 0);106 int hDevice = open(fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, O_RDWR, 0); 105 107 if (hDevice < 0) 106 108 { … … 134 136 } 135 137 136 pThis->hDevice = hDevice; 138 pThis->hDevice = hDevice; 139 pThis->fUnrestricted = fUnrestricted; 137 140 return VINF_SUCCESS; 138 141 } -
trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
r43394 r44173 265 265 pFileObj->FsContext = NULL; 266 266 PSUPDRVSESSION pSession; 267 int rc = supdrvCreateSession(pDevExt, true /*fUser*/, &pSession);267 int rc = supdrvCreateSession(pDevExt, true /*fUser*/, true /*fUnrestricted*/, &pSession); 268 268 if (!rc) 269 269 pFileObj->FsContext = pSession; -
trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp
r37596 r44173 57 57 /** The support service name. */ 58 58 #define SERVICE_NAME "VBoxDrv" 59 /** Win32 Device name. */ 60 #define DEVICE_NAME "\\\\.\\VBoxDrv" 59 /** Win32 Device name - system. */ 60 #define DEVICE_NAME_SYS "\\\\.\\VBoxDrv" 61 /** Win32 Device name - user. */ 62 #define DEVICE_NAME_USR "\\\\.\\VBoxDrvU" 61 63 /** NT Device name. */ 62 64 #define DEVICE_NAME_NT L"\\Device\\VBoxDrv" … … 78 80 79 81 80 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited )82 int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted) 81 83 { 82 84 /* … … 89 91 * Try open the device. 90 92 */ 91 HANDLE hDevice = CreateFile( DEVICE_NAME,93 HANDLE hDevice = CreateFile(fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, 92 94 GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 93 95 NULL, … … 103 105 suplibOsStartService(); 104 106 105 hDevice = CreateFile( DEVICE_NAME,107 hDevice = CreateFile(fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, 106 108 GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 107 109 NULL, … … 139 141 * We're done. 140 142 */ 141 pThis->hDevice = hDevice; 143 pThis->hDevice = hDevice; 144 pThis->fUnrestricted = fUnrestricted; 142 145 return VINF_SUCCESS; 143 146 }
Note:
See TracChangeset
for help on using the changeset viewer.
