[ovs-dev] [PATCH v2 6/7] datapath-windows: Fix static analysis warnings around ovsInstanceListLock
Alin Gabriel Serdean
aserdean at ovn.org
Mon Nov 6 15:33:38 UTC 2017
From: Alin Serdean <aserdean at cloudbasesolutions.com>
Check for return value when trying to initialize ovsInstanceListLock.
Also return the status back to caller of `OvsInitIpHelper`.
Signed-off-by: Alin Gabriel Serdean <aserdean at cloudbasesolutions.com>
---
v2: Removed an extra return. Suggested by: Shashank Ram rams at vmware.com
---
datapath-windows/ovsext/IpHelper.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/datapath-windows/ovsext/IpHelper.c b/datapath-windows/ovsext/IpHelper.c
index e995e56..6bbd096 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;
}
--
2.10.2.windows.1
More information about the dev
mailing list