From 7d20979a88b37c580346d278663cde0d4c78dae9 Mon Sep 17 00:00:00 2001 From: Alin Serdean Date: Mon, 6 Nov 2017 17:33:38 +0200 Subject: datapath-windows: Fix static analysis warnings around ovsInstanceListLock Check for return value when trying to initialize ovsInstanceListLock. Also return the status back to caller of `OvsInitIpHelper`. Signed-off-by: Alin Gabriel Serdean Acked-by: Shashank Ram --- datapath-windows/ovsext/IpHelper.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'datapath-windows') diff --git a/datapath-windows/ovsext/IpHelper.c b/datapath-windows/ovsext/IpHelper.c index e995e56ae..6bbd096c5 100644 --- a/datapath-windows/ovsext/IpHelper.c +++ b/datapath-windows/ovsext/IpHelper.c @@ -1989,6 +1989,12 @@ OvsInitIpHelper(NDIS_HANDLE ndisFilterHandle) HANDLE threadHandle; UINT32 i; + status = ExInitializeResourceLite(&ovsInstanceListLock); + if (status != NDIS_STATUS_SUCCESS) { + return status; + } + InitializeListHead(&ovsInstanceList); + ovsFwdHashTable = (PLIST_ENTRY)OvsAllocateMemoryWithTag( sizeof(LIST_ENTRY) * OVS_FWD_HASH_TABLE_SIZE, OVS_IPHELPER_POOL_TAG); @@ -2009,9 +2015,6 @@ OvsInitIpHelper(NDIS_HANDLE ndisFilterHandle) ipRouteNotificationHandle = NULL; unicastIPNotificationHandle = NULL; - ExInitializeResourceLite(&ovsInstanceListLock); - InitializeListHead(&ovsInstanceList); - if (ovsFwdHashTable == NULL || ovsRouteHashTable == NULL || ovsNeighHashTable == NULL || @@ -2074,7 +2077,7 @@ init_cleanup: ExDeleteResourceLite(&ovsInstanceListLock); NdisFreeSpinLock(&ovsIpHelperLock); } - return STATUS_SUCCESS; + return status; } -- cgit v1.2.1