Changeset 5184 in vbox

Timestamp:

Oct 8, 2007 1:23:33 PM (18 years ago)

Author:

vboxsync

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

25105

Message:

Solaris.

Location:

trunk/src/VBox/Devices

Files:

• Builtins.cpp (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• Storage/DrvHostBase.cpp (modified) (3 diffs)
• Storage/DrvHostDVD.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -157 +157 @@
         return rc;
 #endif
-#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostDVD);
     if (VBOX_FAILURE(rc))

trunk/src/VBox/Devices/Makefile.kmk

@@ -14 +14 @@
 #  distribution. VirtualBox OSE is distributed in the hope that it will
 #  be useful, but WITHOUT ANY WARRANTY of any kind.
+#
 
 DEPTH = ../../..
@@ -450 +451 @@
         , $(Drivers_SOURCES))
 Drivers_SOURCES.solaris = \
-    Network/DrvTAP.cpp
+        Network/DrvTAP.cpp \
+        Storage/DrvHostBase.cpp \
+        Storage/DrvHostDVD.cpp
 endif
 

trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

@@ -45 +45 @@
 # include <fcntl.h>
 # include <errno.h>
+# include <stropts.h>
+# include <sys/dkio.h>
 
 #elif defined(RT_OS_WINDOWS)
@@ -918 +920 @@
     return rc;
 
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
     /** @todo we've got RTFILE_O_NON_BLOCK now. Change the code to use RTFileOpen. */
     int FileDevice = open(pThis->pszDeviceOpen, (pThis->fReadOnlyConfig ? O_RDONLY : O_RDWR) | O_NONBLOCK);
@@ -1013 +1015 @@
     }
     return rc;
+
+#elif defined(RT_OS_SOLARIS)
+    /*
+     * Sun docs suggests using DKIOCGGEOM instead of DKIOCGMEDIAINFO, but
+     * Sun themselves use DKIOCGMEDIAINFO for DVDs/CDs, and use DKIOCGGEOM
+     * for secondary storage devices.
+     */
+    struct dk_minfo MediaInfo;
+    if (ioctl(pThis->FileDevice, DKIOCGMEDIAINFO, &MediaInfo) == 0)
+    {
+        *pcb = MediaInfo.dki_capacity * (uint64_t)MediaInfo.dki_lbsize;
+        return VINF_SUCCESS;
+    }
+    return RTFileSeek(pThis->FileDevice, 0, RTFILE_SEEK_END, pcb);
 
 #elif defined(RT_OS_WINDOWS)

trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp

@@ -52 +52 @@
 # define USE_MEDIA_POLLING
 
+#elif defined(RT_OS_SOLARIS)
+# include <stropts.h>
+# include <fcntl.h>
+# include <ctype.h>
+# include <errno.h>
+# include <pwd.h>
+# include <unistd.h>
+# include <auth_attr.h>
+# include <sys/dkio.h>
+# include <sys/sockio.h>
+# include <sys/scsi/scsi.h>
+# define USE_MEDIA_POLLING
+
 #elif defined(RT_OS_WINDOWS)
 # include <Windows.h>
@@ -117 +130 @@
                  rc = RTErrConvertFromErrno(errno);
          }
+
+#elif defined(RT_OS_SOLARIS)
+        rc = ioctl(pThis->FileDevice, DKIOCEJECT, 0);
+        if (rc < 0)
+        {
+            if (errno == EBUSY)
+                rc = VERR_PDM_MEDIA_LOCKED;
+            else if (errno == ENOSYS || errno == ENOTSUP)
+                rc = VERR_NOT_SUPPORTED;
+            else if (errno == ENODEV)
+                rc = VERR_PDM_MEDIA_NOT_MOUNTED;
+            else
+                rc = RTErrConvertFromErrno(errno);
+        }
 
 #elif defined(RT_OS_WINDOWS)
@@ -188 +215 @@
             rc = VERR_ACCESS_DENIED;
         else if (errno == EDRIVE_CANT_DO_THIS)
