Changeset 76447 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 24, 2018 4:29:44 PM (6 years ago)

Author:

vboxsync

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

127748

Message:

VBoxGuest-netbsd.c: Check for NOCRED and FSCRED too (might be an
assertion, but err on the safe side). Check egid too. Cosmetics to
make the code a bit more clear.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c

@@ -646 +646 @@
              * Create a new session.
              */
+            struct kauth_cred *pCred = pLwp->l_cred;
+            int fHaveCred = (pCred != NULL && pCred != NOCRED && pCred != FSCRED);
+            uint32_t fRequestor;
+            int fIsWheel;
             int rc;
-            struct kauth_cred *pCred = pLwp->l_cred;
-            int fIsWheel;
-            uint32_t fRequestor = VMMDEV_REQUESTOR_USERMODE | VMMDEV_REQUESTOR_TRUST_NOT_GIVEN;
-            if (pCred && kauth_cred_geteuid(pCred) == 0)
+
+            fRequestor = VMMDEV_REQUESTOR_USERMODE | VMMDEV_REQUESTOR_TRUST_NOT_GIVEN;
+
+            /* uid */
+            if (fHaveCred && kauth_cred_geteuid(pCred) == (uid_t)0)
                 fRequestor |= VMMDEV_REQUESTOR_USR_ROOT;
             else
                 fRequestor |= VMMDEV_REQUESTOR_USR_USER;
 
-            if (pCred && kauth_cred_ismember_gid(pCred, 0, &fIsWheel) == 0 && fIsWheel)
+            /* gid */
+            if (fHaveCred
+                && (kauth_cred_getegid(pCred) == (gid_t)0
+                    || (kauth_cred_ismember_gid(pCred, 0, &fIsWheel) == 0
+                        && fIsWheel)))
                 fRequestor |= VMMDEV_REQUESTOR_GRP_WHEEL;
-            fRequestor |= VMMDEV_REQUESTOR_NO_USER_DEVICE; /** @todo implement /dev/vboxuser
+
+#if 0       /** @todo implement /dev/vboxuser */
             if (!fUnrestricted)
-                fRequestor |= VMMDEV_REQUESTOR_USER_DEVICE; */
-            fRequestor |= VMMDEV_REQUESTOR_CON_DONT_KNOW; /** @todo can we find out if pLwp is on the console? */
+                fRequestor |= VMMDEV_REQUESTOR_USER_DEVICE;
+#else
+            fRequestor |= VMMDEV_REQUESTOR_NO_USER_DEVICE;
+#endif
+
+            /** @todo can we find out if pLwp is on the console? */
+            fRequestor |= VMMDEV_REQUESTOR_CON_DONT_KNOW;
+
             rc = VGDrvCommonCreateUserSession(&g_DevExt, fRequestor, &fdata->session);
             if (RT_SUCCESS(rc))
@@ -677 +693 @@
         error = ENOMEM;
     return error;
-
 }