[ovs-dev] [PATCH v4 07/11] datapath-windows: Conntrack - Handle memory allocation failure

[Nithin Raju]

Acked-by: Nithin Raju <nithin at vmware.com>

-----Original Message-----
From: dev <dev-bounces at openvswitch.org> on behalf of Sairam Venugopal
<vsairam at vmware.com>
Date: Wednesday, June 29, 2016 at 5:08 PM
To: "dev at openvswitch.org" <dev at openvswitch.org>
Subject: [ovs-dev] [PATCH v4 07/11] 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 at vmware.com>
>Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
>Acked-by: Nithin Raju <nithin at vmware.com>
>---
> datapath-windows/ovsext/Conntrack-other.c | 5 +++--
> datapath-windows/ovsext/Conntrack-tcp.c   | 4 ++++
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/datapath-windows/ovsext/Conntrack-other.c
>b/datapath-windows/ovsext/Conntrack-other.c
>index 5d39389..b853020 100644
>--- 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 1d60323..a0ee791 100644
>--- a/datapath-windows/ovsext/Conntrack-tcp.c
>+++ b/datapath-windows/ovsext/Conntrack-tcp.c
>@@ -490,6 +490,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];
>-- 
>2.5.0.windows.1
>
>_______________________________________________
>dev mailing list
>dev at openvswitch.org
>https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailma
>n_listinfo_dev&d=CwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=pN
>HQcdr7B40b4h6Yb7FIedI1dnBsxdDuTLBYD3JqV80&m=gRdkH8L2HL7tdelx4jAppou9gNxCNG
>vwMJb1OtJmT1o&s=7UBWxV1zD7bnlbNbPiO6QTFr-EjSfS0KT_l-Qf4L678&e=