+            rc = VERR_NOT_SUPPORTED;
+        else
+            rc = RTErrConvertFromErrno(errno);
+    }
+
+#elif defined(RT_OS_SOLARIS)
+    int rc = ioctl(pThis->FileDevice, fLock ? DKIOCLOCK : DKIOCUNLOCK, 0);
+    if (rc < 0)
+    {
+        if (errno == EBUSY)
+            rc = VERR_ACCESS_DENIED;
+        else if (errno == ENOTSUP || errno == ENOSYS)
             rc = VERR_NOT_SUPPORTED;
         else
@@ -281 +320 @@
     bool fMediaPresent = ioctl(pThis->FileDevice, CDROM_DRIVE_STATUS, CDSL_CURRENT) == CDS_DISC_OK;
 
+#elif defined(RT_OS_SOLARIS)
+    bool fMediaPresent = false;
+    bool fMediaChanged = false;
+
+    /* Need to pass the previous state and DKIO_NONE for the first time. */
+    static dkio_state DeviceState = DKIO_NONE;
+    int rc2 = ioctl(pThis->FileDevice, DKIOCSTATE, &DeviceState);
+    if (rc2 == 0)
+    {
+        fMediaPresent = DeviceState == DKIO_INSERTED;
+        if (pThis->fMediaPresent != fMediaPresent || !fMediaPresent)
+            fMediaChanged = true;   /** @todo find proper way to detect media change. */
+    }
+
 #else
 # error "Unsupported platform."
@@ -302 +355 @@
          * Poll for media change.
          */
-#ifdef RT_OS_DARWIN
+#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
         /* taken care of above. */
 #elif defined(RT_OS_LINUX)
@@ -411 +464 @@
      * it's 0). So just assume that everything worked ok. */
 
+#elif defined(RT_OS_SOLARIS)
+    struct uscsi_cmd usc;
+    union scsi_cdb scdb;
+    memset(&usc, 0, sizeof(struct uscsi_cmd));
+    memset(&scdb, 0, sizeof(scdb));
+
+    switch (enmTxDir)
+    {
+        case PDMBLOCKTXDIR_NONE:
+            Assert(*pcbBuf == 0);
+            usc.uscsi_flags = USCSI_READ;
+            /* nothing to do */
+            break;
+
+        case PDMBLOCKTXDIR_FROM_DEVICE:
+            Assert(*pcbBuf != 0);
+            /* Make sure that the buffer is clear for commands reading
+             * data. The actually received data may be shorter than what
+             * we expect, and due to the unreliable feedback about how much
+             * data the ioctl actually transferred, it's impossible to
+             * prevent that. Returning previous buffer contents may cause
+             * security problems inside the guest OS, if users can issue
+             * commands to the CDROM device. */
+            memset(pvBuf, '\0', *pcbBuf);
+            usc.uscsi_flags = USCSI_READ;
+            break;
+        case PDMBLOCKTXDIR_TO_DEVICE:
+            Assert(*pcbBuf != 0);
+            usc.uscsi_flags = USCSI_WRITE;
+            break;
+        default:
+            AssertMsgFailedReturn(("%d\n", enmTxDir), VERR_INTERNAL_ERROR);
+    }
+    char aSense[32];
+    usc.uscsi_flags |= USCSI_RQENABLE;
+    usc.uscsi_rqbuf = aSense;
+    usc.uscsi_rqlen = 32;
+    usc.uscsi_cdb = (caddr_t)&scdb;
+    usc.uscsi_cdblen = 12;
+    memcpy (usc.uscsi_cdb, pbCmd, usc.uscsi_cdblen);
+    usc.uscsi_bufaddr = (caddr_t)pvBuf;
+    usc.uscsi_buflen = *pcbBuf;
+    usc.uscsi_timeout = (cTimeoutMillies + 999) / 1000;
+
+    /* We need root privileges for user-SCSI under Solaris. */
+    rc = ioctl(pThis->FileDevice, USCSICMD, &usc);
+    if (rc < 0)
+    {
+        if (errno == EPERM)
+            return VERR_PERMISSION_DENIED;
+        if (usc.uscsi_status)
+        {
+            *pbStat = aSense[2] & 0x0f;
+            rc = RTErrConvertFromErrno(errno);
+            Log2(("%s: error status. rc=%Vrc\n", __FUNCTION__, rc));
+        }
+        else
+            *pbStat = 0;
+    }
+    Log2(("%s: after ioctl: residual buflen=%d original buflen=%d\n", __FUNCTION__, usc.uscsi_resid, usc.uscsi_buflen));
+
 #elif defined(RT_OS_WINDOWS)
     int direction;
@@ -476 +590 @@
 }
 
+#if 0
+/* These functions would have to go into a seperate solaris binary with
+ * the setuid permission set, which would run the user-SCSI ioctl and
+ * return the value. BUT... this might be prohibitively slow.
+ */
+#ifdef RT_OS_SOLARIS
+/**
+ * Checks if the current user is authorized using Solaris' role-based access control.
+ * Made as a seperate function with so that it need not be invoked each time we need
+ * to gain root access.
+ *
+ * @returns VBox error code.
+ */
+static int solarisCheckUserAuth()
+{
+    /* Uses Solaris' role-based access control (RBAC).*/
+    struct passwd *pPass = getpwuid(getuid());
+    if (pPass == NULL || chkauthattr("solaris.device.cdrw", pPass->pw_name) == 0)
+        return VERR_PERMISSION_DENIED;
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Setuid wrapper to gain root access.
+ *
+ * @returns VBox error code.
+ * @param   pUserID        Pointer to user ID.
+ * @param   pEffUserID     Pointer to effective user ID.
+ */
+static int solarisEnterRootMode(uid_t *pUserID, uid_t *pEffUserID)
+{
+    /* Increase privilege if required */
+    if (*pEffUserID == 0)
+        return VINF_SUCCESS;
+    if (seteuid(0) == 0)
+    {
+        *pEffUserID = 0;
+        return VINF_SUCCESS;
+    }
+    return VERR_PERMISSION_DENIED;
+}
+
+/**
+ * Setuid wrapper to relinquish root access.
+ *
+ * @returns VBox error code.
+ * @param   pUserID        Pointer to user ID.
+ * @param   pEffUserID     Pointer to effective user ID.
+ */
+static int solarisExitRootMode(uid_t *pUserID, uid_t *pEffUserID)
+{
+    /* Get back to user mode. */
+    if (*pEffUserID == 0)
+    {
+        if (seteuid(*pUserID) == 0)
+        {
+            *pEffUserID = *pUserID;
+            return VINF_SUCCESS;
+        }
+        return VERR_PERMISSION_DENIED;
+    }
+    return VINF_SUCCESS;
+}
+#endif   /* RT_OS_SOLARIS */
+#endif
 
 /* -=-=-=-=- driver interface -=-=-=-=- */