datapath-windows: Conntrack move null checks to functions

Add null checks inside OvsConntrackValidateIcmpPacket, OvsConntrackValidateTcpPacket to make the functions self-contained. Signed-off-by: Alin Gabriel Serdean <[email protected]> Suggested-by: Yin Lin <[email protected]> Acked-by: Sairam Venugopal <[email protected]> Signed-off-by: Gurucharan Shetty <[email protected]>
liuyong240 · Dec 13, 2016 · 50b0a16 · 50b0a16
1 parent bf71b09
commit 50b0a16
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/datapath-windows/ovsext/Conntrack-icmp.c b/datapath-windows/ovsext/Conntrack-icmp.c
@@ -59,6 +59,10 @@ OvsConntrackUpdateIcmpEntry(OVS_CT_ENTRY* conn_,
 BOOLEAN
 OvsConntrackValidateIcmpPacket(const ICMPHdr *icmp)
 {
+    if (!icmp) {
+        return FALSE;
+    }
+
     return icmp->type == ICMP4_ECHO_REQUEST
            || icmp->type == ICMP4_INFO_REQUEST
            || icmp->type == ICMP4_TIMESTAMP_REQUEST;

diff --git a/datapath-windows/ovsext/Conntrack-tcp.c b/datapath-windows/ovsext/Conntrack-tcp.c
@@ -457,9 +457,13 @@ OvsConntrackUpdateTcpEntry(OVS_CT_ENTRY* conn_,
 BOOLEAN
 OvsConntrackValidateTcpPacket(const TCPHdr *tcp)
 {
+    if (!tcp) {
+        return FALSE;
+    }
+
     UINT16 tcp_flags = ntohs(tcp->flags);
 
-    if (tcp == NULL || OvsCtInvalidTcpFlags(tcp_flags)) {
+    if (OvsCtInvalidTcpFlags(tcp_flags)) {
         return FALSE;
     }
 

diff --git a/datapath-windows/ovsext/Conntrack.c b/datapath-windows/ovsext/Conntrack.c
@@ -199,7 +199,7 @@ OvsCtEntryCreate(PNET_BUFFER_LIST curNbl,
             TCPHdr tcpStorage;
             const TCPHdr *tcp;
             tcp = OvsGetTcp(curNbl, l4Offset, &tcpStorage);
-            if (!tcp || !OvsConntrackValidateTcpPacket(tcp)) {
+            if (!OvsConntrackValidateTcpPacket(tcp)) {
                 goto invalid;
             }
 
@@ -220,7 +220,7 @@ OvsCtEntryCreate(PNET_BUFFER_LIST curNbl,
             ICMPHdr storage;
             const ICMPHdr *icmp;
             icmp = OvsGetIcmp(curNbl, l4Offset, &storage);
-            if (!icmp || !OvsConntrackValidateIcmpPacket(icmp)) {
+            if (!OvsConntrackValidateIcmpPacket(icmp)) {
                 goto invalid;
             }