[ovs-dev] [PATCH 8/9] datapath-windows: Conntrack - Handle memory allocation failure

[Paul Boca]

Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>

> -----Original Message-----
> From: dev [mailto:dev-bounces at openvswitch.org] On Behalf Of Sairam
> Venugopal
> Sent: Tuesday, June 21, 2016 4:23 AM
> To: dev at openvswitch.org
> Subject: [ovs-dev] [PATCH 8/9] 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>
> ---
>  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
> http://openvswitch.org/mailman/listinfo/dev