diff options
| author | Nithin Raju <nithin@vmware.com> | 2017-06-14 16:01:48 -0700 |
|---|---|---|
| committer | Gurucharan Shetty <guru@ovn.org> | 2017-06-16 09:38:18 -0700 |
| commit | e8808c2249b9d31fc5283f9b69466603ad6c4866 (patch) | |
| tree | 7de0d67437c04a8ca8230ac97f377e711881ec4c /datapath-windows | |
| parent | cfa98e3878026dd6b206fe1263505e8594846f93 (diff) | |
| download | openvswitch-e8808c2249b9d31fc5283f9b69466603ad6c4866.tar.gz | |
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>
Diffstat (limited to 'datapath-windows')
| -rw-r--r-- | datapath-windows/ovsext/Conntrack.c | 14 | ||||
| -rw-r--r-- | datapath-windows/ovsext/Netlink/Netlink.c | 2 | ||||
| -rw-r--r-- | datapath-windows/ovsext/Netlink/NetlinkProto.h | 2 |
3 files changed, 4 insertions, 14 deletions
diff --git a/datapath-windows/ovsext/Conntrack.c b/datapath-windows/ovsext/Conntrack.c index 68ed39566..07a958371 100644 --- 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 index a63f06623..156732cdb 100644 --- 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 index 517531199..59b56565c 100644 --- 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 |