Changeset 23059 in vbox for trunk/src/apps/adpctl

Timestamp:

Sep 16, 2009 10:26:02 AM (15 years ago)

Author:

vboxsync

Message:

VBoxNetAdpCtl: added adapter name validation.

File:

• trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp (modified) (3 diffs)

trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp

@@ -201 +201 @@
 }
 
+int checkAdapterName(const char *pcszNameIn, char *pszNameOut)
+{
+    int iAdapterIndex = -1;
+
+    if (sscanf(pcszNameIn, "vboxnet%d", &iAdapterIndex) != 1
+        || iAdapterIndex < 0 || iAdapterIndex > 99 )
+    {
+        fprintf(stderr, "Setting configuration for %s is not supported.\n", pcszNameIn);
+        return 2;
+    }
+    sprintf(pszNameOut, "vboxnet%d", iAdapterIndex);
+    if (strcmp(pszNameOut, pcszNameIn))
+    {
+        fprintf(stderr, "Invalid adapter name %s.\n", pcszNameIn);
+        return 2;
+    }
+
+    return 0;
+}
+
 int main(int argc, char *argv[])
 
 {
+    char szAdapterName[VBOXNETADP_MAX_NAME_LEN];
     char *pszAdapterName;
     const char *pszAddress;
@@ -242 +263 @@
             if (strcmp("remove", pszAddress) == 0)
             {
-                snprintf(Req.szName, sizeof(Req.szName), "%s", pszAdapterName);
+                rc = checkAdapterName(pszAdapterName, szAdapterName);
+                if (rc)
+                    return rc;
+                snprintf(Req.szName, sizeof(Req.szName), "%s", szAdapterName);
                 return doIOCtl(VBOXNETADP_CTL_REMOVE, &Req);
             }
@@ -263 +287 @@
     }
 
-    if (strncmp("vboxnet", pszAdapterName, 7))
-    {
-        fprintf(stderr, "Setting configuration for %s is not supported.\n", pszAdapterName);
-        return 2;
-    }
+    rc = checkAdapterName(pszAdapterName, szAdapterName);
+    if (rc)
+        return rc;
+
+    pszAdapterName = szAdapterName;
 
     if (fRemove)