Message ID | 1497481308-1920-1-git-send-email-nithin@vmware.com |
---|---|
State | Accepted |
Headers | show |
Acked-by: Sairam Venugopal <vsairam@vmware.com> On 6/14/17, 4:01 PM, "ovs-dev-bounces@openvswitch.org on behalf of Nithin Raju" <ovs-dev-bounces@openvswitch.org on behalf of nithin@vmware.com> wrote: >Couple of minor fixes that got flagged with a static checker. > >Signed-off-by: Nithin Raju <nithin@vmware.com> >--- > datapath-windows/ovsext/Conntrack.c | 14 ++------------ > datapath-windows/ovsext/Netlink/Netlink.c | 2 +- > 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 68ed395..07a9583 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 a63f066..156732c 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 5175311..59b5656 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 >-- >2.7.1.windows.1 > >_______________________________________________ >dev mailing list >dev@openvswitch.org >https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=uilaK90D4TOVoH58JNXRgQ&r=Z6vowHUOjP5ysP_g372c49Nqc1vEKqHKNBkR5Q5Z7uo&m=Gcu2sMIlG_kV-8opOt_iKbhfjzkPO9cYR2j-OsbKWtg&s=7_Bz1HQYeFWidKM6e_f97gb2MHM3ySqlpHx02X4XDtY&e=
On 14 June 2017 at 16:01, Nithin Raju <nithin@vmware.com> wrote: > Couple of minor fixes that got flagged with a static checker. > > Signed-off-by: Nithin Raju <nithin@vmware.com> > Applied to master, thank you! > --- > datapath-windows/ovsext/Conntrack.c | 14 ++------------ > datapath-windows/ovsext/Netlink/Netlink.c | 2 +- > 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 68ed395..07a9583 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 a63f066..156732c 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 5175311..59b5656 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 > -- > 2.7.1.windows.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/datapath-windows/ovsext/Conntrack.c b/datapath-windows/ovsext/Conntrack.c index 68ed395..07a9583 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 a63f066..156732c 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 5175311..59b5656 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
Couple of minor fixes that got flagged with a static checker. Signed-off-by: Nithin Raju <nithin@vmware.com> --- datapath-windows/ovsext/Conntrack.c | 14 ++------------ datapath-windows/ovsext/Netlink/Netlink.c | 2 +- datapath-windows/ovsext/Netlink/NetlinkProto.h | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-)