From patchwork Mon Nov 6 15:33:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 834793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yVxW42fvGz9s7p for ; Tue, 7 Nov 2017 02:36:48 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 25439BD5; Mon, 6 Nov 2017 15:34:02 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 335DBAEF for ; Mon, 6 Nov 2017 15:33:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id CFD7C134 for ; Mon, 6 Nov 2017 15:33:57 +0000 (UTC) X-Originating-IP: 79.114.0.160 Received: from localhost.localdomain (unknown [79.114.0.160]) (Authenticated sender: aserdean@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 574BFA80D2; Mon, 6 Nov 2017 16:33:56 +0100 (CET) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 6 Nov 2017 17:33:38 +0200 Message-Id: <20171106153339.10100-6-aserdean@ovn.org> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20171106153339.10100-1-aserdean@ovn.org> References: <20171106153339.10100-1-aserdean@ovn.org> X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 6/7] datapath-windows: Fix static analysis warnings around ovsInstanceListLock X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Alin Serdean Check for return value when trying to initialize ovsInstanceListLock. Also return the status back to caller of `OvsInitIpHelper`. Signed-off-by: Alin Gabriel Serdean Signed-off-by: Alin Gabriel Serdean Acked-by: Shashank Ram --- v2: Removed an extra return. Suggested by: Shashank Ram rams@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; }