From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Freimann Subject: [PATCH 2/3] vhost: check return values of pthread_* calls Date: Tue, 4 Jul 2017 10:50:42 +0200 Message-ID: <20170704085043.3662-3-jfreimann@redhat.com> References: <20170704085043.3662-1-jfreimann@redhat.com> Cc: yuanhan.liu@linux.intel.com, maxime.coquelin@redhat.com To: dev@dpdk.org Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 07E64377E for ; Tue, 4 Jul 2017 10:50:54 +0200 (CEST) In-Reply-To: <20170704085043.3662-1-jfreimann@redhat.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Make sure we catch and log failed calls to pthread functions. Signed-off-by: Jens Freimann --- lib/librte_vhost/socket.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 42b25d3..7b5df6f 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -620,7 +620,12 @@ rte_vhost_driver_register(const char *path, uint64_t flags) goto out; } TAILQ_INIT(&vsocket->conn_list); - pthread_mutex_init(&vsocket->conn_mutex, NULL); + ret = pthread_mutex_init(&vsocket->conn_mutex, NULL); + if (ret) { + RTE_LOG(ERR, VHOST_CONFIG, + "error: failed to init connection mutex\n"); + goto out_free; + } vsocket->dequeue_zero_copy = flags & RTE_VHOST_USER_DEQUEUE_ZERO_COPY; /* @@ -642,10 +647,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->reconnect = !(flags & RTE_VHOST_USER_NO_RECONNECT); if (vsocket->reconnect && reconn_tid == 0) { if (vhost_user_reconnect_init() < 0) { - pthread_mutex_destroy(&vsocket->conn_mutex); - free(vsocket->path); - free(vsocket); - goto out; + goto out_mutex; } } } else { @@ -653,14 +655,18 @@ rte_vhost_driver_register(const char *path, uint64_t flags) } ret = create_unix_socket(vsocket); if (ret < 0) { - pthread_mutex_destroy(&vsocket->conn_mutex); - free(vsocket->path); - free(vsocket); - goto out; + goto out_mutex; } vhost_user.vsockets[vhost_user.vsocket_cnt++] = vsocket; +out_mutex: + if (pthread_mutex_destroy(&vsocket->conn_mutex)) + RTE_LOG(ERR, VHOST_CONFIG, + "error: failed to destroy connection mutex\n"); +out_free: + free(vsocket->path); + free(vsocket); out: pthread_mutex_unlock(&vhost_user.mutex); -- 2.9.4