Changeset 65611 in vbox

Timestamp:

Feb 4, 2017 1:20:20 AM (8 years ago)

Author:

vboxsync

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

113282

Message:

Main/DHCPServerImpl: Check that IP addresses are not all-zeroes or
all-ones of the subnet. Provide error messages too.

File:

• trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp

@@ -262 +262 @@
     rc = RTNetStrToIPv4Addr(aIPAddress.c_str(), &IPAddress);
     if (RT_FAILURE(rc))
-        return E_INVALIDARG;
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
+                   "Invalid server address");
 
     rc = RTNetStrToIPv4Addr(aNetworkMask.c_str(), &NetworkMask);
     if (RT_FAILURE(rc))
-        return E_INVALIDARG;
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
+                   "Invalid netmask");
 
     rc = RTNetStrToIPv4Addr(aLowerIP.c_str(), &LowerIP);
     if (RT_FAILURE(rc))
-        return E_INVALIDARG;
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
+                   "Invalid range lower address");
 
     rc = RTNetStrToIPv4Addr(aUpperIP.c_str(), &UpperIP);
     if (RT_FAILURE(rc))
-        return E_INVALIDARG;
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
+                   "Invalid range upper address");
 
     /*
@@ -282 +286 @@
     rc = RTNetMaskToPrefixIPv4(&NetworkMask, NULL);
     if (RT_FAILURE(rc))
-        return E_INVALIDARG;
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
+                   "Invalid netmask");
 
     /* It's more convenient to convert to host order once */
@@ -290 +295 @@
     UpperIP.u = RT_N2H_U32(UpperIP.u);
 
-    /* Addresses must be unicast */
-    if (   (IPAddress.u & 0xe0000000) == 0xe0000000
-        || (LowerIP.u   & 0xe0000000) == 0xe0000000
-        || (UpperIP.u   & 0xe0000000) == 0xe0000000)
-    {
-        return E_INVALIDARG;
-    }
-
-    /* Addresses should be from the same network */
-    if (   (IPAddress.u & NetworkMask.u) != (LowerIP.u &NetworkMask.u)
-        || (LowerIP.u & NetworkMask.u) != (UpperIP.u &NetworkMask.u))
-    {
-        return E_INVALIDARG;
+    /*
+     * Addresses must be unicast and from the same network
+     */
+    if (   (IPAddress.u & UINT32_C(0xe0000000)) == UINT32_C(0xe0000000)
+        || (IPAddress.u & ~NetworkMask.u) == 0
+        || ((IPAddress.u & ~NetworkMask.u) | NetworkMask.u) == UINT32_C(0xffffffff))
+    {
+        return mVirtualBox->setError(E_INVALIDARG,
+                   "Invalid server address");
+    }
+
+    if (   (LowerIP.u & UINT32_C(0xe0000000)) == UINT32_C(0xe0000000)
+        || (LowerIP.u & NetworkMask.u) != (IPAddress.u &NetworkMask.u)
+        || (LowerIP.u & ~NetworkMask.u) == 0
+        || ((LowerIP.u & ~NetworkMask.u) | NetworkMask.u) == UINT32_C(0xffffffff))
+    {
+        return mVirtualBox->setError(E_INVALIDARG,
+                   "Invalid range lower address");
+    }
+
+    if (   (UpperIP.u & UINT32_C(0xe0000000)) == UINT32_C(0xe0000000)
+        || (UpperIP.u & NetworkMask.u) != (IPAddress.u &NetworkMask.u)
+        || (UpperIP.u & ~NetworkMask.u) == 0
+        || ((UpperIP.u & ~NetworkMask.u) | NetworkMask.u) == UINT32_C(0xffffffff))
+    {
+        return mVirtualBox->setError(E_INVALIDARG,
+                   "Invalid range upper address");
     }
 
     /* The range should be valid ... */
     if (LowerIP.u > UpperIP.u)
-        return E_INVALIDARG;
+        return mVirtualBox->setError(E_INVALIDARG,
+                   "Invalid range bounds");
 
     /* ... and shouldn't contain the server's address */
     if (LowerIP.u <= IPAddress.u && IPAddress.u <= UpperIP.u)
-        return E_INVALIDARG;
-
+        return mVirtualBox->setError(E_INVALIDARG,
+                   "Server address within range bounds");
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);