datapath-windows: Conntrack - Handle memory allocation failure

Return null if Windows fails to allocate memory for the conntrack entry.

Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>

diff --git a/datapath-windows/ovsext/Conntrack-other.c b/datapath-windows/ovsext/Conntrack-other.c
index 5d393892fc8e4271b6a2c15c16d17d8748c8f48a..b85302038461d0dcf674a669aa5c83b7ffcbd56a 100644 (file)
--- a/datapath-windows/ovsext/Conntrack-other.c
+++ b/datapath-windows/ovsext/Conntrack-other.c
@@ -73,8 +73,9 @@ OvsConntrackCreateOtherEntry(UINT64 now)
     struct conn_other *conn;
     conn = OvsAllocateMemoryWithTag(sizeof(struct conn_other),
                                     OVS_CT_POOL_TAG);
-    /* XXX Handle memory allocation error (by returning a status) */
-    ASSERT(conn);
+    if (!conn) {
+        return NULL;
+    }
     conn->up = (OVS_CT_ENTRY) {0};
     conn->state = OTHERS_FIRST;
     OvsConntrackUpdateExpiration(conn, now);

diff --git a/datapath-windows/ovsext/Conntrack-tcp.c b/datapath-windows/ovsext/Conntrack-tcp.c
index 82edc203bc11a26e1132dbc74a1c87874161d6de..1820705eadcca719ff25d345a3475c8b413316a1 100644 (file)
--- a/datapath-windows/ovsext/Conntrack-tcp.c
+++ b/datapath-windows/ovsext/Conntrack-tcp.c
@@ -484,6 +484,10 @@ OvsConntrackCreateTcpEntry(const TCPHdr *tcp,
 
     newconn = OvsAllocateMemoryWithTag(sizeof(struct conn_tcp),
                                        OVS_CT_POOL_TAG);
+    if (!newconn) {
+        return NULL;
+    }
+
     newconn->up = (OVS_CT_ENTRY) {0};
     src = &newconn->peer[0];
     dst = &newconn->peer[1];