[ovs-dev] [PATCH v1 04/10] datapath-windows/Netlink: Allow support for NESTED Attributes in NlAttrValidate

[Eitan Eliahu]

Acked-by: Eitan Eliahu <eliahue at vmware.com>


-----Original Message-----
From: dev [mailto:dev-bounces at openvswitch.org] On Behalf Of Ankur Sharma
Sent: Wednesday, September 24, 2014 12:16 AM
To: dev at openvswitch.org
Subject: [ovs-dev] [PATCH v1 04/10] datapath-windows/Netlink: Allow support for NESTED Attributes in NlAttrValidate

---
 datapath-windows/ovsext/Netlink/Netlink.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/datapath-windows/ovsext/Netlink/Netlink.c b/datapath-windows/ovsext/Netlink/Netlink.c
index 5f07451..5c74ec0 100644
--- a/datapath-windows/ovsext/Netlink/Netlink.c
+++ b/datapath-windows/ovsext/Netlink/Netlink.c
@@ -870,12 +870,13 @@ NlAttrValidate(const PNL_ATTR nla, const PNL_POLICY policy)
     UINT32 minLen;
     UINT32 maxLen;
     UINT32 len;
-    BOOLEAN ret = TRUE;
+    BOOLEAN ret = FALSE;
 
     if ((policy->type == NL_A_NO_ATTR) ||
-        (policy->type == NL_A_VAR_LEN)) {
+        (policy->type == NL_A_VAR_LEN) ||
+        (policy->type == NL_A_NESTED)) {
         /* Do not validate anything for attributes of type var length */
-        ret = FALSE;
+        ret = TRUE;
         goto done;
     }
 
@@ -894,7 +895,6 @@ NlAttrValidate(const PNL_ATTR nla, const PNL_POLICY policy)
     if (len < minLen || len > maxLen) {
         OVS_LOG_WARN("Attribute: %p, len: %d, not in valid range, "
                      "min: %d, max: %d", nla, len, minLen, maxLen);
-        ret = FALSE;
         goto done;
     }
 
@@ -902,17 +902,17 @@ NlAttrValidate(const PNL_ATTR nla, const PNL_POLICY policy)
     if (policy->type == NL_A_STRING) {
         if (((PCHAR) nla)[nla->nlaLen - 1]) {
             OVS_LOG_WARN("Attributes %p lacks null at the end", nla);
-            ret = FALSE;
             goto done;
         }
 
         if (memchr(nla + 1, '\0', len - 1) != NULL) {
             OVS_LOG_WARN("Attributes %p has bad length", nla);
-            ret = FALSE;
             goto done;
         }
     }
 
+    ret = TRUE;
+
 done:
     return ret;
 }
-- 
1.9.1

_______________________________________________
dev mailing list
dev at openvswitch.org
https://urldefense.proofpoint.com/v1/url?u=http://openvswitch.org/mailman/listinfo/dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=yTvML8OxA42Jb6ViHe7fUXbvPVOYDPVq87w43doxtlY%3D%0A&m=dK%2FhmRzrua6saaUmusb7DkojOlcnmP3z8zLpuh8%2BNMA%3D%0A&s=a505d6032e7dc2411e3acb1b303b5b12bf34b98aa7b54c41147c6a069d0e3ad3