datapath-windows: use NlAttrGet() in Conntrack.c

Couple of minor fixes that got flagged with a static checker. Signed-off-by: Nithin Raju <nithin@vmware.com> Acked-by: Sairam Venugopal <vsairam@vmware.com> Acked-by: Shashank Ram <rams@vmware.com> Signed-off-by: Gurucharan Shetty <guru@ovn.org>
openvswitch · Jun 16, 2017 · e8808c2 · e8808c2
1 parent cfa98e3
commit e8808c2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/datapath-windows/ovsext/Conntrack.c b/datapath-windows/ovsext/Conntrack.c
@@ -863,23 +863,13 @@ OvsExecuteConntrackAction(OvsForwardingContext *fwdCtx,
                         ? NAT_ACTION_SRC : NAT_ACTION_DST);
                 break;
             case OVS_NAT_ATTR_IP_MIN:
-               if (natAttr->nlaLen < NLA_HDRLEN) {
-                    OVS_LOG_ERROR("Incorrect header length for "
-                                  "OVS_NAT_ATTR_IP_MIN message.");
-                    break;
-                }
                 memcpy(&natActionInfo.minAddr,
-                       NlAttrData(natAttr), natAttr->nlaLen - NLA_HDRLEN);
+                       NlAttrData(natAttr), NlAttrGetSize(natAttr));
                 hasMinIp = TRUE;
                 break;
             case OVS_NAT_ATTR_IP_MAX:
-                if (natAttr->nlaLen < NLA_HDRLEN) {
-                    OVS_LOG_ERROR("Incorrect header length for "
-                                  "OVS_NAT_ATTR_IP_MAX message.");
-                    break;
-                }
                 memcpy(&natActionInfo.maxAddr,
-                       NlAttrData(natAttr), natAttr->nlaLen - NLA_HDRLEN);
+                       NlAttrData(natAttr), NlAttrGetSize(natAttr));
                 hasMaxIp = TRUE;
                 break;
             case OVS_NAT_ATTR_PROTO_MIN:

diff --git a/datapath-windows/ovsext/Netlink/Netlink.c b/datapath-windows/ovsext/Netlink/Netlink.c
@@ -1000,7 +1000,7 @@ PCHAR
 NlAttrGetString(const PNL_ATTR nla)
 {
     ASSERT(nla->nlaLen >= NLA_HDRLEN);
-    if (!memchr(NlAttrGet(nla), '\0', nla->nlaLen - NLA_HDRLEN)) {
+    if (!memchr(NlAttrGet(nla), '\0', NlAttrGetSize(nla))) {
         return NULL;
     }
     return NlAttrGet(nla);

diff --git a/datapath-windows/ovsext/Netlink/NetlinkProto.h b/datapath-windows/ovsext/Netlink/NetlinkProto.h
@@ -123,7 +123,7 @@ BUILD_ASSERT_DECL(sizeof(NL_ATTR) == 4);
 #define GENL_HDRLEN NLMSG_ALIGN(sizeof(GENL_MSG_HDR))
 #define NF_GEN_MSG_HDRLEN NLMSG_ALIGN(sizeof(NF_GEN_MSG_HDR))
 #define OVS_HDRLEN NLMSG_ALIGN(sizeof(OVS_HDR))
-#define NLA_HDRLEN ((INT) NLA_ALIGN(sizeof(NL_ATTR)))
+#define NLA_HDRLEN ((UINT16) NLA_ALIGN(sizeof(NL_ATTR)))
 
 #define NETLINK_NETFILTER       12
 #define NETLINK_GENERIC         16