Changeset 54317 in vbox

Timestamp:

Feb 19, 2015 10:31:33 PM (10 years ago)

Author:

vboxsync

Message:

supdrvCheckInvalidChar -> supdrvIsLdrModuleNameValid and explained its real purpose.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -1428 +1428 @@
 
 /**
- * Helper for supdrvIOCtl. Check if pszStr contains any character of pszChars.
- * We would use strpbrk here if this function would be contained in the RedHat kABI white
- * list, see http://www.kerneldrivers.org/RHEL5.
- *
- * @returns  1 if pszStr does contain any character of pszChars, 0 otherwise.
- * @param    pszStr     String to check
- * @param    pszChars   Character set
- */
-static int supdrvCheckInvalidChar(const char *pszStr, const char *pszChars)
+ * Helper for supdrvIOCtl used to validate module names passed to SUP_IOCTL_LDR_OPEN.
+ *
+ * Check if pszStr contains any character of pszChars.  We would use strpbrk
+ * here if this function would be contained in the RedHat kABI white list, see
+ * http://www.kerneldrivers.org/RHEL5.
+ *
+ * @returns  true if fine, false if not.
+ * @param    pszName        The module name to check.
+ */
+static bool supdrvIsLdrModuleNameValid(const char *pszName)
 {
     int chCur;
-    while ((chCur = *pszStr++) != '\0')
-    {
-        int ch;
-        const char *psz = pszChars;
-        while ((ch = *psz++) != '\0')
-            if (ch == chCur)
-                return 1;
-
-    }
-    return 0;
+    while ((chCur = *pszName++) != '\0')
+    {
+        static const char s_szInvalidChars[] = ";:()[]{}/\\|&*%#@!~`\"'";
+        unsigned offInv = RT_ELEMENTS(s_szInvalidChars);
+        while (offInv-- > 0)
+            if (s_szInvalidChars[offInv] == chCur)
+                return false;
+    }
+    return true;
 }
 
@@ -1664 +1664 @@
             REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.szName[0]);
             REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, RTStrEnd(pReq->u.In.szName, sizeof(pReq->u.In.szName)));
-            REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, !supdrvCheckInvalidChar(pReq->u.In.szName, ";:()[]{}/\\|&*%#@!~`\"'"));
+            REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, supdrvIsLdrModuleNameValid(pReq->u.In.szName));
             REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, RTStrEnd(pReq->u.In.szFilename, sizeof(pReq->u.In.szFilename)));